From 95461df035e3867364495f065e5e805bf629b2d7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Oct 2021 00:10:07 +0100 Subject: gentoo resync : 25.10.2021 --- dev-util/nvidia-cuda-toolkit/Manifest | 6 +- .../nvidia-cuda-toolkit-10.2.89-r3.ebuild | 2 +- .../nvidia-cuda-toolkit-11.4.2.ebuild | 14 +- .../nvidia-cuda-toolkit-11.5.0.ebuild | 252 +++++++++++++++++++++ 4 files changed, 264 insertions(+), 10 deletions(-) create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild (limited to 'dev-util/nvidia-cuda-toolkit') diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index 90456e2db6b0..cc8b137275e4 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,6 +1,8 @@ AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e DIST cuda_11.4.2_470.57.02_linux.run 3833993301 BLAKE2B b12710da9f31e3255f31dd6b0dab8545463983a4cd1c4432bea027d4e5cc4d1ad9183e09b70ac4ea19c7d3e959df0d19bb41ea896d726e877fd3917a3045a9a4 SHA512 50c80141bfe458aa7216173d9d548f25ade03c68fff59ffe63f842773e5afba7635fb8fd79eda416507e1e88b5fe28b39ac8bdc66b168c73a72995824af5c689 -EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3925 BLAKE2B 5b193f9ba23ffe42a4a23a5e4dc0b526246286fa27c14b7d1bf41e50e24ab46c619f73e371bc1c0034ecd549839631c9f184b2ece8499150e9fa6350ed137add SHA512 30b1a97475666e9e19a1390ebac946d9c1c1b8c61fd35a44239ed751b53943eb66b4002e3b17bf9dff33d45a730db7b1b7c4d0a57cc09bac38609822eebe9fa6 -EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7136 BLAKE2B 5448967cc8b24db1cf2c382f93c83c29aa8f5fd105ae3f4389b0c9a7f652c527e0262d11068727fa4712a30f36b98548072a11d765692998bb883e2d6e7b0dff SHA512 28b7317bb2f044d5fbe25bcb098387de8c8406181de666c48c1ea43ea97ed39b8047e5f36224acc9e8c87e2d2d8bd5649120fd666443f462df710b590198f87c +DIST cuda_11.5.0_495.29.05_linux.run 3392192516 BLAKE2B f23587ff49e3fb247b3d7f6959695079955531503b202b4a93d907f81a8598ee01d44060cf60df0b0099d7f53d8025acf9e0d1766fb79639eb1b049f30919973 SHA512 577127699e8f91892f29b58b959cc15ed48dd96940184cc23970efdf419671a8232b5f291d39cb1721f465d59539eeb1c9a3d528acfd776fa8387ba235fea2e7 +EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3928 BLAKE2B 00b7552cbc2663ca5a95b9a89e076816e10d4629a9c276e8258debf0de67fac36e29b4937d42637d4890d0cf27773d3a7409ee121838df956878c7ed6f1ddf13 SHA512 2ce3292d3128e7dc647b9dfe0694b53ca27ec50b37238f894a2736c8a9e2617b918c3fe85492e9589bc4dd6ebba42f4ad3dea4385d86262fd1b15e03b3df4c02 +EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7157 BLAKE2B 612adad65b311fdc6c609ab1af213486f5f8a13f40f805d3ed1b48036248ae9cd86012dc019727db57cf6ee9b09658d4b799e302895e9f059b48ad9b9316db90 SHA512 b3f3202162548f79f60d04be1e4a144148daba3068a8e1b84648a92acfa21c3ab6d7a409f1f534ce9357bd22bb3638a87be877e721c1023ea42dc413c7f6a060 +EBUILD nvidia-cuda-toolkit-11.5.0.ebuild 7157 BLAKE2B 3eeabf492013f812b4feb6f99f64d272a9c7e71da21d32c3a8db10dd418291676f1e2b8c7c7e4261fec9273de8e0e35854b4e1ee7f51cfc208fc3e6045cf2ea3 SHA512 a3d48c5f0c0a6da9e138c0747a35ba5602f10eda97eba55f49c861e9ba9ee05f525832cf9c67124379925c88add1978395badd32e3c52a406f6329be17a8ba52 MISC metadata.xml 725 BLAKE2B d956929a7ec405eda0ca359de7edac9760a5b781af053c1ef54405612eae5380796601d13a443c48aed6ff0e7819339d8728dfe3b7a27fef17781aa1a1b6b36a SHA512 c8f9bce93904f604b5bd89367dc7d06c977ba574f3ed8bfe9f8afde0bd7b55706987a79e3e4d3cd79d609cac83a8db2efa693e348a6c825136872ea5d0de4df1 diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild index 9c782027dba0..53782c8b93a7 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild @@ -95,7 +95,7 @@ src_install() { for i in "${remove[@]}"; do ebegin "Cleaning ${i}..." rm -r "${i}" || die - eend + eend $? done dodir ${cudadir} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild index c929782ee396..88637c0358d5 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild @@ -92,7 +92,7 @@ src_install() { if [[ -d ${d}/extras ]]; then doins -r "${d}"/extras fi - eend + eend $? done dobin "${T}"/cuda-config @@ -101,11 +101,11 @@ src_install() { ebegin "Installing nvvm" doins -r builds/cuda_nvcc/nvvm fperms +x ${cudadir}/nvvm/bin/cicc - eend + eend $? ebegin "Installing nvml" doins -r builds/cuda_nvml_dev/nvml - eend + eend $? if use sanitizer; then ebegin "Installing sanitizer" @@ -113,7 +113,7 @@ src_install() { doins -r builds/cuda_sanitizer_api/compute-sanitizer # special handling for the executable fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer - eend + eend $? fi use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64" @@ -123,7 +123,7 @@ src_install() { doins -r builds/cuda_nvvp/libnvvp # special handling for the executable fperms +x ${cudadir}/libnvvp/nvvp - eend + eend $? pathextradirs+=":${ecudadir}/libnvvp" fi @@ -145,7 +145,7 @@ src_install() { ) dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} - eend + eend $? local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml) ebegin "Installing ${nsys_dir}" @@ -170,7 +170,7 @@ src_install() { ) dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui} - eend + eend $? # nsight scripts and binaries need to have their executable bit set, #691284 for f in "${exes[@]}"; do diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild new file mode 100644 index 000000000000..84b21d734454 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit check-reqs toolchain-funcs unpacker + +DRIVER_PV="495.29.05" + +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" +S="${WORKDIR}" + +LICENSE="NVIDIA-CUDA" +SLOT="0/${PV}" +KEYWORDS="-* ~amd64 ~amd64-linux" +IUSE="debugger nsight profiler vis-profiler sanitizer" +RESTRICT="bindist mirror" + +BDEPEND="" +RDEPEND=" + =x11-drivers/nvidia-drivers-${DRIVER_PV} + debugger? ( + dev-libs/openssl + sys-libs/libtermcap-compat + sys-libs/ncurses-compat:5[tinfo] + ) + vis-profiler? ( + dev-libs/openssl + >=virtual/jre-1.8:* + )" + +QA_PREBUILT="opt/cuda/*" +CHECKREQS_DISK_BUILD="6800M" + +pkg_setup() { + check-reqs_pkg_setup +} + +src_prepare() { + # ATTENTION: change requires revbump + local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.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,thrust} + 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 +} -- cgit v1.2.3