commit:     f6451b3b6917113444e88991dbbb46008dcc7e41
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  9 15:15:05 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 15:15:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6451b3b

dev-util/nvidia-cuda-toolkit: Bump to 11.2.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-util/nvidia-cuda-toolkit/Manifest              |   1 +
 .../nvidia-cuda-toolkit-11.2.2.ebuild              | 254 +++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest 
b/dev-util/nvidia-cuda-toolkit/Manifest
index 05c0cfeafed..5309b33e49d 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,5 +1,6 @@
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 
236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77
 SHA512 
ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B 
f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1
 SHA512 
3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
 DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 
5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3
 SHA512 
0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
+DIST cuda_11.2.2_460.32.03_linux.run 3057439068 BLAKE2B 
c3f3cd9eaaa4f91eb8080e7cafe1280f9bbc9cfc71ce1a6115af1dd348b83d30eed945609bf87e00d4873bede1fa9136fc4a7f393fd31db4e6406dc76086bc22
 SHA512 
e28d7d2eabd96df9e18f8e55f61adda39b07c2223605f77a6c2d92a02f7b57e9ce8b83d4b4de1124faa5670509d204d3db70c03b18af5cc5964b6ed6653d6a22
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B 
d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b
 SHA512 
d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 
5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc
 SHA512 
