Merge pull request #7141 from cms-sw/tf-250

[Tensorflow] Update to version 2.5.0
cms-sw · Jul 20, 2021 · 9bef1b0 · 9bef1b0
2 parents 61af3a1 + 05b9896
commit 9bef1b0
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 14 deletions.
diff --git a/bazel-3.7.0-patches.patch b/bazel-3.7.0-patches.patch
@@ -1,5 +1,5 @@
 diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
-index 0ea30a9..8df189f 100644
+index 0ea30a9..8df189f 100755
 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
 +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
 @@ -359,7 +359,7 @@ public interface StarlarkActionFactoryApi extends StarlarkValue {

diff --git a/bazel.spec b/bazel.spec
@@ -1,4 +1,4 @@
-### RPM external bazel 3.7.0
+### RPM external bazel 3.7.2
 
 Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip
 
@@ -28,7 +28,7 @@ Patch0: bazel-3.7.0-patches
 
 %build
 
-export EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk"
+export EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk --jobs %{compiling_processes}"
 bash ./compile.sh
 
 %install

diff --git a/eigen.spec b/eigen.spec
@@ -1,7 +1,7 @@
-### RPM external eigen 011e0db31d1bed8b7f73662be6d57d9f30fa457a
+### RPM external eigen f612df273689a19d25b45ca4f8269463207c4fee
 ## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
 ## NOCOMPILER
-%define tag 14ec43b998505b1294e300b1d1717cee901d5f02
+%define tag 4fc3872b0dc7540aeaea8de04835508bbd90aae3
 %define branch cms/master/%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/eigen-git-mirror.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

diff --git a/pip/keras-nightly.file b/pip/keras-nightly.file
@@ -0,0 +1 @@
+%define PipDownloadSourceType none
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -126,6 +126,7 @@ jupyter==1.0.0 ; python_version>'3.0'
 jupyterlab-widgets==1.0.0 ; python_version>'3.0'
 Keras==2.4.3; python_version>'3.0'
 keras-applications==1.0.8; python_version>'3.0'
+keras-nightly==2.7.0.dev2021071300; python_version>'3.0'
 keras-preprocessing==1.1.2; python_version>'3.0'
 keras2onnx==1.7.0 ; python_version>'3.0'
 keyring==22.3.0 ; python_version>'3.0'
@@ -264,11 +265,12 @@ stevedore==1.32.0; python_version>'3.0'
 subprocess32==3.5.4; python_version>'3.0'
 sympy==1.7.1 ; python_version>'3.0'
 tables==3.6.1 ; python_version>'3.0'
-#NO_AUTO_UPDATE:2: Force to use tensorflow 2.4.1; this should match the version in tensorflow-sources.spec
-tensorboard==2.4.1 ; python_version>'3.0'
+#NO_AUTO_UPDATE:3: Force to use tensorflow 2.5.0; this should match the version in tensorflow-sources.spec
+tensorboard==2.5.0 ; python_version>'3.0'
+tensorflow==2.5.0 ; python_version>'3.0'
+tensorflow-estimator==2.5.0; python_version>'3.0'
+tensorboard-data-server==0.6.1; python_version>'3.0'
 tensorboard-plugin-wit==1.8.0 ; python_version>'3.0'
-tensorflow==2.4.1 ; python_version>'3.0'
-tensorflow-estimator==2.4.0; python_version>'3.0'
 termcolor==1.1.0; python_version>'3.0'
 terminado==0.8.3; python_version>'3.0'
 testpath==0.4.4 ; python_version>'3.0'

diff --git a/pip/tensorboard-data-server.file b/pip/tensorboard-data-server.file
@@ -0,0 +1,3 @@
+BuildRequires: py3-wheel
+Provides: libc.so.6(GLIBC_2.18)(64bit)
+%define PipDownloadSourceType none
diff --git a/pip/tensorboard.file b/pip/tensorboard.file
@@ -1,2 +1,3 @@
 Requires: py3-Markdown py3-Werkzeug py3-protobuf py3-html5lib py3-six py3-wheel py3-bleach
+Requires: py3-tensorboard-data-server
 %define PipDownloadSourceType none
diff --git a/pip/tensorflow.file b/pip/tensorflow.file
@@ -1,5 +1,5 @@
 ## INCLUDE tensorflow-requires
 Requires: py3-funcsigs py3-pbr py3-packaging py3-appdirs py3-pyparsing py3-mock py3-Werkzeug
-Requires: py3-grpcio py3-astunparse
+Requires: py3-grpcio py3-astunparse py3-keras-nightly
 %define source0 none
 %define source_file none
diff --git a/tensorflow-requires.file b/tensorflow-requires.file
@@ -2,4 +2,4 @@ Requires: python3 py3-numpy py3-mock py3-wheel py3-typing py3-typing_extensions
 Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools
 Requires: py3-cython py3-googlePackages py3-astor py3-six py3-termcolor py3-absl-py
 Requires: py3-opt-einsum py3-flatbuffers
-Requires: eigen protobuf zlib libpng libjpeg-turbo curl pcre giflib sqlite grpc flatbuffers
+Requires: eigen protobuf zlib libpng libjpeg-turbo curl pcre giflib sqlite grpc flatbuffers py3-pybind11
diff --git a/tensorflow-sources.file b/tensorflow-sources.file
@@ -14,7 +14,7 @@ BuildRequires: bazel java-env git
 ## INCLUDE tensorflow-requires
 ## INCLUDE compilation_flags
 
-%define tag         050756d3ddbf0692b74451f6ba3d75d54d345d9e
+%define tag         9b69eda15062cfec1b9c2d6f78c0fecbf9e67a34
 %define branch      cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/tensorflow.git?obj=%{branch}/%{tag}&export=tensorflow-%{realversion}&output=/tensorflow-%{realversion}.tgz
@@ -87,6 +87,7 @@ echo "gif:${GIFLIB_ROOT}"                   >> ${TF_CMS_EXTERNALS}
 echo "org_sqlite:${SQLITE_ROOT}"            >> ${TF_CMS_EXTERNALS}
 echo "cython:"                              >> ${TF_CMS_EXTERNALS}
 echo "flatbuffers:${FLATBUFFERS_ROOT}"      >> ${TF_CMS_EXTERNALS}
+echo "pybind11:${PY3_PYBIND11_ROOT}"        >> ${TF_CMS_EXTERNALS}
 echo "functools32_archive:"                 >> ${TF_CMS_EXTERNALS}
 echo "enum34_archive:"                      >> ${TF_CMS_EXTERNALS}
 echo "astor_archive:"                       >> ${TF_CMS_EXTERNALS}

diff --git a/tensorflow-sources.spec b/tensorflow-sources.spec
@@ -1,4 +1,4 @@
-### RPM external tensorflow-sources 2.4.1
+### RPM external tensorflow-sources 2.5.0
 %define python_cmd python3
 %define python_env PYTHON3PATH
 %define build_type opt

diff --git a/tensorflow.spec b/tensorflow.spec
@@ -1,4 +1,4 @@
-### RPM external tensorflow 2.4.1
+### RPM external tensorflow 2.5.0
 %if "%{?vectorized_package:set}" != "set"
 %define source_package tensorflow-sources
 %else