From 5a536869ad321624304bd266d9def98e25a04796 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 28 May 2025 08:03:12 -0500 Subject: [PATCH 1/5] Avoid vendoring NVTX and CCCL. --- conda/recipes/librmm/recipe.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/librmm/recipe.yaml b/conda/recipes/librmm/recipe.yaml index 0d371641f..b4a003669 100644 --- a/conda/recipes/librmm/recipe.yaml +++ b/conda/recipes/librmm/recipe.yaml @@ -58,6 +58,8 @@ cache: - rapids-logger =0.1 - if: cuda_major != "11" then: cuda-driver-dev + - cccl =2.8.4 + - nvtx-c =3.2.0 outputs: - package: From e4471790d7f9a596fcd41ddb3c8f43132722a01d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 28 May 2025 08:18:58 -0500 Subject: [PATCH 2/5] Add to dependencies.yaml and run dependencies of librmm. --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 ++ conda/environments/all_cuda-118_arch-x86_64.yaml | 2 ++ conda/environments/all_cuda-128_arch-aarch64.yaml | 2 ++ conda/environments/all_cuda-128_arch-x86_64.yaml | 2 ++ conda/recipes/librmm/recipe.yaml | 2 ++ dependencies.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index c24757b76..b2143fad1 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -7,6 +7,7 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler +- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 @@ -28,6 +29,7 @@ dependencies: - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-aarch64=11.8 +- nvtx==3.2.0 - pre-commit - pytest - pytest-cov diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index fc14e3678..faeabe37b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -7,6 +7,7 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler +- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 @@ -28,6 +29,7 @@ dependencies: - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 +- nvtx==3.2.0 - pre-commit - pytest - pytest-cov diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml index ebb6c4da1..232ffcae7 100644 --- a/conda/environments/all_cuda-128_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -7,6 +7,7 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler +- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 @@ -27,6 +28,7 @@ dependencies: - numba>=0.59.1,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc +- nvtx==3.2.0 - pre-commit - pytest - pytest-cov diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 8f6dfce78..ca03733bd 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -7,6 +7,7 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler +- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 @@ -27,6 +28,7 @@ dependencies: - numba>=0.59.1,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc +- nvtx==3.2.0 - pre-commit - pytest - pytest-cov diff --git a/conda/recipes/librmm/recipe.yaml b/conda/recipes/librmm/recipe.yaml index b4a003669..cd19d6fec 100644 --- a/conda/recipes/librmm/recipe.yaml +++ b/conda/recipes/librmm/recipe.yaml @@ -90,6 +90,8 @@ outputs: then: cudatoolkit else: cuda-cudart - rapids-logger =0.1 + - cccl =2.8.4 + - nvtx-c =3.2.0 run_exports: - ${{ pin_subpackage("librmm", upper_bound="x.x") }} ignore_run_exports: diff --git a/dependencies.yaml b/dependencies.yaml index ada445aa9..3b0eeda1c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -129,6 +129,8 @@ dependencies: packages: - c-compiler - cxx-compiler + - cccl==2.8.4 + - nvtx==3.2.0 specific: - output_types: conda matrices: From c0c7dcaf49646af5a8b7f71b3e80dd0dc3d06f3f Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 30 May 2025 12:28:31 -0500 Subject: [PATCH 3/5] Only stop vendoring NVTX, leave CCCL as-is for now --- conda/environments/all_cuda-118_arch-aarch64.yaml | 1 - conda/environments/all_cuda-118_arch-x86_64.yaml | 1 - conda/environments/all_cuda-128_arch-aarch64.yaml | 1 - conda/environments/all_cuda-128_arch-x86_64.yaml | 1 - conda/recipes/librmm/recipe.yaml | 2 -- dependencies.yaml | 1 - 6 files changed, 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index b2143fad1..faeed1190 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -7,7 +7,6 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler -- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index faeabe37b..5bf71d8f3 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -7,7 +7,6 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler -- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml index 232ffcae7..a1e77d321 100644 --- a/conda/environments/all_cuda-128_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -7,7 +7,6 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler -- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index ca03733bd..ee80332e7 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -7,7 +7,6 @@ channels: dependencies: - breathe>=4.35.0 - c-compiler -- cccl==2.8.4 - clang-tools==20.1.4 - clang==20.1.4 - cmake>=3.30.4 diff --git a/conda/recipes/librmm/recipe.yaml b/conda/recipes/librmm/recipe.yaml index cd19d6fec..42ff62b36 100644 --- a/conda/recipes/librmm/recipe.yaml +++ b/conda/recipes/librmm/recipe.yaml @@ -58,7 +58,6 @@ cache: - rapids-logger =0.1 - if: cuda_major != "11" then: cuda-driver-dev - - cccl =2.8.4 - nvtx-c =3.2.0 outputs: @@ -90,7 +89,6 @@ outputs: then: cudatoolkit else: cuda-cudart - rapids-logger =0.1 - - cccl =2.8.4 - nvtx-c =3.2.0 run_exports: - ${{ pin_subpackage("librmm", upper_bound="x.x") }} diff --git a/dependencies.yaml b/dependencies.yaml index 3b0eeda1c..31696181f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -129,7 +129,6 @@ dependencies: packages: - c-compiler - cxx-compiler - - cccl==2.8.4 - nvtx==3.2.0 specific: - output_types: conda From c81cf865380d6d46a39275f959d3ffdc2b839695 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 18 Jun 2025 12:39:11 -0500 Subject: [PATCH 4/5] Use nvtx-c --- conda/environments/all_cuda-128_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml index a1e77d321..0bb180468 100644 --- a/conda/environments/all_cuda-128_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -27,7 +27,7 @@ dependencies: - numba>=0.59.1,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc -- nvtx==3.2.0 +- nvtx-c - pre-commit - pytest - pytest-cov diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index ee80332e7..7c04802e8 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -27,7 +27,7 @@ dependencies: - numba>=0.59.1,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc -- nvtx==3.2.0 +- nvtx-c - pre-commit - pytest - pytest-cov diff --git a/dependencies.yaml b/dependencies.yaml index 85efc3bcb..15ebd3a4e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -129,7 +129,7 @@ dependencies: packages: - c-compiler - cxx-compiler - - nvtx==3.2.0 + - nvtx-c specific: - output_types: conda matrices: From bd75b49ab813e48549c08f396cc65530d5c6e0ca Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 25 Jun 2025 10:33:35 -0500 Subject: [PATCH 5/5] Update conda/recipes/librmm/recipe.yaml --- conda/recipes/librmm/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/recipe.yaml b/conda/recipes/librmm/recipe.yaml index d11c7a46d..a460e4402 100644 --- a/conda/recipes/librmm/recipe.yaml +++ b/conda/recipes/librmm/recipe.yaml @@ -83,7 +83,7 @@ outputs: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - cuda-cudart - rapids-logger =0.1 - - nvtx-c =3.2.0 + - nvtx-c run_exports: - ${{ pin_subpackage("librmm", upper_bound="x.x") }} ignore_run_exports: