[tensorflow-cc/tensorflow-common] Add uwp port

ports/tensorflow-cc/portfile.cmake

@@ -1,4 +1,4 @@
-vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_ARCH "x86" "arm")
 
 set(TF_LIB_SUFFIX "_cc")
 set(TF_PORT_SUFFIX "-cc")

ports/tensorflow-cc/vcpkg.json

@@ -1,10 +1,10 @@
 {
   "name": "tensorflow-cc",
   "version-string": "2.3.1",
-  "port-version": 2,
+  "port-version": 3,
   "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)",
+  "supports": "!(x86 | arm)",
   "dependencies": [
     "tensorflow-common"
   ]

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

@@ -0,0 +1,137 @@
+diff --git a/.bazelrc b/.bazelrc
+--- a/.bazelrc
++++ b/.bazelrc
+@@ -318,7 +318,9 @@
+ build:windows --verbose_failures
+
+ # On windows, we never cross compile
+-build:windows --distinct_host_configuration=false
++build:windows --distinct_host_configuration=true
++build:windows --host_copt=-UWINAPI_FAMILY
++build:windows --host_linkopt=/APPCONTAINER:NO
+
+ # Suppress all warning messages.
+ build:short_logs --output_filter=DONT_MATCH_ANYTHING
+
+
+diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD
+--- a/third_party/curl.BUILD
++++ b/third_party/curl.BUILD
+@@ -472,9 +472,7 @@
+         "#  define CURL_DISABLE_TELNET 1",
+         "#  define CURL_DISABLE_TFTP 1",
+         "#  define CURL_PULL_WS2TCPIP_H 1",
+-        "#  define USE_WINDOWS_SSPI 1",
+         "#  define USE_WIN32_IDN 1",
+-        "#  define USE_SCHANNEL 1",
+         "#  define WANT_IDN_PROTOTYPES 1",
+         "#elif defined(__APPLE__)",
+         "#  define HAVE_FSETXATTR_6 1",
+
+
+diff --git a/third_party/sqlite.BUILD b/third_party/sqlite.BUILD
+--- a/third_party/sqlite.BUILD
++++ b/third_party/sqlite.BUILD
+@@ -13,6 +13,7 @@
+ ] + select({
+     "@org_tensorflow//tensorflow:windows": [
+         "-DSQLITE_MAX_TRIGGER_DEPTH=100",
++        "-DSQLITE_OS_WINRT=1",
+     ],
+     "@org_tensorflow//tensorflow:macos": [
+         "-Os",
+
+
+diff --git a/third_party/aws/workspace.bzl b/third_party/aws/workspace.bzl
+--- a/third_party/aws/workspace.bzl
++++ b/third_party/aws/workspace.bzl
+@@ -15,6 +15,7 @@
+         sha256 = "758174f9788fed6cc1e266bcecb20bf738bd5ef1c3d646131c9ed15c2d6c5720",
+         strip_prefix = "aws-sdk-cpp-1.7.336",
+         build_file = "//third_party/aws:BUILD.bazel",
++        patch_file = "//third_party/aws:FileSystem.patch",
+     )
+
+     third_party_http_archive(
+
+
+diff --git a/third_party/aws/FileSystem.patch b/third_party/aws/FileSystem.patch
+new file mode 100644
+--- /dev/null
++++ b/third_party/aws/FileSystem.patch
+@@ -0,0 +1,10 @@
++diff --git a/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp b/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp
++--- a/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp
+++++ b/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp
++@@ -20,6 +20,7 @@
++ #include <cassert>
++ #include <iostream>
++ #include <Userenv.h>
+++#include <Windows.h>
++
++ #pragma warning( disable : 4996)
++
+
+
+diff --git a/third_party/icu/BUILD.bazel b/third_party/icu/BUILD.bazel
+--- a/third_party/icu/BUILD.bazel
++++ b/third_party/icu/BUILD.bazel
+@@ -45,6 +45,7 @@
+     copts = [
+         "-DU_COMMON_IMPLEMENTATION",
+         "-DU_HAVE_STD_ATOMICS",  # TODO(gunan): Remove when TF is on ICU 64+.
++        "-DU_PLATFORM_HAS_WINUWP_API=1",
+     ] + select({
+         ":android": [
+             "-fdata-sections",
+
+
+diff --git a/third_party/icu/udata.patch b/third_party/icu/udata.patch
+--- a/third_party/icu/udata.patch
++++ b/third_party/icu/udata.patch
+@@ -44,16 +44,32 @@
+
+  /*----------------------------------------------------------------------*
+   *                                                                      *
+-@@ -710,10 +708,11 @@
+-         if (uprv_getICUData_collation) {
+-             setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode);
+-         }
+-+        */
+-         if (uprv_getICUData_conversion) {
+-             setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
+-         }
+--        */
+-+
+- #if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time
+-         setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
+-         {
++--- a/icu4c/source/common/ucnvisci.cpp
++--- b/icu4c/source/common/ucnvisci.cpp
++@@ -1230,7 +1230,7 @@
++                         *err =U_ILLEGAL_CHAR_FOUND;
++                         /* reset */
++                         *contextCharToUnicode=NO_CHAR_MARKER;
++-                        goto CALLBACK;
+++                        goto CALLBACK_LABEL;
++                     }
++                 }
++
++@@ -1269,7 +1269,7 @@
++                     *contextCharToUnicode= NO_CHAR_MARKER;
++                     *err = U_ILLEGAL_CHAR_FOUND;
++                 }
++-                goto CALLBACK;
+++                goto CALLBACK_LABEL;
++             } else if (*contextCharToUnicode==ISCII_INV) {
++                 if (sourceChar==ISCII_HALANT) {
++                     targetUniChar = 0x0020; /* replace with space accoding to Indic FAQ */
++@@ -1483,7 +1483,7 @@
++                  * so assign codes to reason and err
++                  */
++                 *err = U_INVALID_CHAR_FOUND;
++-CALLBACK:
+++CALLBACK_LABEL:
++                 args->converter->toUBytes[0] = (uint8_t) sourceChar;
++                 args->converter->toULength = 1;
++                 break;

ports/tensorflow-common/portfile.cmake

@@ -8,6 +8,7 @@ set(TENSORFLOW_FILES
     "${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-uwp-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"
@@ -19,6 +20,8 @@ set(TENSORFLOW_FILES
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in"
+    "${CMAKE_CURRENT_LIST_DIR}/uwp_genrule.BUILD.in"
+    "${CMAKE_CURRENT_LIST_DIR}/uwppatch.h"
     )
 
 file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/tensorflow-common/tensorflow-common.cmake

@@ -113,12 +113,16 @@ 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(LINUX_ONLY_PATCHES)
+	set(UWP_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_LINUX)
 		set(LINUX_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch")
 	endif()
+	if(VCPKG_TARGET_IS_UWP)
+		set(UWP_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-uwp-build.patch")
+	endif()
 	vcpkg_from_github(
 		OUT_SOURCE_PATH SOURCE_PATH
 		REPO tensorflow/tensorflow
@@ -131,6 +135,7 @@ foreach(BUILD_TYPE dbg rel)
 			"${CMAKE_CURRENT_LIST_DIR}/fix-more-build-errors.patch" # Fix no return statement
 			${STATIC_ONLY_PATCHES}
 			${LINUX_ONLY_PATCHES}
+			${UWP_ONLY_PATCHES}
 	)
 
 	message(STATUS "Configuring TensorFlow (${BUILD_TYPE})")
@@ -211,19 +216,39 @@ foreach(BUILD_TYPE dbg rel)
 		endforeach()
 	endif()
 
+	set(ADDITIONAL_TARGETS_PRE)
+	if(VCPKG_TARGET_IS_UWP)
+		# the following doesn't work yet, use work-around for the time being
+		# details: https://stackoverflow.com/questions/65184913/how-do-i-add-an-additional-system-include-directory-using-bazel
+		#set(AT_CHAR_FOR_CONFIGURE_FILE "@")
+		#configure_file(${CMAKE_CURRENT_LIST_DIR}/uwp_genrule.BUILD.in ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/patching_target/BUILD @ONLY)
+		#set(ADDITIONAL_TARGETS_PRE "///patching_target:patch_include_dirs")
+		message(STATUS "UWP build requires a patched header to be force-included. As this currently is not possible with bazel, we will copy '__vcpkg_uwppatch.h' to '$ENV{VCToolsInstallDir}/include/'. This might require vcpkg to be run as Administrator if the next command fails.")
+		configure_file(${CMAKE_CURRENT_LIST_DIR}/uwppatch.h $ENV{VCToolsInstallDir}/include/__vcpkg_uwppatch.h COPYONLY)
+
+		list(APPEND COPTS "--copt=-DWINAPI_FAMILY=WINAPI_FAMILY_APP")
+		list(APPEND COPTS "--copt=-D_WIN32_WINNT=0x0A00")
+		list(APPEND COPTS "--copt=-FI__vcpkg_uwppatch.h")
+		list(APPEND LINKOPTS "--linkopt=-APPCONTAINER")
+		list(APPEND LINKOPTS "--linkopt=WindowsApp.lib")
+		list(APPEND LINKOPTS "--linkopt='-LIBPATH:\"$ENV{VCToolsInstallDir}/lib/${VCPKG_TARGET_ARCHITECTURE}/store\"'")
+		list(APPEND LINKOPTS "--linkopt='-LIBPATH:\"$ENV{WindowsSdkDir}/lib/$ENV{WindowsSDKVersion}/um/${VCPKG_TARGET_ARCHITECTURE}\"'")
+		list(APPEND LINKOPTS "--linkopt=-FORCE:MULTIPLE")
+	endif()
+
 	if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 		if(VCPKG_TARGET_IS_WINDOWS)
 			list(JOIN COPTS " " COPTS)
 			list(JOIN CXXOPTS " " CXXOPTS)
 			list(JOIN LINKOPTS " " LINKOPTS)
 			vcpkg_execute_build_process(
-				COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers"
+				COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ${ADDITIONAL_TARGETS_PRE} ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers"
 				WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}
 				LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE}
 			)
 		else()
 			vcpkg_execute_build_process(
-				COMMAND ${BAZEL} build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers
+				COMMAND ${BAZEL} build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true ${ADDITIONAL_TARGETS_PRE} //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers
 				WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}
 				LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE}
 			)
@@ -241,13 +266,13 @@ foreach(BUILD_TYPE dbg rel)
 			list(JOIN CXXOPTS " " CXXOPTS)
 			list(JOIN LINKOPTS " " LINKOPTS)
 			vcpkg_execute_build_process(
-				COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers"
+				COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ${ADDITIONAL_TARGETS_PRE} ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers"
 				WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}
 				LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE}
 			)
 		else()
 			vcpkg_execute_build_process(
-				COMMAND ${BAZEL} build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers
+				COMMAND ${BAZEL} build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true ${ADDITIONAL_TARGETS_PRE} //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers
 				WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}
 				LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE}
 			)
