From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BFCD15815E for ; Fri, 2 Feb 2024 10:35:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AC31E2ABD; Fri, 2 Feb 2024 10:35:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44517E2ABD for ; Fri, 2 Feb 2024 10:35:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16CCF3431F9 for ; Fri, 2 Feb 2024 10:35:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 656BC888 for ; Fri, 2 Feb 2024 10:35:14 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1706870100.57f9ac98bb1ceafddac5569b71fdc0c08b8e19d3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/nvidia-cuda-toolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/nvidia-cuda-toolkit/Manifest dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild X-VCS-Directories: dev-util/nvidia-cuda-toolkit/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 57f9ac98bb1ceafddac5569b71fdc0c08b8e19d3 X-VCS-Branch: master Date: Fri, 2 Feb 2024 10:35:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1a596c2a-6220-4988-addb-d56a0b995acd X-Archives-Hash: 099c6d63582faa5ff67d3765405cdf5b commit: 57f9ac98bb1ceafddac5569b71fdc0c08b8e19d3 Author: David Seifert gentoo org> AuthorDate: Fri Feb 2 10:35:00 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Feb 2 10:35:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f9ac98 dev-util/nvidia-cuda-toolkit: drop 12.3.1 Signed-off-by: David Seifert gentoo.org> dev-util/nvidia-cuda-toolkit/Manifest | 1 - .../nvidia-cuda-toolkit-12.3.1.ebuild | 318 --------------------- 2 files changed, 319 deletions(-) diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index 7e444e871356..bd6dcf79f8ad 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,3 +1,2 @@ DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a -DIST cuda_12.3.1_545.23.08_linux.run 4368526618 BLAKE2B 45034e9f85dfff1e7fc9997ddbe80d739c02d07c888c595363744e598160b594f9026c621a0275f52f9f6636f69353ff8838372d97ab528a009c30662d65708c SHA512 d3708abc3652d2959cabbc999222caa4a2791bf6ec2ac963f57792aa83727aebf48c0a2524c25b3a7237f7fa8b90fc8303679e8eaeb5874c8eefd907290ae595 DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef424921f5a1dd99409a0351ea7d3453fcec3d484e714d87639e733cfae913b0f222d7af8acb7bebae340ea8af53fb7ab320805abb7b230 SHA512 dce569e42955fc351a6b52b2876948029d5183bb000754f0cdcba754673a280acfd4c9e4d8cf61d572ed045de006e0bbb0e8ff32012e6cc336be9c05fd529340 diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild deleted file mode 100644 index 8007ff67523f..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit check-reqs toolchain-funcs unpacker - -DRIVER_PV="545.23.08" - -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 examples nsight profiler rdma vis-profiler sanitizer" -RESTRICT="bindist mirror" - -# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the -# actual required minimum driver version are different. -RDEPEND=" - =x11-drivers/nvidia-drivers-525.60.13 - examples? ( - media-libs/freeglut - media-libs/glu - ) - nsight? ( - dev-libs/libpfm - dev-libs/wayland - dev-qt/qtwayland:6 - || ( - dev-libs/openssl-compat:1.1.1 - dev-libs/openssl:0/1.1 - ) - media-libs/tiff-compat:4 - sys-libs/zlib - ) - rdma? ( sys-cluster/rdma-core ) - vis-profiler? ( - >=virtual/jre-1.8:* - )" -BDEPEND="nsight? ( dev-util/patchelf )" - -QA_PREBUILT="opt/cuda/*" -CHECKREQS_DISK_BUILD="15000M" - -pkg_setup() { - check-reqs_pkg_setup -} - -src_prepare() { - # ATTENTION: change requires revbump, see link below for supported GCC # versions - # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements - local cuda_supported_gcc="8.5 9.5 10 11 12" - - 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_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl} - builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg} - builds/nvidia_fs - $(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "") - $(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 debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64" - 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}/ncu - ${ncu_dir}/ncu-ui - ${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/OpenGLVersionChecker - ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter - ${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/TreeLauncherSubreaper - ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper - ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu - ) - - dobin builds/integration/nsight-compute/{ncu,ncu-ui} - eend $? - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die - fi - - 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 - ${nsys_dir}/target-linux-x64/CudaGpuInfoDumper - ) - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die - fi - - dobin builds/integration/nsight-systems/{nsight-sys,nsys,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 - - # fix broken RPATHs - patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{libarrow.so,libparquet.so.500.0.0} || die - patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/{libarrow.so,libparquet.so.500.0.0} || die - - # 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 - - # unbundle libstdc++ - rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die - - # unbundle openssl - rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die - rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die - - # unbundle libpfm - rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die - - # TODO: unbundle qt5 - # TODO: unbundle boost - # TODO: unbundle icu - # TODO: unbundle mesa - # TODO: unbundle libSshClient - # TODO: unbundle sqlite - fi - - if use examples; then - local exes=( - extras/demo_suite/bandwidthTest - extras/demo_suite/busGrind - extras/demo_suite/deviceQuery - extras/demo_suite/nbody - extras/demo_suite/oceanFFT - extras/demo_suite/randomFog - extras/demo_suite/vectorAdd - ) - - # set executable bit on demo_suite binaries - for f in "${exes[@]}"; do - fperms +x ${cudadir}/${f} - done - else - rm -r "${ED}"/${cudadir}/extras/demo_suite || die - fi - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die - fi - - # Add include and lib symlinks - dosym targets/x86_64-linux/include ${cudadir}/include - dosym targets/x86_64-linux/lib ${cudadir}/lib64 - - # Remove bad symlinks - rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die - rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die - - 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 -} - -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 -}