Skip to content
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

Jump to bottom

Revert to CUDA 10.1 Update 1 (10.1.168), add support for Power (11.0.x backport) #5419

Merged
merged 3 commits into from Dec 17, 2019
Merged

Revert to CUDA 10.1 Update 1 (10.1.168), add support for Power (11.0.x backport) #5419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fbef63
Remove Nsight Compute and Systems from the CUDA packages
fwyzard Dec 12, 2019
061c8c8
Revert to CUDA 10.1 Update 1 (10.1.168) on x86_64
fwyzard Dec 12, 2019
61f448f
Add support for CUDA on IBM Power architecture (ppc64le)
fwyzard Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmssw-tool-conf.spec
View file
Open in desktop
Expand Up @@ -169,13 +169,13 @@ Requires: codechecker-toolfile
Requires: gcc-checker-plugin-toolfile
Requires: openldap-toolfile
Requires: gperftools-toolfile
Requires: cuda-toolfile
Requires: cub-toolfile
Requires: cuda-api-wrappers-toolfile

%if %isnotppc64le_be
Requires: libunwind-toolfile
Requires: igprof-toolfile
Requires: cuda-toolfile
Requires: cub-toolfile
Requires: cuda-api-wrappers-toolfile
Requires: openloops-toolfile
%endif

Expand Down
9 changes: 3 additions & 6 deletions cuda-toolfile.spec
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml
<environment name="LIBDIR" default="$CUDA_BASE/lib64"/>
<environment name="INCLUDE" default="$CUDA_BASE/include"/>
</client>
%ifarch x86_64
%ifarch x86_64 ppc64le
<flags CUDA_FLAGS="-gencode arch=compute_35,code=sm_35"/>
<flags CUDA_FLAGS="-gencode arch=compute_60,code=sm_60"/>
<flags CUDA_FLAGS="-gencode arch=compute_70,code=sm_70"/>
Expand All @@ -58,7 +58,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cublas.xml
<info url="https://docs.nvidia.com/cuda/cublas/index.html"/>
<use name="cuda"/>
<lib name="cublas"/>
%ifarch x86_64
%ifarch x86_64 ppc64le
<lib name="cublasLt"/>
%endif
</tool>
Expand Down Expand Up @@ -86,9 +86,6 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cusolver.xml
<info url="https://docs.nvidia.com/cuda/cusolver/index.html"/>
<use name="cuda"/>
<lib name="cusolver"/>
%ifarch x86_64
<lib name="cusolverMg"/>
%endif
</tool>
EOF_TOOLFILE

Expand Down Expand Up @@ -135,7 +132,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvml.xml
</tool>
EOF_TOOLFILE

%ifarch x86_64
%ifarch x86_64 ppc64le
cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvjpeg.xml
<tool name="cuda-nvjpeg" version="@TOOL_VERSION@">
<info url="https://docs.nvidia.com/cuda/nvjpeg/index.html"/>
Expand Down
59 changes: 12 additions & 47 deletions cuda.spec
View file
Open in desktop
@@ -1,25 +1,23 @@
### RPM external cuda %{fullversion}

%ifarch x86_64
%define fullversion 10.1.243
%ifarch x86_64 ppc64le
%define fullversion 10.1.168
%define cudaversion %(echo %realversion | cut -d. -f 1,2)
%define driversversion 418.87.00
%define driversversion 418.67
%define cudasoversion %{driversversion}
%define nsightarch linux-desktop-glibc_2_11_3-x64
%define computeversion 2019.4.0
%define systemsversion 2019.3.7.5
%endif
%ifarch aarch64
%define fullversion 10.0.326
%define cudaversion %(echo %realversion | cut -d. -f 1,2)
%define driversversion 32.2.0
%define cudasoversion 1.1
%define nsightarch linux-v4l_l4t-glx-t210-a64
%define computeversion 1.0
%endif

%ifarch x86_64
Source0: https://developer.download.nvidia.com/compute/cuda/%{cudaversion}/Prod/local_installers/%{n}_%{realversion}_%{driversversion}_linux.run
Source0: https://developer.nvidia.com/compute/cuda/%{cudaversion}/Prod/local_installers/%{n}_%{realversion}_%{driversversion}_linux.run
%endif
%ifarch ppc64le
Source0: https://developer.nvidia.com/compute/cuda/%{cudaversion}/Prod/local_installers/%{n}_%{realversion}_%{driversversion}_linux_ppc64le.run
%endif
%ifarch aarch64
Source0: https://patatrack.web.cern.ch/patatrack/files/cuda-repo-l4t-10-0-local-%{realversion}_1.0-1_arm64.deb
Expand All @@ -37,15 +35,14 @@ rm -rf %_builddir/build %_builddir/tmp
mkdir %_builddir/build %_builddir/tmp