@@ -370,6 +395,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 		COPYONLY)
 endif()
 
+if(VCPKG_TARGET_IS_UWP)
+	message(STATUS "Note: When using the TensorFlow UWP build in a UWP app, the 'Code Generation' capability needs to be checked in the app manifest.")
+	file(APPEND ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/README "
+
+Note: When using the TensorFlow UWP build in a UWP app, the 'Code Generation' capability needs to be checked in the app manifest.")
+endif()
+
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX})
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/copyright)
 

ports/tensorflow-common/uwp_genrule.BUILD.in

@@ -0,0 +1,24 @@
+genrule(
+    name = "patch_include_dirs",
+    cmd = """
+dest_path=`dirname "$@AT_CHAR_FOR_CONFIGURE_FILE@"`
+# calc absolute path
+if [ "$${dest_path:0:1}" != "/" ] ; then
+    current_dir=`pwd`
+    dest_path="$${current_dir}/$${dest_path}"
+fi
+mkdir -p "$${dest_path}"
+cp '@CMAKE_CURRENT_LIST_DIR@/uwppatch.h' "$${dest_path}"
+windows_path=`cygpath -w "$${dest_path}"`
+# use forward slashes
+windows_path=`echo $${windows_path} | sed -e s'|\\\\\\\\\\\\\\\\|/|'g`
+echo \\\"$${windows_path}/\\\", >> $(location @AT_CHAR_FOR_CONFIGURE_FILE@local_config_cc//:builtin_include_directory_paths_msvc)
+""",
+    srcs = [
+        "@AT_CHAR_FOR_CONFIGURE_FILE@local_config_cc//:toolchain",
+        "@AT_CHAR_FOR_CONFIGURE_FILE@local_config_cc//:builtin_include_directory_paths_msvc",
+    ],
+    outs = [
+        "patched_includes/uwppatch.h"
+    ],
+)