From 227486c2656c5dfc543e9b047e71ef214dc981e4 Mon Sep 17 00:00:00 2001 From: divyegala Date: Mon, 30 Oct 2023 17:16:47 -0700 Subject: [PATCH] add nvtx dependency --- conda/environments/all_cuda-118_arch-aarch64.yaml | 1 + conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-120_arch-aarch64.yaml | 1 + conda/environments/all_cuda-120_arch-x86_64.yaml | 1 + conda/environments/bench_ann_cuda-118_arch-aarch64.yaml | 1 + conda/environments/bench_ann_cuda-118_arch-x86_64.yaml | 1 + conda/environments/bench_ann_cuda-120_arch-aarch64.yaml | 1 + conda/environments/bench_ann_cuda-120_arch-x86_64.yaml | 1 + dependencies.yaml | 5 +++++ 9 files changed, 13 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 27894d27e7..762d436028 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -12,6 +12,7 @@ dependencies: - clang-tools=16.0.6 - clang==16.0.6 - cmake>=3.26.4 +- cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.7.1,<12.0a0 - cuda-version=11.8 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 96e5227186..48cd34c6ca 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -12,6 +12,7 @@ dependencies: - clang-tools=16.0.6 - clang==16.0.6 - cmake>=3.26.4 +- cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.7.1,<12.0a0 - cuda-version=11.8 diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml index e4ba4281c2..9108fb6215 100644 --- a/conda/environments/all_cuda-120_arch-aarch64.yaml +++ b/conda/environments/all_cuda-120_arch-aarch64.yaml @@ -14,6 +14,7 @@ dependencies: - cmake>=3.26.4 - cuda-cudart-dev - cuda-nvcc +- cuda-nvtx-dev - cuda-profiler-api - cuda-python>=12.0,<13.0a0 - cuda-version=12.0 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index d0430e10f6..8f1fbf6744 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -14,6 +14,7 @@ dependencies: - cmake>=3.26.4 - cuda-cudart-dev - cuda-nvcc +- cuda-nvtx-dev - cuda-profiler-api - cuda-python>=12.0,<13.0a0 - cuda-version=12.0 diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml index 579a8a0ceb..b5fc4e3bd5 100644 --- a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml @@ -12,6 +12,7 @@ dependencies: - clang-tools=16.0.6 - clang==16.0.6 - cmake>=3.26.4 +- cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-version=11.8 - cudatoolkit diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml index 2c92ad0a99..b868f26e15 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -12,6 +12,7 @@ dependencies: - clang-tools=16.0.6 - clang==16.0.6 - cmake>=3.26.4 +- cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-version=11.8 - cudatoolkit diff --git a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml index 99ec02859d..4a3818fe5d 100644 --- a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml @@ -14,6 +14,7 @@ dependencies: - cmake>=3.26.4 - cuda-cudart-dev - cuda-nvcc +- cuda-nvtx-dev - cuda-profiler-api - cuda-version=12.0 - cxx-compiler diff --git a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml index 1fbefc5c50..3d6f8c4ec1 100644 --- a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml @@ -14,6 +14,7 @@ dependencies: - cmake>=3.26.4 - cuda-cudart-dev - cuda-nvcc +- cuda-nvtx-dev - cuda-profiler-api - cuda-version=12.0 - cxx-compiler diff --git a/dependencies.yaml b/dependencies.yaml index 263a76f9c8..aba81d7ed9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -246,6 +246,7 @@ dependencies: cuda: "12.0" packages: - cuda-version=12.0 + - cuda-nvtx-dev - cuda-cudart-dev - cuda-profiler-api - libcublas-dev @@ -257,6 +258,7 @@ dependencies: packages: - cuda-version=11.8 - cudatoolkit + - cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - libcublas-dev=11.11.3.6 - libcublas=11.11.3.6 @@ -271,6 +273,7 @@ dependencies: packages: - cuda-version=11.5 - cudatoolkit + - cuda-nvtx=11.5 - cuda-profiler-api>=11.4.240,<=11.8.86 # use any `11.x` version since pkg is missing several CUDA/arch packages - libcublas-dev>=11.7.3.1,<=11.7.4.6 - libcublas>=11.7.3.1,<=11.7.4.6 @@ -285,6 +288,7 @@ dependencies: packages: - cuda-version=11.4 - cudatoolkit + - &cudanvtx114 cuda-nvtx=11.4 - cuda-profiler-api>=11.4.240,<=11.8.86 # use any `11.x` version since pkg is missing several CUDA/arch packages - &libcublas_dev114 libcublas-dev>=11.5.2.43,<=11.6.5.2 - &libcublas114 libcublas>=11.5.2.43,<=11.6.5.2 @@ -299,6 +303,7 @@ dependencies: packages: - cuda-version=11.2 - cudatoolkit + - *cudanvtx114 - cuda-profiler-api>=11.4.240,<=11.8.86 # use any `11.x` version since pkg is missing several CUDA/arch packages # The NVIDIA channel doesn't publish pkgs older than 11.4 for these libs, # so 11.2 uses 11.4 packages (the oldest available).