Progress: cmssw-tool-conf builds

cms-sw · May 31, 2023 · 944d8bb · 944d8bb
1 parent cc6b98a
commit 944d8bb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/cuda.spec b/cuda.spec
@@ -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
@@ -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

diff --git a/cudnn.spec b/cudnn.spec
@@ -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

diff --git a/pip/cython.file b/pip/cython.file
@@ -1,2 +1 @@
-%define source0 https://github.com/cython/cython/archive/%{realversion}.tar.gz
 %define pip_name Cython
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -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==3.0.0a11
+cython==0.29.35
 dask==2023.4.0
 dask-awkward==2023.4.1
 decorator==5.1.1
@@ -216,7 +216,7 @@ notebook-shim==0.2.2
 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
@@ -225,7 +225,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
@@ -342,7 +342,7 @@ 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.11.0
 tensorboard==2.12.1
-tensorflow-io-gcs-filesystem==0.30.0
+tensorflow-io-gcs-filesystem==0.32.0
 tensorflow-estimator==2.12.0
 tensorboard-data-server==0.7.0
 tensorboard-plugin-wit==1.8.1

diff --git a/pip/tensorflow-io-gcs-filesystem.file b/pip/tensorflow-io-gcs-filesystem.file
@@ -1,2 +1,3 @@
-%define source0 https://github.com/tensorflow/io/archive/refs/tags/v0.30.0.tar.gz
+%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
diff --git a/pip/tensorflow-io-gcs-filesystem.patch b/pip/tensorflow-io-gcs-filesystem.patch
@@ -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"
diff --git a/tensorflow-requires.file b/tensorflow-requires.file
@@ -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

diff --git a/ucx.spec b/ucx.spec
@@ -1,4 +1,4 @@
-### RPM external ucx 1.14.0
+### RPM external ucx 1.14.1
 Source: https://github.com/openucx/%{n}/archive/refs/tags/v%{realversion}.tar.gz
 BuildRequires: autotools
 Requires: cuda gdrcopy