My previous post: [TensorFlow] How to build your C++ program or application with TensorFlow library using CMake
Second, it seems that there are a few issues when building TensorFlow v1.12 that we need to deal with it case by case.
Use git clone and checkout to tag:v1.12.0 for TensorFlow source
What I modify the content:
It is for building TensorFlow from the source based on v1.10. Currently, I want to upgrade it to v1.12 and encounter some problems.
First, my version of ProtoBuf library on my system is v3.6.1 so that we should align its version in the TensorFlow.Second, it seems that there are a few issues when building TensorFlow v1.12 that we need to deal with it case by case.
Use git clone and checkout to tag:v1.12.0 for TensorFlow source
In short, I just list the files that I modify as follows:git clone --recursive https://github.com/tensorflow/tensorflow git checkout v1.12.0
tensorflow/contrib/cmake/external/protobuf.cmake
tensorflow/contrib/makefile/download_dependencies.sh
tensorflow/tools/ci_build/install/install_proto3.sh
tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh
tensorflow/workspace.bzl
What I modify the content:
git diff tensorflow/contrib/cmake/external/protobuf.cmake \
> tensorflow/contrib/makefile/download_dependencies.sh \
> tensorflow/tools/ci_build/install/install_proto3.sh \
> tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh \
> tensorflow/workspace.bzl
diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
index f56fb35..56a57a2 100644
--- a/tensorflow/contrib/cmake/external/protobuf.cmake
+++ b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -16,7 +16,7 @@ include (ExternalProject)
set(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/src)
set(PROTOBUF_URL https://github.com/google/protobuf.git)
-set(PROTOBUF_TAG v3.6.0)
+set(PROTOBUF_TAG v3.6.1)
if(WIN32)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
diff --git a/tensorflow/contrib/makefile/download_dependencies.sh b/tensorflow/contrib/makefile/download_dependencies.sh
index dc9b17a..d68823e 100755
--- a/tensorflow/contrib/makefile/download_dependencies.sh
+++ b/tensorflow/contrib/makefile/download_dependencies.sh
@@ -34,7 +34,8 @@ NSYNC_URL="$(grep -o 'https://mirror.bazel.build/github.com/google/nsync/.*tar\.
# 1.10 branch does not work. `make distclean` fails and blocks the build
# process. For now we're hardcoding to the version which is used by
# TensorFlow 1.9.
-PROTOBUF_URL="https://mirror.bazel.build/github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz"
+#PROTOBUF_URL="https://mirror.bazel.build/github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz"
+PROTOBUF_URL="https://github.com/protocolbuffers/protobuf/archive/v3.6.1.tar.gz"
# TODO (yongtang): Replace the following with 'https://mirror.bazel.build/github.com/google/re2/.*tar\.gz' once
# the archive has been propagated in mirror.bazel.build.
RE2_URL="$(grep -o 'https://github.com/google/re2/.*tar\.gz' "${BZL_FILE_PATH}" | head -n1)"
diff --git a/tensorflow/tools/ci_build/install/install_proto3.sh b/tensorflow/tools/ci_build/install/install_proto3.sh
index 821d50b..3cb1008 100755
--- a/tensorflow/tools/ci_build/install/install_proto3.sh
+++ b/tensorflow/tools/ci_build/install/install_proto3.sh
@@ -17,7 +17,7 @@
# Install protobuf3.
# Select protobuf version.
-PROTOBUF_VERSION="3.6.0"
+PROTOBUF_VERSION="3.6.1"
protobuf_ver_flat=$(echo $PROTOBUF_VERSION | sed 's/\.//g' | sed 's/^0*//g')
local_protobuf_ver=$(protoc --version)
local_protobuf_ver_flat=$(echo $local_protobuf_ver | sed 's/\.//g' | sed 's/^0*//g')
diff --git a/tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh b/tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh
index 3e31aa1..0d49571 100755
--- a/tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh
+++ b/tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh
@@ -14,7 +14,7 @@
# limitations under the License.
# ==============================================================================
-PROTOBUF_VERSION="3.3.1"
+PROTOBUF_VERSION="3.6.1"
PYTHON_BIN=${PYTHON_BIN:-python}
DIR=${PWD}/protobuf
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index aaea475..4b780e4a 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -381,11 +381,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
)
PROTOBUF_URLS = [
- "https://mirror.bazel.build/github.com/google/protobuf/archive/v3.6.0.tar.gz",
- "https://github.com/google/protobuf/archive/v3.6.0.tar.gz",
+ "https://mirror.bazel.build/github.com/google/protobuf/archive/v3.6.1.tar.gz",
+ "https://github.com/google/protobuf/archive/v3.6.1.tar.gz",
]
- PROTOBUF_SHA256 = "50a5753995b3142627ac55cfd496cebc418a2e575ca0236e29033c67bd5665f4"
- PROTOBUF_STRIP_PREFIX = "protobuf-3.6.0"
+ PROTOBUF_SHA256 = "3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b"
+ PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1"
tf_http_archive(
name = "protobuf_archive",
So, we can again do the following steps to build TensorFlow in my previous post:
No comments:
Post a Comment