# extract and repackage the CUDA runtime, tools and stubs
%ifarch x86_64
%ifarch x86_64 ppc64le
/bin/sh %{SOURCE0} --silent --override --tmpdir %_builddir/tmp --extract=%_builddir/build
# extracts:
# %_builddir/build/EULA.txt
# %_builddir/build/NVIDIA-Linux-x86_64-418.87.00.run # linux drivers
# %_builddir/build/NVIDIA-Linux-%{_arch}-418.67.run # linux drivers
# %_builddir/build/cublas/ # standalone cuBLAS library, also included in cuda-toolkit
# %_builddir/build/cuda-samples/ # CUDA samples
# %_builddir/build/cuda-toolkit/ # CUDA runtime, tools and stubs
# %_builddir/build/integration/ # Nsight Systems and Compute wrappers
%endif
%ifarch aarch64
# extract the individual .deb archives from the repository into
Expand Down Expand Up @@ -79,7 +76,6 @@ rm -f %_builddir/build/cuda-toolkit/lib64/libcufft.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libcufftw.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libcurand.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libcusolver.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libcusolverMg.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libcusparse.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libnpp*.so*
rm -f %_builddir/build/cuda-toolkit/lib64/libnvgraph.so*
Expand All @@ -104,33 +100,6 @@ rm -f %_builddir/build/cuda-toolkit/bin/computeprof
# leave out the CUDA samples
rm -f %_builddir/build/cuda-toolkit/bin/cuda-install-samples-%{cudaversion}.sh

# package the Nsight Compute command line tool
mkdir %{i}/NsightCompute
%ifarch x86_64
mv %_builddir/build/cuda-toolkit/nsight-compute-%{computeversion}/target %{i}/NsightCompute/
mv %_builddir/build/cuda-toolkit/nsight-compute-%{computeversion}/sections %{i}/NsightCompute/
%endif
%ifarch aarch64
mv %_builddir/build/cuda-toolkit/NsightCompute-%{computeversion}/target %{i}/NsightCompute/
mv %_builddir/build/cuda-toolkit/NsightCompute-%{computeversion}/host %{i}/NsightCompute/
%endif
cat > %{i}/bin/nv-nsight-cu-cli <<@EOF
#! /bin/bash
exec %{i}/NsightCompute/target/%{nsightarch}/nv-nsight-cu-cli "\$@"
@EOF
chmod a+x %{i}/bin/nv-nsight-cu-cli

# package the Nsight Systems command line tool
%ifarch x86_64
mkdir %{i}/NsightSystems
mv %_builddir/build/cuda-toolkit/nsight-systems-%{systemsversion}/Target-x86_64 %{i}/NsightSystems/
cat > %{i}/bin/nsys <<@EOF
#! /bin/bash
exec %{i}/NsightSystems/Target-x86_64/x86_64/quadd_d --cli "\$@"
@EOF
chmod a+x %{i}/bin/nsys
%endif

# package the cuda-gdb support files, and rename the binary to use it via a wrapper
mv %_builddir/build/cuda-toolkit/share/gdb/ %{i}/share/
mv %_builddir/build/cuda-toolkit/bin/cuda-gdb %{i}/bin/cuda-gdb.real
Expand All @@ -149,8 +118,8 @@ mv %_builddir/build/cuda-toolkit/nvvm %{i}/
mv %_builddir/build/cuda-toolkit/version.txt %{i}/

# extract and repackage the NVIDIA libraries needed by the CUDA runtime
%ifarch x86_64
/bin/sh %_builddir/build/NVIDIA-Linux-x86_64-%{driversversion}.run --silent --extract-only --tmpdir %_builddir/tmp --target %_builddir/build/drivers
%ifarch x86_64 ppc64le
/bin/sh %_builddir/build/NVIDIA-Linux-%{_arch}-%{driversversion}.run --silent --extract-only --tmpdir %_builddir/tmp --target %_builddir/build/drivers
%endif
%ifarch aarch64
tar xaf %{SOURCE1} -C %_builddir/tmp Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2
Expand Down Expand Up @@ -181,9 +150,5 @@ sed \
-e's|$(_TARGET_SIZE_)|64|g' \
-i $RPM_INSTALL_PREFIX/%{pkgrel}/bin/nvcc.profile

# relocate the paths inside bin/nv-nsight-cu-cli
%{relocateConfig}bin/nv-nsight-cu-cli
%ifarch x86_64
%{relocateConfig}bin/nsys
%endif
# relocate the paths inside the scripts
%{relocateConfig}bin/cuda-gdb