Merge pull request #7239 from cms-sw/revert-7225-tf260

Revert "[Tensorflow] Update to version 2.6.0"
cms-sw · Aug 25, 2021 · 02475ae · 02475ae
2 parents c101715 + f074c4b
commit 02475ae
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 19 deletions.
diff --git a/eigen.spec b/eigen.spec
@@ -1,7 +1,7 @@
-### RPM external eigen 82dd3710dac619448f50331c1d6a35da673f764a
+### RPM external eigen f612df273689a19d25b45ca4f8269463207c4fee
 ## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
 ## NOCOMPILER
-%define tag 733e6166b2f8b4edd23da33985187fd60903e9ca
+%define tag 2b0436507121a2586a1c678c6c36dfa131273e4d
 %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/llvm.spec b/llvm.spec
@@ -63,11 +63,8 @@ cd ../build
 ninja -v %{makeprocesses} install
 
 BINDINGS_PATH=%{i}/lib64/python%{cms_python3_major_minor_version}/site-packages
-PKG_INFO_FILE=$BINDINGS_PATH/clang-%{realversion}-py%{cms_python3_major_minor_version}.egg-info/PKG-INFO
 mkdir -p $BINDINGS_PATH
 cp -r %{_builddir}/llvm-%{realversion}-%{llvmCommit}/clang/bindings/python/clang $BINDINGS_PATH
-mkdir $BINDINGS_PATH/clang-%{realversion}-py%{cms_python3_major_minor_version}.egg-info
-echo -e "Metadata-Version: 1.1\nName: clang\nVersion: %{realversion}" > ${PKG_INFO_FILE}
 
 rm -f %{_builddir}/llvm-%{realversion}-%{llvmCommit}/clang/tools/scan-build/set-xcode*
 find %{_builddir}/llvm-%{realversion}-%{llvmCommit}/clang/tools/scan-build -exec install {} %{i}/bin \;

diff --git a/pip/keras.file → pip/Keras.file b/pip/keras.file → pip/Keras.file
@@ -1,3 +1,2 @@
-%define PipDownloadSourceType none
 Requires: py3-PyYAML py3-six py3-Theano
 Requires: py3-h5py py3-keras-applications py3-keras-preprocessing
diff --git a/pip/hyperas.file b/pip/hyperas.file
@@ -1 +1 @@
-Requires: py3-jupyter py3-keras py3-hyperopt
+Requires: py3-jupyter py3-Keras py3-hyperopt
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
@@ -120,8 +120,9 @@ jupyter_console==6.2.0
 jupyter_core==4.6.3
 jupyter==1.0.0
 jupyterlab-widgets==1.0.0
-keras==2.6.0
+Keras==2.4.3
 keras-applications==1.0.8
+keras-nightly==2.7.0.dev2021071300
 keras-preprocessing==1.1.2
 keras2onnx==1.7.0
 keyring==22.3.0
@@ -255,10 +256,10 @@ stevedore==1.32.0
 subprocess32==3.5.4
 sympy==1.7.1
 tables==3.6.1
-#NO_AUTO_UPDATE:3: Force to use tensorflow 2.6.0; this should match the version in tensorflow-sources.spec
-tensorboard==2.6.0
-tensorflow==2.6.0
-tensorflow-estimator==2.6.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
+tensorflow==2.5.0
+tensorflow-estimator==2.5.0
 tensorboard-data-server==0.6.1
 tensorboard-plugin-wit==1.8.0
 termcolor==1.1.0

diff --git a/pip/tensorflow.file b/pip/tensorflow.file
@@ -4,7 +4,6 @@ Requires: tensorflow-sources
 %define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'
 ## INCLUDE tensorflow-requires
 Requires: py3-funcsigs py3-pbr py3-packaging py3-appdirs py3-pyparsing py3-mock py3-Werkzeug
-Requires: py3-grpcio py3-astunparse py3-keras
-Requires: llvm
+Requires: py3-grpcio py3-astunparse py3-keras-nightly
 %define source0 none
 %define source_file none
diff --git a/python_tools.spec b/python_tools.spec
@@ -8,7 +8,7 @@ Requires: professor2 rivet frontier_client onnxruntime openldap
 Requires: py2-future
 
 Requires: py3-scipy
-Requires: py3-keras
+Requires: py3-Keras
 Requires: py3-Theano
 Requires: py3-scikit-learn
 #save for the end

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 giflib sqlite grpc flatbuffers py3-pybind11
+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
@@ -4,7 +4,7 @@ BuildRequires: bazel java-env git
 ## INCLUDE tensorflow-requires
 ## INCLUDE compilation_flags
 
-%define tag         719e00b6f9553de2662b6df2c353d6934e941103
+%define tag         9e04c4f46d90cf7b73b9fb2203840d9e0b90faa8
 %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
@@ -73,6 +73,7 @@ echo "eigen_archive:${EIGEN_ROOT}"          >> ${TF_CMS_EXTERNALS}
 echo "curl:${CURL_ROOT}"                    >> ${TF_CMS_EXTERNALS}
 echo "com_google_protobuf:${PROTOBUF_ROOT}" >> ${TF_CMS_EXTERNALS}
 echo "com_github_grpc_grpc:${GRPC_ROOT}"    >> ${TF_CMS_EXTERNALS}
+echo "pcre:${PCRE_ROOT}"                    >> ${TF_CMS_EXTERNALS}
 echo "gif:${GIFLIB_ROOT}"                   >> ${TF_CMS_EXTERNALS}
 echo "org_sqlite:${SQLITE_ROOT}"            >> ${TF_CMS_EXTERNALS}
 echo "cython:"                              >> ${TF_CMS_EXTERNALS}

diff --git a/tensorflow-sources.spec b/tensorflow-sources.spec
@@ -1,4 +1,4 @@
-### RPM external tensorflow-sources 2.6.0
+### 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.6.0
+### RPM external tensorflow 2.5.0
 %if "%{?vectorized_package:set}" != "set"
 %define source_package tensorflow-sources
 %else