diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-06-08 22:46:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 22:46:18 -0700 |
| commit | 1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb (patch) | |
| tree | 78da83892364778a2344ec7bae1bb565add289d9 /ports | |
| parent | cb8a9fe7157f8ad2423742f893955ed9ced05910 (diff) | |
| download | vcpkg-1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb.tar.gz vcpkg-1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb.zip | |
[vcpkg] Fix OSX CI by ensuring the downloads directory exists (#11839)
* [vcpkg] Remove do-nothing Set-Content from Windows azure-pipelines.yml.
* [vcpkg] Fix OSX CI by ensuring the downloads directory exists in advance, and extract common command line parameters with powershell splatting.
* [tensorflow-cc] Prevent hang building tensorflow-cc asking to configure iOS.
* Skip ignition-msgs5:x64-osx
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/tensorflow-cc/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tensorflow-cc/portfile.cmake | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL index 8bcc1cc35..60c302346 100644 --- a/ports/tensorflow-cc/CONTROL +++ b/ports/tensorflow-cc/CONTROL @@ -1,5 +1,5 @@ Source: tensorflow-cc -Version: 1.14-1 +Version: 1.14-2 Description: Library for computation using data flow graphs for scalable machine learning Build-Depends: c-ares -Supports: !x86
\ No newline at end of file +Supports: !x86 diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index aebdf8d65..8d2c187b0 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions) - message(WARNING "This tensorflow port currently is experimental on Windows and Linux platforms.") if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "TensorFlow does not support 32bit system.") + message(FATAL_ERROR "TensorFlow does not support 32bit systems.") endif() vcpkg_from_github( @@ -76,6 +74,7 @@ set(ENV{TF_NCCL_VERSION} 2.3) set(ENV{NCCL_INSTALL_PATH} "") set(ENV{CC_OPT_FLAGS} "/arch:AVX") set(ENV{TF_NEED_CUDA} 0) +set(ENV{TF_CONFIGURE_IOS} 0) message(STATUS "Configuring TensorFlow") @@ -118,4 +117,4 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tenso file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/copyright) file(COPY ${CMAKE_CURRENT_LIST_DIR}/TensorflowCCConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/TensorflowCCConfig.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/unofficial-tensorflow-cc-config.cmake)
\ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/TensorflowCCConfig.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/unofficial-tensorflow-cc-config.cmake) |