Skip to content

Update tensorflow to 2.11 #8533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iarspider wants to merge 1 commit into from
Closed

Update tensorflow to 2.11 #8533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion abseil-cpp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external abseil-cpp 20210324.2
### RPM external abseil-cpp 20220623.1
Source: https://github.com/abseil/abseil-cpp/archive/%{realversion}.tar.gz

BuildRequires: cmake gmake
Expand Down
12 changes: 6 additions & 6 deletions bazel-3.7.0-patches.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
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 100755
index 9f7fe1f..e584fb9 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 {
@@ -377,7 +377,7 @@ public interface StarlarkActionFactoryApi extends StarlarkValue {
+ " the former are more efficient."),
@Param(
name = "use_default_shell_env",
type = Boolean.class,
- defaultValue = "False",
+ defaultValue = "True",
named = true,
positional = false,
doc = "Whether the action should use the built in shell environment or not."),
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
index d48485b..40ca051 100755
index bfb37bd..45e311c 100755
--- a/tools/cpp/unix_cc_configure.bzl
+++ b/tools/cpp/unix_cc_configure.bzl
@@ -193,6 +193,7 @@ def _find_gold_linker_path(repository_ctx, cc):
@@ -184,6 +184,7 @@ def _find_linker_path(repository_ctx, cc, linker, is_clang):
Returns:
String to put as value to -fuse-ld= flag, or None if gold couldn't be found.
String to put as value to -fuse-ld= flag, or None if linker couldn't be found.
"""
+ return None
result = repository_ctx.execute([
Expand Down
4 changes: 1 addition & 3 deletions bazel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external bazel 3.7.2
### RPM external bazel 6.0.0

Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip

Expand All @@ -17,7 +17,6 @@ BuildRequires: java-env python3 python-python3
# configuration issue
# https://github.com/bazelbuild/bazel/issues/9392
Patch0: bazel-3.7.0-patches
Patch1: bazel-3.7.2-gcc11

%prep

Expand All @@ -26,7 +25,6 @@ Patch1: bazel-3.7.2-gcc11
%setup -q -n bazel-%{realversion}

%patch0 -p1
%patch1 -p1

%build

Expand Down
13 changes: 8 additions & 5 deletions cuda.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM external cuda 11.5.2
### RPM external cuda 12.0.1
## INITENV +PATH LD_LIBRARY_PATH %i/lib64

%define runpath_opts -m compute-sanitizer -m drivers -m nvvm
%define driversversion 495.29.05
%define driversversion 525.85.12

%ifarch x86_64
Source0: https://developer.download.nvidia.com/compute/cuda/%{realversion}/local_installers/%{n}_%{realversion}_%{driversversion}_linux.run
Expand Down Expand Up @@ -96,12 +96,15 @@ mkdir -p %{i}/drivers
mv %_builddir/build/drivers/libcuda.so.%{driversversion} %{i}/drivers/
ln -sf libcuda.so.%{driversversion} %{i}/drivers/libcuda.so.1
ln -sf libcuda.so.1 %{i}/drivers/libcuda.so
mv %_builddir/build/drivers/libcudadebugger.so.%{driversversion} %{i}/drivers/
ln -sf libcudadebugger.so.%{driversversion} %{i}/drivers/libcudadebugger.so.1
ln -sf libcudadebugger.so.1 %{i}/drivers/libcudadebugger.so
mv %_builddir/build/drivers/libnvidia-ptxjitcompiler.so.%{driversversion} %{i}/drivers/
ln -sf libnvidia-ptxjitcompiler.so.%{driversversion} %{i}/drivers/libnvidia-ptxjitcompiler.so.1
ln -sf libnvidia-ptxjitcompiler.so.1 %{i}/drivers/libnvidia-ptxjitcompiler.so
cp %{i}/nvvm/lib64/libnvvm.so.4.0.0 %{i}/drivers/
ln -sf libnvvm.so.4.0.0 %{i}/drivers/libnvvm.so.4
ln -sf libnvvm.so.4 %{i}/drivers/libnvvm.so
mv %_builddir/build/drivers/libnvidia-nvvm.so.%{driversversion} %{i}/drivers/
ln -sf libnvidia-nvvm.so.%{driversversion} %{i}/drivers/libnvidia-nvvm.so.4
ln -sf libnvidia-nvvm.so.4 %{i}/drivers/libnvidia-nvvm.so

%post
# let nvcc find its components when invoked from the command line
Expand Down
2 changes: 1 addition & 1 deletion cudnn.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM external cudnn 8.8.0.121
## INITENV +PATH LD_LIBRARY_PATH %i/lib64

%define cudaver 11
%define cudaver 12

# NVIDIA uses sbsa for aarch64, and the standard architecture name for ppc64le and x86_64
%ifarch aarch64
Expand Down
4 changes: 2 additions & 2 deletions eigen.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM external eigen 82dd3710dac619448f50331c1d6a35da673f764a
### RPM external eigen 3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e
## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
## NOCOMPILER
%define tag 43d8892d117e4e76b6c472b942ebefee00bfc172
%define tag fe7e6a8ef4921dd6c7b5b893a9972948f1b451d3
%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
Expand Down
5 changes: 4 additions & 1 deletion flatbuffers.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external flatbuffers 1.12.0
### RPM external flatbuffers 2.0.8
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64

%define tag v%{realversion}
Expand Down Expand Up @@ -29,3 +29,6 @@ make -v %{makeprocesses}
cd ../build

make %{makeprocesses} install

%post
%{relocateConfig}lib64/pkgconfig/flatbuffers.pc
3 changes: 2 additions & 1 deletion gbl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external gbl V02-04-01
### RPM external gbl V03-00-00

%define tag 31e726d777fe93cdbed0c363dc15f803f7767f40
Source: git+https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git?obj=main/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Expand All @@ -18,6 +18,7 @@ cd build
cmake ../cpp \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DEIGEN3_INCLUDE_DIR=${EIGEN_ROOT}/include/eigen3 \
-DSUPPORT_ROOT=False

Expand Down
2 changes: 1 addition & 1 deletion giflib.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external giflib 5.2.0
### RPM external giflib 5.2.1

Source: https://sourceforge.net/projects/giflib/files/giflib-%{realversion}.tar.gz
BuildRequires: autotools
Expand Down
4 changes: 2 additions & 2 deletions java-env.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### RPM external java-env 1.1
### RPM external java-env 11.0
## INITENV SET JAVA_HOME %{java_home}
## INITENV +PATH PATH %{java_home}/bin
## INITENV +PATH LD_LIBRARY_PATH %{java_home}/lib
## NOCOMPILER

%define java_home /usr/lib/jvm/java
%define java_home /etc/alternatives/jre_11
Source: none

%prep
Expand Down
1 change: 1 addition & 0 deletions lwtnn.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ cmake ../%{n}-%{realversion} \
-G Ninja \
-DCMAKE_CXX_COMPILER="g++" \
-DCMAKE_CXX_FLAGS="-fPIC" \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX:PATH="%{i}" \
-DCMAKE_BUILD_TYPE=Release \
-DBUILTIN_BOOST=OFF \
Expand Down
3 changes: 2 additions & 1 deletion opencv.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external opencv 4.5.5
### RPM external opencv 4.7.0
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
%define tag %{realversion}
%define branch master
Expand All @@ -19,6 +19,7 @@ cd ../build
cmake ../%{n}-%{realversion} \
-GNinja \
-DCMAKE_INSTALL_PREFIX="%{i}" \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_LIBDIR=lib \
-DWITH_EIGEN=ON \
-DBUILD_EXAMPLES=OFF \
Expand Down
2 changes: 1 addition & 1 deletion pip/hep_ml.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requires: py3-Theano
# Requires: py3-Theano
Requires: py3-pandas py3-scikit-learn
3 changes: 2 additions & 1 deletion pip/keras.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
%define PipDownloadSourceType none
Requires: py3-PyYAML py3-six py3-Theano
Requires: py3-PyYAML py3-six
# Requires: py3-Theano
Requires: py3-h5py py3-keras-applications py3-keras-preprocessing
18 changes: 6 additions & 12 deletions pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ cryptography==40.0.2
cryptography==3.2.1 ; cmsos_name=='slc7'
cx-Oracle==8.3.0
cycler==0.11.0
cython==0.29.34
cython==0.29.35
dask==2023.4.0
dask-awkward==2023.4.1
decorator==5.1.1
Expand All @@ -91,7 +91,6 @@ distlib==0.3.6
distro==1.8.0
docopt==0.6.2
docutils==0.19
downhill==0.4.0
dulwich==0.21.3
editables==0.3
entrypoints==0.4
Expand Down Expand Up @@ -128,7 +127,6 @@ hatchling==1.14.0
h5py==3.8.0
hepdata-lib==0.12.0
hepdata-validator==0.3.3
hep_ml==0.7.2
hist==2.6.3
histbook==1.2.5
histoprint==2.4.0
Expand Down Expand Up @@ -165,7 +163,7 @@ jupyter-server-mathjax==0.2.6
jupyter-server-terminals==0.4.4
jupyterlab-widgets==3.0.7
#NO_AUTO_UPDATE: needs newer TF
keras==2.6.0
keras==2.11.0
keras-applications==1.0.8
keras-preprocessing==1.1.2
keras2onnx==1.7.0
Expand All @@ -174,7 +172,6 @@ kiwisolver==1.4.4
law==0.1.12
lazy-object-proxy==1.9.0
lizard==1.17.10
#llvmlite==v0.41.0dev0
locket==1.0.0
lockfile==0.12.2
luigi==3.2.1
Expand Down Expand Up @@ -203,7 +200,6 @@ multidict==6.0.4
nbclassic==0.5.5
nbclient==0.7.3
nbconvert==7.3.0
#nbdime==3.1.0 ; disabled not used by cmssw
nbformat==5.8.0
ndindex==1.6
nest-asyncio==1.5.6
Expand All @@ -212,11 +208,10 @@ neurolab==0.3.5
node-semver==0.9.0
notebook==6.5.3
notebook-shim==0.2.2
# numba==0.56.4
numexpr==2.8.4
# setuptools version <64 is needed by numpy: https://github.com/pypa/setuptools/issues/3549
# NO_AUTO_UPDATE: update together with tensorflow
numpy==1.23.5
numpy==1.24.3
# NO_AUTO_UPDATE:1
onnx==1.12.0
onnxmltools==1.11.2
Expand All @@ -225,7 +220,7 @@ oauthlib==3.2.2
opt-einsum==3.3.0
pkginfo==1.9.6
packaging==23.0
pandas==2.0.0
pandas==2.0.1
pandocfilters==1.5.0
parsimonious==0.10.0
parso==0.8.3
Expand Down Expand Up @@ -299,7 +294,6 @@ pyzmq==25.0.2
rapidfuzz==2.15.1
regex==2023.3.23
repoze-lru==0.7
rep==0.6.6
requests==2.28.2
requests-toolbelt==0.10.1
requests-oauthlib==1.3.1
Expand Down Expand Up @@ -340,8 +334,9 @@ sympy==1.11.1
tables==3.8.0
tenacity==8.2.2
#NO_AUTO_UPDATE:1: Force to use tensorflow 2.6.4; this should match the version in tensorflow-sources.spec
tensorflow==2.6.4
tensorflow==2.11.0
tensorboard==2.12.1
tensorflow-io-gcs-filesystem==0.32.0
tensorflow-estimator==2.12.0
tensorboard-data-server==0.7.0
tensorboard-plugin-wit==1.8.1
Expand All @@ -350,7 +345,6 @@ terminado==0.17.1
testpath==0.6.0
#NO_AUTO_UPDATE: Below is a dummy test package to show how to use custom download command to download a package source.
test-download==7.44.1
Theano==1.0.5
tinycss2==1.2.1
toml==0.10.2
tomli==2.0.1
Expand Down
3 changes: 3 additions & 0 deletions pip/tensorflow-io-gcs-filesystem.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
%define source0 https://github.com/tensorflow/io/archive/refs/tags/v%{realversion}.tar.gz
%define PipPreBuild export PIP_GLOBAL_OPTION="--project tensorflow-io-gcs-filesystem"
Patch0: pip/tensorflow-io-gcs-filesystem
11 changes: 11 additions & 0 deletions pip/tensorflow-io-gcs-filesystem.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- io-0.32.0/setup.py.orig 2023-05-26 11:55:15.700996077 +0200
+++ io-0.32.0/setup.py 2023-05-26 11:55:29.979871551 +0200
@@ -46,7 +46,7 @@
sys.argv.remove("--project")
sys.argv.pop(project_idx)
else:
- project = "tensorflow-io"
+ project = "tensorflow-io-gcs-filesystem"

assert (
project.replace("_", "-") == "tensorflow-io"
2 changes: 2 additions & 0 deletions pip/tensorflow.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ Requires: py3-tensorboard py3-opt-einsum py3-tensorflow-estimator py3-wrapt py3-
Requires: tensorflow-sources
%define PipPreBuildPy PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp%{cms_python3_major_minor}-cp%{cms_python3_major_minor}-linux_%{_arch}.whl
%define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'
%define PipDepsPost | grep -v libclang
## 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: py3-tensorflow-io-gcs-filesystem
Requires: llvm
%define source0 none
%define source_file none
Expand Down
5 changes: 4 additions & 1 deletion professor2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ Patch0: professor2-ppc64-flag-change
%ifarch ppc64le
%patch0 -p1
%endif
sed -i -e 's|^ *CXXSTD *:=.*|CXXSTD:=c++17|' Makefile
sed -i -e 's|std=c++11|std=c++17|' pyext/setup.py

%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES}

%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES}:./pyext/professor2

%build
make %{build_flags}
Expand Down
6 changes: 3 additions & 3 deletions python_tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Requires: py3-anyio
Requires: py3-sniffio
Requires: py3-scipy
Requires: py3-keras
Requires: py3-Theano
# Requires: py3-Theano
Requires: py3-scikit-learn
#save for the end
Requires: py3-tensorflow
Expand All @@ -22,9 +22,9 @@ Requires: py3-numexpr
Requires: py3-histogrammar
Requires: py3-pandas
Requires: py3-Bottleneck
Requires: py3-downhill
# Requires: py3-downhill
Requires: py3-xgboost
Requires: py3-hep_ml
# Requires: py3-hep_ml
Requires: py3-uncertainties
Requires: py3-seaborn
Requires: py3-h5py
Expand Down
2 changes: 0 additions & 2 deletions scram-tools.file/tools/abseil-cpp/abseil-cpp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<lib name="absl_hash"/>
<lib name="absl_hashtablez_sampler"/>
<lib name="absl_int128"/>
<lib name="absl_leak_check_disable"/>
<lib name="absl_leak_check"/>
<lib name="absl_log_severity"/>
<lib name="absl_malloc_internal"/>
Expand Down Expand Up @@ -60,7 +59,6 @@
<lib name="absl_throw_delegate"/>
<lib name="absl_time"/>
<lib name="absl_time_zone"/>
<lib name="absl_wyhash"/>
<client>
<environment name="ABSEIL_CPP_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$ABSEIL_CPP_BASE/lib"/>
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-requires.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Requires: py3-cython py3-protobuf 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
BuildRequires: py3-wheel
%define enable_gpu 1
%define enable_gpu 0
%if %{enable_gpu}
%if "%{cmsos}" != "slc7_aarch64"
## INCLUDE cuda-flags
Expand Down
Loading