[tensorflow] upgrade to 2.4.1

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)
 

ports/tensorflow-cc/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "tensorflow-cc",
-  "version-string": "2.3.1",
-  "port-version": 2,
+  "version-semver": "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)",

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"
 

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

ports/tensorflow-common/fix-windows-build.patch

@@ -0,0 +1,12 @@
+diff --git a/core/platform/default/logging.h b/core/platform/default/logging.h
+--- a/tensorflow/core/platform/default/logging.h
++++ b/tensorflow/core/platform/default/logging.h
+@@ -13,6 +13,8 @@
+ limitations under the License.
+ ==============================================================================*/
+
++#pragma warning(disable:4716)
++
+ #ifndef TENSORFLOW_CORE_PLATFORM_DEFAULT_LOGGING_H_
+ #define TENSORFLOW_CORE_PLATFORM_DEFAULT_LOGGING_H_
+

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"

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}
 	)
 

ports/tensorflow-common/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "tensorflow-common",
-  "version-string": "2.3.1",
-  "port-version": 1,
+  "version-semver": "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"
 }

ports/tensorflow/portfile.cmake

@@ -8,12 +8,16 @@ include(tensorflow-common)
 
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_macros.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tensor_interface.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_attrtype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_datatype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_file_statistics.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_status.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tensor.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tstring.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager")
 file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/dlpack.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/core/platform/ctstring.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/core/platform")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/core/platform/ctstring_internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/core/platform")

ports/tensorflow/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "tensorflow",
-  "version-string": "2.3.1",
-  "port-version": 1,
+  "version-semver": "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)",

versions/baseline.json

@@ -5693,16 +5693,16 @@
       "port-version": 0
     },
     "tensorflow": {
-      "baseline": "2.3.1",
-      "port-version": 1
+      "baseline": "2.4.1",
+      "port-version": 0
     },
     "tensorflow-cc": {
-      "baseline": "2.3.1",
-      "port-version": 2
+      "baseline": "2.4.1",
+      "port-version": 0
     },
     "tensorflow-common": {
-      "baseline": "2.3.1",
-      "port-version": 1
+      "baseline": "2.4.1",
+      "port-version": 0
     },
     "termcolor": {
       "baseline": "1.0.1",

versions/t-/tensorflow-cc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "868e7ae57409669692df84ddb446f4a235e0b220",
+      "version-semver": "2.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "08a9ef525187b9b3656a686f2e83100643b7389e",
       "version-string": "2.3.1",