diff options
| author | Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> | 2021-09-30 05:43:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 20:43:32 -0700 |
| commit | 8ad33ead9075cd8d6d357e0b870ba8d501efe35c (patch) | |
| tree | ab3a6b7785b5b34da890e0db63f50bbe60362bf6 /ports/tensorflow-common/tensorflow-common.cmake | |
| parent | dd991ef5b82051cb7481a92c71dc5706325ba7c2 (diff) | |
| download | vcpkg-8ad33ead9075cd8d6d357e0b870ba8d501efe35c.tar.gz vcpkg-8ad33ead9075cd8d6d357e0b870ba8d501efe35c.zip | |
[tensorflow] update to 2.6 (#20015)
* Revert "incorporate changes from microsoft:master"
* Revert "Revert "incorporate changes from microsoft:master""
* WIP: update to tensorflow 2.6
* update patch
* update more patches
* fix patch again
* fix new Windows compile/linkage errors
* fix patch
* fix patch again
* temporarily revert Windows build option fix to test whether upstream fix doesn't work
* check if constexpr is sufficient (is_same_v requires C++17)
* try patch for build parameters
* remove fastbuild patch and improve constexpr patch (no C++17 requirement)
(fastbuild patch didn't work because bazel overrides it with /DEBUG:FULL)
* x-add-version
* add C++17 preprocessor switch for "if constexpr"
* x-add-version
* remove pre-processor switch (doesn't work without)
* x-add-version
* work-around toolchain issues on macOS
* x-add-version
* fix Windows build options (must be string, not list)
* x-add-version
* temporarily add code to debug CI
* temporarily add more debug output as build doesn't even start on macOS CI
* remove debug code, add switch for linker parameters on macOS and re-introduce old behaviour (some platforms still use old behaviour)
* x-add-version
* fix broken string termination
* x-add-version
* fix function name
* x-add-version
Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/tensorflow-common/tensorflow-common.cmake')
| -rw-r--r-- | ports/tensorflow-common/tensorflow-common.cmake | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 55387eb0d..0813dd94e 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -1,5 +1,5 @@ -set(TF_VERSION 2.4.1) -set(TF_VERSION_SHORT 2.4) +set(TF_VERSION 2.6.0) +set(TF_VERSION_SHORT 2.6) vcpkg_find_acquire_program(BAZEL) get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) @@ -129,28 +129,23 @@ 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 be8273f464c1c1c392f3ab0190dbba36d56a0edcc7991c1a86f16604c859056d3188737d11c3b41ec7918e1cf46d13814c50c00be8f459dde9f0fb618740ee3c + SHA512 d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ${STATIC_ONLY_PATCHES} ${WINDOWS_ONLY_PATCHES} - ${LINUX_ONLY_PATCHES} ) message(STATUS "Configuring TensorFlow (${BUILD_TYPE})") @@ -192,8 +187,10 @@ foreach(BUILD_TYPE dbg rel) if(BUILD_TYPE STREQUAL dbg) if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_OPTS "--compilation_mode=dbg --features=fastbuild") # link with /DEBUG:FASTLINK instead of /DEBUG:FULL to avoid .pdb >4GB error + elseif(VCPKG_TARGET_IS_OSX) + set(BUILD_OPTS --compilation_mode=fastbuild) # debug build on macOS currently broken else() - set(BUILD_OPTS "--compilation_mode=dbg") + set(BUILD_OPTS --compilation_mode=dbg) endif() separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) @@ -212,7 +209,7 @@ foreach(BUILD_TYPE dbg rel) list(APPEND LINKOPTS "--linkopt='${OPT}'") endforeach() else() - set(BUILD_OPTS "--compilation_mode=opt") + set(BUILD_OPTS --compilation_mode=opt) separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) @@ -289,7 +286,7 @@ foreach(BUILD_TYPE dbg rel) endif() # for some reason stdout of bazel ends up in stderr, so use err log file in the following command vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_LIB_SUFFIX} + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_VERSION} ${TF_LIB_SUFFIX} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} ) |