diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix index 43dbae7d83fe..233bcb5d194e 100644 --- a/pkgs/by-name/oc/octopus/package.nix +++ b/pkgs/by-name/oc/octopus/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { cudaPackages.libcublas cudaPackages.libcufft cudaPackages.cuda_nvrtc - cudaPackages.cuda_nvtx + cudaPackages.nvtx ] ++ lib.optionals enableHip [ rocmPackages.clr diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index 6481ed441105..cd02c2b2ac4f 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (gpuBackend == "cuda") [ cudaPackages.cuda_cudart cudaPackages.cuda_profiler_api - cudaPackages.cuda_nvtx + cudaPackages.nvtx cudaPackages.libcufft cudaPackages.libcusolver cudaPackages.libcublas diff --git a/pkgs/by-name/xl/xla/cuda-local.nix b/pkgs/by-name/xl/xla/cuda-local.nix index d59095b906cb..bb49747e88c7 100644 --- a/pkgs/by-name/xl/xla/cuda-local.nix +++ b/pkgs/by-name/xl/xla/cuda-local.nix @@ -29,7 +29,7 @@ let cuda_nvdisasm cuda_nvprune cuda_profiler_api - cuda_nvtx + nvtx ] ++ lib.optional (lib.versionAtLeast cudaPackages.cuda_nvcc.version "13") cudaPackages.cuda_crt; cudaRoots = lib.unique ( diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index df3832ef952c..bf8057b8fadc 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -16,4 +16,10 @@ builtins.mapAttrs mkRenamed { path = "cccl"; package = final.cccl; }; + + # NVTX is built from source when possible, so it is no longer named after the redistributable. + cuda_nvtx = { + path = "nvtx"; + package = final.nvtx; + }; } diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix index c4a02b2c4317..09d7773674a0 100644 --- a/pkgs/development/cuda-modules/packages/cuda-samples.nix +++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix @@ -8,7 +8,7 @@ cuda_cudart, cuda_nvcc, cuda_nvrtc, - cuda_nvtx, + nvtx, cuda_profiler_api, cudaAtLeast, cudaNamePrefix, @@ -187,7 +187,7 @@ backendStdenv.mkDerivation (finalAttrs: { cccl cuda_cudart cuda_nvrtc - cuda_nvtx + nvtx cuda_profiler_api libcublas libcufft diff --git a/pkgs/development/cuda-modules/packages/cudatoolkit.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix index 488247d7da3b..63e32c93d09d 100644 --- a/pkgs/development/cuda-modules/packages/cudatoolkit.nix +++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix @@ -16,7 +16,7 @@ cuda_nvml_dev ? null, cuda_nvprune ? null, cuda_nvrtc ? null, - cuda_nvtx ? null, + nvtx ? null, cuda_profiler_api ? null, cuda_sanitizer_api ? null, libcublas ? null, @@ -46,7 +46,7 @@ let cuda_cuxxfilt cuda_nvml_dev cuda_nvrtc - cuda_nvtx + nvtx cuda_profiler_api cuda_sanitizer_api libcublas diff --git a/pkgs/development/cuda-modules/packages/libnvshmem.nix b/pkgs/development/cuda-modules/packages/libnvshmem.nix index 4457c997990e..778096301ed3 100644 --- a/pkgs/development/cuda-modules/packages/libnvshmem.nix +++ b/pkgs/development/cuda-modules/packages/libnvshmem.nix @@ -9,7 +9,7 @@ cuda_nvcc, cuda_nvml_dev, cuda_nvrtc, - cuda_nvtx, + nvtx, cudaAtLeast, cudaMajorMinorVersion, cudaNamePrefix, @@ -125,7 +125,7 @@ backendStdenv.mkDerivation (finalAttrs: { cuda_cudart cuda_nvml_dev cuda_nvrtc - cuda_nvtx + nvtx libnvjitlink rdma-core ] diff --git a/pkgs/development/cuda-modules/packages/nvtx/package.nix b/pkgs/development/cuda-modules/packages/nvtx/package.nix new file mode 100644 index 000000000000..f068c403eafb --- /dev/null +++ b/pkgs/development/cuda-modules/packages/nvtx/package.nix @@ -0,0 +1,2 @@ +{ callPackage }: +callPackage ./redist.nix { } diff --git a/pkgs/development/cuda-modules/packages/cuda_nvtx.nix b/pkgs/development/cuda-modules/packages/nvtx/redist.nix similarity index 90% rename from pkgs/development/cuda-modules/packages/cuda_nvtx.nix rename to pkgs/development/cuda-modules/packages/nvtx/redist.nix index ef079fe0110d..a320923c95a8 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvtx.nix +++ b/pkgs/development/cuda-modules/packages/nvtx/redist.nix @@ -1,6 +1,7 @@ { buildRedist }: buildRedist { redistName = "cuda"; + # NOTE: The redistributable is named cuda_nvtx in the manifests. pname = "cuda_nvtx"; outputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 4f69dcf291f3..c30d2e54a70f 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -141,7 +141,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs cuda_cudart # cuda.h, cuda_runtime.h, libcudart_static.a cuda_cuxxfilt # nv_decode.h cuda_nvrtc # nvrtc.h - cuda_nvtx # nvToolsExt.h + nvtx # nvToolsExt.h cuda_profiler_api # cuda_profiler_api.h libcublas # cublas_v2.h libcufft # cufft.h diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 27631cde8599..767d8f5a1aee 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -121,7 +121,7 @@ let (lib.getDev cuda_cupti) # cupti.h (lib.getDev cuda_nvcc) # See https://github.com/google/jax/issues/19811 (lib.getDev cuda_nvml_dev) # nvml.h - (lib.getDev cuda_nvtx) # nvToolsExt.h + (lib.getDev nvtx) # nvToolsExt.h (lib.getDev libcublas) # cublas_api.h (lib.getDev libcufft) # cufft.h (lib.getDev libcurand) # curand.h diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 6d5720c45b4e..52bbf0a7ee03 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -74,7 +74,7 @@ buildPythonPackage { [ # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships # libnvToolsExt-$hash.so.1 - cuda_nvtx + nvtx cuda_cudart cuda_cupti diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index a7bca6b0b8d4..1ea655b267d9 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -609,7 +609,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too cuda_nvml_dev # cuda_nvrtc - cuda_nvtx # -llibNVToolsExt + nvtx # -llibNVToolsExt libcublas libcufft libcurand diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 3d6cd7c08ff7..a37115a63c68 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: { # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships # libnvToolsExt-$hash.so.1 - cuda_nvtx + nvtx ] ); diff --git a/pkgs/development/python-modules/transformer-engine/default.nix b/pkgs/development/python-modules/transformer-engine/default.nix index 8aa88ea1484c..6777531f5e40 100644 --- a/pkgs/development/python-modules/transformer-engine/default.nix +++ b/pkgs/development/python-modules/transformer-engine/default.nix @@ -222,7 +222,7 @@ buildPythonPackage.override { stdenv = backendStdenv; } (finalAttrs: { cudaPackages.cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too cudaPackages.cuda_nvml_dev # nvml.h cudaPackages.cuda_nvrtc # nvrtc.h - cudaPackages.cuda_nvtx # nvToolsExt.h + cudaPackages.nvtx # nvToolsExt.h cudaPackages.cuda_profiler_api # cuda_profiler_api.h cudaPackages.cudnn # cudnn.h cudaPackages.libcublas diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 54f7c55f8ad6..af1d6664ee95 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -360,7 +360,7 @@ let libcurand # curand_kernel.h libcusparse # cusparse.h libcusolver # cusolverDn.h - cuda_nvtx + nvtx cuda_nvrtc # cusparselt # cusparseLt.h libcublas