Skip to content

Backport CUDA updates from the 12.1.x branch #7340

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
fwyzard wants to merge 9 commits into from
Closed

Backport CUDA updates from the 12.1.x branch #7340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e9845d
Update to CUDA 11.4.2
fwyzard Nov 2, 2020
ef65503
Update cuDNN to v8.2.2.26 for CUDA 11.4
fwyzard Aug 3, 2021
0d32e83
Enable the use of cuDNN for ONNX on ARM for CentOS 8
fwyzard Sep 8, 2021
c364a99
Include the CUDA runtime static library in the external package
fwyzard Sep 8, 2021
b3864d0
Create symlinks for the library stubs to satisfy link-time checks
fwyzard Sep 9, 2021
da32034
Add the cuda-compatible-runtime test as a new external
fwyzard Sep 8, 2021
5573ccb
Update Alpaka to version 0.7.0
fwyzard Aug 3, 2021
b076f72
Update Cupla to version 0.3.0
fwyzard Aug 5, 2021
bfd920c
Update Eigen
fwyzard Sep 29, 2021
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 alpaka.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions cmssw-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ Requires: dablooms
Requires: openldap
Requires: gperftools
Requires: cuda
Requires: cuda-compatible-runtime
Requires: alpaka
Requires: cupla

Expand Down
26 changes: 26 additions & 0 deletions cuda-compatible-runtime.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 9 additions & 6 deletions cuda.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 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.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
Expand Down
5 changes: 2 additions & 3 deletions cupla.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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 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
Expand Down
8 changes: 8 additions & 0 deletions scram-tools.file/tools/cuda-compatible-runtime/cuda-compatible-runtime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<tool name="cuda-compatible-runtime" version="@TOOL_VERSION@">
<info url="https://gitlab.cern.ch/cms-patatrack/cuda-compatible-runtime/"/>
<use name="cuda"/>
<use name="cuda-stubs"/>
<client>
<environment name="CUDA_COMPATIBLE_RUNTIME_BASE" default="@TOOL_ROOT@"/>
</client>
</tool>
2 changes: 1 addition & 1 deletion scram-tools.file/tools/onnxruntime/onnxruntime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<environment name="LIBDIR" default="$ONNXRUNTIME_BASE/lib"/>
</client>
<use name="protobuf"/>
<ifarchitecture name="!aarch64">
<ifarchitecture name="!slc7_aarch64">
<use name="cuda"/>
<use name="cudnn"/>
</ifarchitecture>
Expand Down