From c74dda239b34da1a55dfbcb069f4f5ad098e2c99 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:05:48 -0700 Subject: [PATCH] Fix `cuda11.8` nvcc dependency (#1542) `cuda-nvcc` is the CUDA 12 package name but was being included in the CUDA 11 dependencies, making the conda solve impossible. This PR uses the same nvcc matrix as defined in the build dependencies list. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Jake Awe (https://github.com/AyodeAwe) URL: https://github.com/rapidsai/rmm/pull/1542 --- .../all_cuda-118_arch-x86_64.yaml | 1 - dependencies.yaml | 20 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c4bbcccd2..5806b8bd9 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,7 +9,6 @@ dependencies: - clang-tools==16.0.6 - clang==16.0.6 - cmake>=3.26.4 -- cuda-nvcc - cuda-python>=11.7.1,<12.0a0 - cuda-version=11.8 - cudatoolkit diff --git a/dependencies.yaml b/dependencies.yaml index 10d0eab2d..232f9bddd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -249,7 +249,21 @@ dependencies: packages: - pytest - pytest-cov + # Needed for numba in tests + specific: - output_types: conda - packages: - # Needed for numba in tests - - cuda-nvcc + matrices: + - matrix: + arch: x86_64 + cuda: "11.8" + packages: + - nvcc_linux-64=11.8 + - matrix: + arch: aarch64 + cuda: "11.8" + packages: + - nvcc_linux-aarch64=11.8 + - matrix: + cuda: "12.*" + packages: + - cuda-nvcc