microsoft · ras0219-msft · Mar 26, 2021 · Jul 23, 2020 · Jul 24, 2020 · Jul 24, 2020
diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake
@@ -2,8 +2,7 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP")
 
 set(TF_LIB_SUFFIX "_cc")
 set(TF_PORT_SUFFIX "-cc")
-set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external
-		${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src")
+set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external ${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src")
 list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common")
 include(tensorflow-common)
 

diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "tensorflow-cc",
-  "version-string": "2.3.1",
-  "port-version": 2,
+  "version-string": "2.4.1",
   "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)",
   "homepage": "https://github.com/tensorflow/tensorflow",
   "supports": "!(x86 | arm | uwp)",

diff --git a/ports/tensorflow-common/change-macros-for-static-lib.patch b/ports/tensorflow-common/change-macros-for-static-lib.patch
@@ -23,7 +23,7 @@ diff --git a/tensorflow/core/platform/macros.h b/tensorflow/core/platform/macros
 diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
 --- a/tensorflow/c/c_api.h
 +++ b/tensorflow/c/c_api.h
-@@ -70,24 +70,7 @@
+@@ -71,24 +71,7 @@
  //   and the API just provides high level controls over the number of
  //   devices of each type.
 
@@ -81,7 +81,7 @@ diff --git a/tensorflow/c/c_api_experimental.h b/tensorflow/c/c_api_experimental
 diff --git a/tensorflow/c/c_api_macros.h b/tensorflow/c/c_api_macros.h
 --- a/tensorflow/c/c_api_macros.h
 +++ b/tensorflow/c/c_api_macros.h
-@@ -16,18 +16,6 @@
+@@ -16,17 +16,5 @@
  #ifndef TENSORFLOW_C_C_API_MACROS_H_
  #define TENSORFLOW_C_C_API_MACROS_H_
 
@@ -99,14 +99,13 @@ diff --git a/tensorflow/c/c_api_macros.h b/tensorflow/c/c_api_macros.h
 -#endif  // _WIN32
 -#endif  // SWIG
 
- #endif  // TENSORFLOW_C_C_API_MACROS_H_
 
 diff --git a/tensorflow/c/kernels.h b/tensorflow/c/kernels.h
 --- a/tensorflow/c/kernels.h
 +++ b/tensorflow/c/kernels.h
-@@ -21,24 +21,7 @@
- #include "tensorflow/c/tf_datatype.h"
+@@ -23,24 +23,7 @@
  #include "tensorflow/c/tf_status.h"
+ #include "tensorflow/c/tf_tensor.h"
 
 -// Macro to control visibility of exported symbols in the shared library (.so,
 -// .dylib, .dll).
@@ -210,7 +209,7 @@ diff --git a/tensorflow/c/tf_status.h b/tensorflow/c/tf_status.h
 diff --git a/tensorflow/c/tf_tensor.h b/tensorflow/c/tf_tensor.h
 --- a/tensorflow/c/tf_tensor.h
 +++ b/tensorflow/c/tf_tensor.h
-@@ -22,24 +22,7 @@
+@@ -23,24 +23,7 @@
  #include "tensorflow/c/tf_datatype.h"
  #include "tensorflow/c/tf_status.h"
 

diff --git a/ports/tensorflow-common/fix-dbg-build-errors.patch b/ports/tensorflow-common/fix-dbg-build-errors.patch
diff --git a/ports/tensorflow-common/fix-linux-build.patch b/ports/tensorflow-common/fix-linux-build.patch
@@ -1,72 +1,20 @@
-diff --git a/third_party/aws/aws-checksums.bazel b/third_party/aws/aws-checksums.bazel
---- a/third_party/aws/aws-checksums.bazel
-+++ b/third_party/aws/aws-checksums.bazel
-@@ -7,6 +7,13 @@
-
- exports_files(["LICENSE"])
-
-+load("@bazel_skylib//lib:selects.bzl", "selects")
-+
-+selects.config_setting_group(
-+    name = "is_linux_debug",
-+    match_all = ["@org_tensorflow//tensorflow:linux_x86_64", "@org_tensorflow//tensorflow:debug"],
-+)
-+
- cc_library(
-     name = "aws-checksums",
-     srcs = select({
-@@ -27,4 +34,10 @@
-     deps = [
-         "@aws-c-common",
-     ],
-+    defines = select({
-+        ":is_linux_debug": [
-+            "DEBUG_BUILD"
-+        ],
-+        "//conditions:default": [],
-+    }),
- )
-
-diff --git a/tensorflow/core/kernels/data/experimental/io_ops.cc b/tensorflow/core/kernels/data/experimental/io_ops.cc
---- a/tensorflow/core/kernels/data/experimental/io_ops.cc
-+++ b/tensorflow/core/kernels/data/experimental/io_ops.cc
-@@ -28,6 +28,12 @@
- namespace data {
- namespace experimental {
-
-+/*static*/ constexpr const char* const LoadDatasetOp::kCompression;
-+/*static*/ constexpr const char* const LoadDatasetOp::kReaderFunc;
-+/*static*/ constexpr const char* const LoadDatasetOp::kReaderFuncTarguments;
-+
-+/*static*/ constexpr const int SaveDatasetOp::kFileFormatVersion;
-+
- SaveDatasetOp::SaveDatasetOp(OpKernelConstruction* ctx)
-     : HybridAsyncOpKernel(ctx, "tf_data_save_dataset") {
-   OP_REQUIRES_OK(ctx, ctx->GetAttr(kCompression, &compression_));
-
 diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
 --- a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
 +++ b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
-@@ -63,6 +63,14 @@
- namespace data {
- namespace experimental {
+@@ -72,6 +72,8 @@
+     SnapshotDatasetV2Op::kReaderFuncTarguments;
+ /* static */ constexpr const char* const
+     SnapshotDatasetV2Op::kShardFuncTarguments;
++/* static */ constexpr const char* const SnapshotDatasetV2Op::kReaderPrefix;
++/* static */ constexpr const char* const SnapshotDatasetV2Op::kWriterPrefix;
+ /* static */ constexpr const int SnapshotDatasetV2Op::kFileFormatVersion;
 
-+/*static*/ constexpr const char* const SnapshotDatasetV2Op::kCompression;
-+/*static*/ constexpr const char* const SnapshotDatasetV2Op::kReaderFunc;
-+/*static*/ constexpr const char* const SnapshotDatasetV2Op::kShardFunc;
-+/*static*/ constexpr const char* const SnapshotDatasetV2Op::kReaderFuncTarguments;
-+/*static*/ constexpr const char* const SnapshotDatasetV2Op::kShardFuncTarguments;
-+
-+/*static*/ constexpr const int SnapshotDatasetV2Op::kFileFormatVersion;
-+
  // ==== Snapshot Implementation ====
 
- /* The current snapshot on-disk layout is as follows:
-
 diff --git a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc
 --- a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc
 +++ b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc
-@@ -52,6 +52,8 @@
+@@ -53,6 +53,8 @@
  /* static */ constexpr const char* const
      DataServiceDatasetOp::kMaxOutstandingRequests;
  /* static */ constexpr const char* const

diff --git a/ports/tensorflow-common/fix-more-build-errors.patch b/ports/tensorflow-common/fix-more-build-errors.patch
diff --git a/ports/tensorflow-common/fix-windows-build.patch b/ports/tensorflow-common/fix-windows-build.patch
@@ -0,0 +1,70 @@
+diff --git a/tensorflow/compiler/xla/literal.cc b/tensorflow/compiler/xla/literal.cc
+--- a/tensorflow/compiler/xla/literal.cc
++++ b/tensorflow/compiler/xla/literal.cc
+@@ -1388,6 +1388,7 @@
+                         Literal>::type
+ BitcastBetweenNativeTypes(const LiteralBase& src_literal) {
+   LOG(FATAL) << "Invalid bitcast between types of different sizes.";
++  std::abort();
+ }
+
+ template <PrimitiveType primitive_src_type, PrimitiveType primitive_dest_type>
+
+diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
+--- a/tensorflow/compiler/xla/service/hlo_instruction.h
++++ b/tensorflow/compiler/xla/service/hlo_instruction.h
+@@ -1626,12 +1626,15 @@
+   // Returns the dimension sizes or numbers associated with this instruction.
+   virtual const std::vector<int64>& dimensions() const {
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+   virtual int64 dimensions(int64 index) const {
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+   virtual std::vector<int64>* mutable_dimensions() {
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+
+   // Delegates to HloConcatenateInstruction::concatenate_dimension.
+@@ -1782,15 +1785,17 @@
+   // convolution.
+   virtual const Window& window() const {
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+
+   // Sets the window data in a windowed operation such as convolution.
+   virtual void set_window(const Window& window) {
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+
+   // Returns the unique_indices field.
+-  virtual bool unique_indices() const { LOG(FATAL) << "Unimplemented method."; }
++  virtual bool unique_indices() const { LOG(FATAL) << "Unimplemented method."; std::abort(); }
+
+   // Returns data on the dimension numbers used for a convolution operation,
+   // which may be a kConvolution instruction or a kCustomCall that implements a
+@@ -1963,6 +1968,7 @@
+       HloCloneContext* context) const {
+     // TODO(b/80131774): This should be pure virtual.
+     LOG(FATAL) << "Unimplemented method.";
++    std::abort();
+   }
+
+   // Implementation for non-common logic of ExtraAttributesToString.
+
+diff --git a/tensorflow/compiler/xla/service/hlo_instructions.cc b/tensorflow/compiler/xla/service/hlo_instructions.cc
+--- a/tensorflow/compiler/xla/service/hlo_instructions.cc
++++ b/tensorflow/compiler/xla/service/hlo_instructions.cc
+@@ -1371,6 +1371,7 @@
+     const Shape& shape, absl::Span<HloInstruction* const> new_operands,
+     HloCloneContext* context) const {
+   LOG(FATAL) << "Not yet implemented, clone: " << HloOpcodeString(opcode());
++  std::abort();
+ }
+
+ HloFusionInstruction::HloFusionInstruction(const Shape& shape,
diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake
@@ -5,9 +5,8 @@ set(TENSORFLOW_FILES
     "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_linux.py"
     "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_windows.py"
     "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/fix-dbg-build-errors.patch"
     "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/fix-more-build-errors.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch"
     "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_linux.py"
     "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_macos.py"
     "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_windows.py"

diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake
@@ -1,5 +1,5 @@
-set(TF_VERSION 2.3.1)
-set(TF_VERSION_SHORT 2.3)
+set(TF_VERSION 2.4.1)
+set(TF_VERSION_SHORT 2.4)
 
 vcpkg_find_acquire_program(BAZEL)
 get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
@@ -112,24 +112,27 @@ endif()
 foreach(BUILD_TYPE dbg rel)
 	# prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks
 	set(STATIC_ONLY_PATCHES)
+	set(WINDOWS_ONLY_PATCHES)
 	set(LINUX_ONLY_PATCHES)
 	if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 		set(STATIC_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch")  # there is no static build option - change macros via patch and link library manually at the end
 	endif()
+	if(VCPKG_TARGET_IS_WINDOWS)
+		set(WINDOWS_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch")
+	endif()
 	if(VCPKG_TARGET_IS_LINUX)
 		set(LINUX_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch")
 	endif()
 	vcpkg_from_github(
 		OUT_SOURCE_PATH SOURCE_PATH
 		REPO tensorflow/tensorflow
 		REF "v${TF_VERSION}"
-		SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
+		SHA512 be8273f464c1c1c392f3ab0190dbba36d56a0edcc7991c1a86f16604c859056d3188737d11c3b41ec7918e1cf46d13814c50c00be8f459dde9f0fb618740ee3c
 		HEAD_REF master
 		PATCHES
 			"${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error
-			"${CMAKE_CURRENT_LIST_DIR}/fix-dbg-build-errors.patch" # Fix no return statement
-			"${CMAKE_CURRENT_LIST_DIR}/fix-more-build-errors.patch" # Fix no return statement
 			${STATIC_ONLY_PATCHES}
+			${WINDOWS_ONLY_PATCHES}
 			${LINUX_ONLY_PATCHES}
 	)
 

diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "tensorflow-common",
-  "version-string": "2.3.1",
-  "port-version": 1,
+  "version-string": "2.4.1",
   "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
   "homepage": "https://github.com/tensorflow/tensorflow"
 }