diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-09-07 02:46:09 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-09-06 11:46:09 -0700 |
| commit | 73e55002f1e3e8093431bc1b506d907396bfbf2f (patch) | |
| tree | af7c522127f2321a821dd570b6fd76f2c3cbb92a | |
| parent | 84ba23ad3300a86e00841c5e26cbf753f6e89f3f (diff) | |
| download | vcpkg-73e55002f1e3e8093431bc1b506d907396bfbf2f.tar.gz vcpkg-73e55002f1e3e8093431bc1b506d907396bfbf2f.zip | |
[tensorflow-cc]Fix build error and add warning message. (#8023)
* [tensorflow-cc]Fix build error and add warning message.
* [tensorflow-cc]Re-generate patch.
| -rw-r--r-- | ports/tensorflow-cc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tensorflow-cc/fix-build-error.patch | 22 | ||||
| -rw-r--r-- | ports/tensorflow-cc/portfile.cmake | 5 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL index 05e336e53..29f15a376 100644 --- a/ports/tensorflow-cc/CONTROL +++ b/ports/tensorflow-cc/CONTROL @@ -1,4 +1,4 @@ Source: tensorflow-cc -Version: 1.14 +Version: 1.14-1 Description: Library for computation using data flow graphs for scalable machine learning Build-Depends: c-ares diff --git a/ports/tensorflow-cc/fix-build-error.patch b/ports/tensorflow-cc/fix-build-error.patch new file mode 100644 index 000000000..89a15f17a --- /dev/null +++ b/ports/tensorflow-cc/fix-build-error.patch @@ -0,0 +1,22 @@ +diff --git a/tensorflow/core/platform/default/logging.h b/tensorflow/core/platform/default/logging.h +index 99dd6de..3cbe8ed 100644 +--- a/tensorflow/core/platform/default/logging.h ++++ b/tensorflow/core/platform/default/logging.h +@@ -82,13 +82,13 @@ class LogMessageFatal : public LogMessage { + }; + + #define _TF_LOG_INFO \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::INFO) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::INFO) + #define _TF_LOG_WARNING \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::WARNING) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::WARNING) + #define _TF_LOG_ERROR \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::ERROR) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::ERROR) + #define _TF_LOG_FATAL \ +- ::tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) ++ tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) + + #define _TF_LOG_QFATAL _TF_LOG_FATAL + diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index 0e40f859b..aebdf8d65 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -2,6 +2,10 @@ 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.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tensorflow/tensorflow @@ -10,6 +14,7 @@ vcpkg_from_github( HEAD_REF master PATCHES file-exists.patch # required or otherwise it cant find python lib path on windows + fix-build-error.patch # Fix namespace error ) # due to https://github.com/bazelbuild/bazel/issues/8028, bazel must be version 25.0 or higher |