2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild 
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
new file mode 100644
index 00000000000..51c31e9cd7c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="460.32.03"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone";
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run";
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+       <sys-devel/gcc-11_pre[cxx]
+       >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm(+)]
+       debugger? (
+               dev-libs/openssl
+               sys-libs/libtermcap-compat
+               sys-libs/ncurses-compat:5[tinfo]
+       )
+       vis-profiler? (
+               dev-libs/openssl
+               >=virtual/jre-1.6
+       )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+       # We don't like to run cuda_pkg_setup as it depends on us
+       check-reqs_pkg_setup
+}
+
+src_prepare() {
+       # ATTENTION: change requires revbump
+       local cuda_supported_gcc="6.5 7.5 8.4 9.3 10.2 10.3"
+
+       sed \
+               -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+               "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+       default
+}
+
+src_install() {
+       local cudadir=/opt/cuda
+       local ecudadir="${EPREFIX}${cudadir}"
+       local pathextradirs ldpathextradirs
+       dodir ${cudadir}
+       into ${cudadir}
+
+       # Install standard sub packages
+       local builddirs=(
+               
builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+               builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+               $(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+               $(usex vis-profiler "builds/cuda_nvvp" "")
+               $(usex debugger "builds/cuda_gdb" "")
+       )
+
+       local d f
+       for d in "${builddirs[@]}"; do
+               ebegin "Installing ${d}"
+               [[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+               if [[ -d ${d}/bin ]]; then
+                       for f in ${d}/bin/*; do
+                               if [[ -f ${f} ]]; then
+                                       dobin "${f}"
+                               else
+                                       insinto ${cudadir}/bin
+                                       doins -r "${f}"
+                               fi
+                       done
+               fi
+
+               insinto ${cudadir}
+               if [[ -d ${d}/targets ]]; then
+                       doins -r "${d}"/targets
+               fi
+               if [[ -d ${d}/share ]]; then
+                       doins -r "${d}"/share
+               fi
+               if [[ -d ${d}/extras ]]; then
+                       doins -r "${d}"/extras
+               fi
+               eend
+       done
+       dobin "${T}"/cuda-config
+
+       doins builds/EULA.txt
+       # nvml and nvvm need special handling
+       ebegin "Installing nvvm"
+       doins -r builds/cuda_nvcc/nvvm
+       fperms +x ${cudadir}/nvvm/bin/cicc
+       eend
+
+       ebegin "Installing nvml"
+       doins -r builds/cuda_nvml_dev/nvml
+       eend
+
+       if use sanitizer; then
+               ebegin "Installing sanitizer"
+               dobin builds/integration/Sanitizer/compute-sanitizer
+               doins -r builds/cuda_sanitizer_api/compute-sanitizer
+               # special handling for the executable
+               fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+               eend
+       fi
+
+       use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+       if use vis-profiler; then
+               ebegin "Installing libnvvp"
+               doins -r builds/cuda_nvvp/libnvvp
+               # special handling for the executable
+               fperms +x ${cudadir}/libnvvp/nvvp
+               eend
+               pathextradirs+=":${ecudadir}/libnvvp"
+       fi
+
+       if use nsight; then
+               local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 
manifests/cuda_x86_64.xml)
+               ebegin "Installing ${ncu_dir}"
+               mv builds/nsight_compute builds/${ncu_dir} || die
+               doins -r builds/${ncu_dir}
+
+               # check this list on every bump
+               local exes=(
+                       
${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+                       
${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+                       ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+                       
${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+                       
${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+                       
${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+                       ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+               )
+
+               dobin 
builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+               eend
+
+               local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 
manifests/cuda_x86_64.xml)
+               ebegin "Installing ${nsys_dir}"
+               mv builds/nsight_systems builds/${nsys_dir} || die
+               doins -r builds/${nsys_dir}
+
+               # check this list on every bump
+               exes+=(
+                       ${nsys_dir}/host-linux-x64/nsys-ui
+                       ${nsys_dir}/host-linux-x64/nsys-ui.bin
+                       ${nsys_dir}/host-linux-x64/ResolveSymbols
+                       ${nsys_dir}/host-linux-x64/ImportNvtxt
+                       ${nsys_dir}/host-linux-x64/CrashReporter
+                       ${nsys_dir}/host-linux-x64/QdstrmImporter
+                       ${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+                       ${nsys_dir}/target-linux-x64/nsys
+                       ${nsys_dir}/target-linux-x64/launcher
+                       ${nsys_dir}/target-linux-x64/nvgpucs
+                       ${nsys_dir}/target-linux-x64/nsys-launcher
+                       ${nsys_dir}/target-linux-x64/sqlite3
+                       ${nsys_dir}/target-linux-x64/python/bin/python
+               )
+
+               dobin 
builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+               eend
+
+               # nsight scripts and binaries need to have their executable bit 
set, #691284
+               for f in "${exes[@]}"; do
+                       fperms +x ${cudadir}/${f}
+               done
+
+               # remove foreign archs (triggers SONAME warning, #749903)
+               rm -r 
"${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+               rm -r 
"${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+               rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+               # TODO: unbundle qt5
+               # TODO: unbundle boost
+               # TODO: unbundle icu
+               # TODO: unbundle openssl
+               # TODO: unbundle mesa
+               # TODO: unbundle libz
+               # TODO: unbundle libstdc++
+               # TODO: unbundle libSshClient
+               # TODO: unbundle sqlite
+               # TODO: unbundle libpfm ?
+       fi
+
+       # Add include and lib symlinks
+       dosym targets/x86_64-linux/include ${cudadir}/include
+       dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+       newenvd - 99cuda <<-EOF
+               PATH=${ecudadir}/bin${pathextradirs}
+               ROOTPATH=${ecudadir}/bin
+               
LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+       EOF
+
+       # Cuda prepackages libraries, don't revdep-build on them
+       insinto /etc/revdep-rebuild
+       newins - 80${PN} <<-EOF
+               SEARCH_DIRS_MASK="${ecudadir}"
+       EOF
+       # TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+       local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+       local b="0.0"
+       local v
+       for v in ${a}; do
+               ver_test "${v}" -gt "${b}" && b="${v}"
+       done
+
+       # if gcc and if not gcc-version is at least greatest supported
+       if tc-is-gcc && \
+               ver_test $(gcc-version) -gt "${b}"; then
+                       ewarn
+                       ewarn "gcc > ${b} will not work with CUDA"
+                       ewarn "Make sure you set an earlier version of gcc with 
gcc-config"
+                       ewarn "or append --compiler-bindir= pointing to a gcc 
bindir like"
+                       ewarn 
"--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+                       ewarn "to the nvcc compiler flags"
+                       ewarn
+       fi
+}
+
+pkg_postinst() {
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               pkg_postinst_check
+       fi
+
+       if use profiler || use nsight; then
+               einfo
+               einfo "nvidia-drivers restrict access to performance counters."
+               einfo "You'll need to either run profiling tools (nvprof, 
nsight) "
+               einfo "using sudo (needs cap SYS_ADMIN) or add the following 
line to "
+               einfo "a modprobe configuration file "
+               einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+               einfo
+               einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+               einfo
+       fi
+}

Reply via email to