diff --git a/alpaka.spec b/alpaka.spec index 2fa3951bf54..06b01df826d 100644 --- a/alpaka.spec +++ b/alpaka.spec @@ -1,4 +1,4 @@ -### RPM external alpaka 0.6.0 +### RPM external alpaka 0.7.0 ## NOCOMPILER Source: https://github.com/alpaka-group/%{n}/archive/%{realversion}.tar.gz diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 10e3468361d..34cff17193f 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -152,6 +152,7 @@ Requires: dablooms Requires: openldap Requires: gperftools Requires: cuda +Requires: cuda-compatible-runtime Requires: alpaka Requires: cupla diff --git a/cuda-compatible-runtime.spec b/cuda-compatible-runtime.spec new file mode 100644 index 00000000000..9565c5785d7 --- /dev/null +++ b/cuda-compatible-runtime.spec @@ -0,0 +1,26 @@ +### RPM external cuda-compatible-runtime 1.0 + +%define branch master +%define commit 18d5a51bfb32fbb7b765dd2eecd14e193cce8126 + +Source: git+https://:@gitlab.cern.ch:8443/cms-patatrack/%{n}.git?obj=%{branch}/%{commit}&export=%{n}&filter=./test.c&output=/%{n}-%{realversion}.tgz +Requires: cuda +AutoReq: no + +%prep +%setup -n %{n} + +%build +rm -rf %{_builddir}/build && mkdir %{_builddir}/build +gcc -std=c99 -O2 -Wall test.c -I $CUDA_ROOT/include -L $CUDA_ROOT/lib64 -L $CUDA_ROOT/lib64/stubs -l cudart_static -l cuda -ldl -lrt -pthread -static-libgcc -o %{_builddir}/build/cuda-compatible-runtime # || true + +%install + +mkdir %{i}/test +if [ -f %{_builddir}/build/cuda-compatible-runtime ]; then + cp %{_builddir}/build/cuda-compatible-runtime %{i}/test/cuda-compatible-runtime +else + ln -s /usr/bin/false %{i}/test/cuda-compatible-runtime +fi + +%post diff --git a/cuda.spec b/cuda.spec index 982cacf0269..68b14093137 100644 --- a/cuda.spec +++ b/cuda.spec @@ -1,7 +1,7 @@ -### RPM external cuda 11.2.2 +### RPM external cuda 11.4.2 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64 -%define driversversion 460.32.03 +%define driversversion 470.57.02 %ifarch x86_64 Source0: https://developer.download.nvidia.com/compute/cuda/%{realversion}/local_installers/%{n}_%{realversion}_%{driversversion}_linux.run @@ -32,13 +32,16 @@ mkdir -p %{i}/include mkdir -p %{i}/lib64 mkdir -p %{i}/lib64/stubs -# package only the runtime static library +# package only the runtime static libraries mv %_builddir/build/lib64/libcudadevrt.a %{i}/lib64/ +mv %_builddir/build/lib64/libcudart_static.a %{i}/lib64/ rm -f %_builddir/build/lib64/lib*.a -# package only the CUDA driver and NVML library stub -mv %_builddir/build/lib64/stubs/libcuda.so %{i}/lib64/stubs/ -mv %_builddir/build/lib64/stubs/libnvidia-ml.so %{i}/lib64/stubs/ +# package only the CUDA driver and NVML library stubs +mv %_builddir/build/lib64/stubs/libcuda.so %{i}/lib64/stubs/libcuda.so +ln -sf libcuda.so %{i}/lib64/stubs/libcuda.so.1 +mv %_builddir/build/lib64/stubs/libnvidia-ml.so %{i}/lib64/stubs/libnvidia-ml.so +ln -sf libnvidia-ml.so %{i}/lib64/stubs/libnvidia-ml.so.1 rm -rf %_builddir/build/lib64/stubs/ # do not package the OpenCL libraries diff --git a/cudnn.spec b/cudnn.spec index 778b2f5f22e..5cb14e25a77 100644 --- a/cudnn.spec +++ b/cudnn.spec @@ -1,7 +1,7 @@ -### RPM external cudnn 8.1.1.33 +### RPM external cudnn 8.2.2.26 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64 -%define cudaver 11.2 +%define cudaver 11.4 %define cudnnver_maj %(echo %{realversion} | cut -f1,2,3 -d.) %ifarch x86_64 diff --git a/cupla.spec b/cupla.spec index 78fa519f2c0..875cc90afdd 100644 --- a/cupla.spec +++ b/cupla.spec @@ -1,7 +1,6 @@ -### RPM external cupla 0.3.0-dev +### RPM external cupla 0.3.0 -#%define tag %{realversion} -%define tag 545702f1947feb1d46b2230b502f1f46179b3665 +%define tag %{realversion} Source: https://github.com/alpaka-group/%{n}/archive/%{tag}.tar.gz Requires: alpaka diff --git a/eigen.spec b/eigen.spec index d6c0a45e455..14c68c16ad7 100644 --- a/eigen.spec +++ b/eigen.spec @@ -1,7 +1,7 @@ -### RPM external eigen f612df273689a19d25b45ca4f8269463207c4fee +### RPM external eigen 82dd3710dac619448f50331c1d6a35da673f764a ## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig ## NOCOMPILER -%define tag 4fc3872b0dc7540aeaea8de04835508bbd90aae3 +%define tag 733e6166b2f8b4edd23da33985187fd60903e9ca %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/scram-tools.file/tools/cuda-compatible-runtime/cuda-compatible-runtime.xml b/scram-tools.file/tools/cuda-compatible-runtime/cuda-compatible-runtime.xml new file mode 100644 index 00000000000..feb68a6555d --- /dev/null +++ b/scram-tools.file/tools/cuda-compatible-runtime/cuda-compatible-runtime.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/scram-tools.file/tools/onnxruntime/onnxruntime.xml b/scram-tools.file/tools/onnxruntime/onnxruntime.xml index 8bc7139ee3e..ecff62d1bc1 100644 --- a/scram-tools.file/tools/onnxruntime/onnxruntime.xml +++ b/scram-tools.file/tools/onnxruntime/onnxruntime.xml @@ -6,7 +6,7 @@ - +