From abf92bc4326d6f7f61bfc8020107574d27d1c03d Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 2 Aug 2024 19:02:14 -0700 Subject: [PATCH] Consolidate CUDA version setting to one place Instead of having the CUDA version hard-coded in a bunch of places, consolidate it to one file and have everything else load and use that file. --- ci/install_latest_cuda_toolkit.sh | 11 +++++++---- conda/recipes/pynvjitlink/conda_build_config.yaml | 3 --- conda/recipes/pynvjitlink/meta.yaml | 8 ++++++-- pynvjitlink/CUDA_VERSION | 1 + 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 pynvjitlink/CUDA_VERSION diff --git a/ci/install_latest_cuda_toolkit.sh b/ci/install_latest_cuda_toolkit.sh index 89f005a..c49ae7d 100755 --- a/ci/install_latest_cuda_toolkit.sh +++ b/ci/install_latest_cuda_toolkit.sh @@ -13,8 +13,11 @@ if [ "${OS_ID}" != "rocky" ]; then exit 1 fi +export CUDA_VERSION="$(cat pynvjitlink/CUDA_VERSION)" +export YUM_CUDA_VERSION="${CUDA_VERSION//./-}" + yum install -y \ - cuda-nvcc-12-5 \ - cuda-cudart-devel-12-5 \ - cuda-driver-devel-12-5 \ - libnvjitlink-devel-12-5 + cuda-nvcc-$YUM_CUDA_VERSION \ + cuda-cudart-devel-$YUM_CUDA_VERSION \ + cuda-driver-devel-$YUM_CUDA_VERSION \ + libnvjitlink-devel-$YUM_CUDA_VERSION diff --git a/conda/recipes/pynvjitlink/conda_build_config.yaml b/conda/recipes/pynvjitlink/conda_build_config.yaml index b72b616..6b1cca1 100644 --- a/conda/recipes/pynvjitlink/conda_build_config.yaml +++ b/conda/recipes/pynvjitlink/conda_build_config.yaml @@ -12,6 +12,3 @@ c_stdlib_version: cuda_compiler: - cuda-nvcc - -cuda_compiler_version: - - 12.5 diff --git a/conda/recipes/pynvjitlink/meta.yaml b/conda/recipes/pynvjitlink/meta.yaml index 5ba8d15..21506c1 100644 --- a/conda/recipes/pynvjitlink/meta.yaml +++ b/conda/recipes/pynvjitlink/meta.yaml @@ -5,6 +5,10 @@ load_file="pynvjitlink/VERSION", regex_pattern="(?P.*)" )[0] %} +{% set cuda_version = load_file_regex( + load_file="pynvjitlink/CUDA_VERSION", + regex_pattern="(?P.*)" +)[0] %} {% set project_data = data["project"] %} {% set project_urls = project_data["urls"] %} @@ -26,14 +30,14 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} + - {{ compiler('cuda') }} {{ cuda_version }} - {{ stdlib('c') }} - cmake >=3.26.4,!=3.30.0 - ninja host: - libnvjitlink-dev - libnvjitlink-static - - cuda-version {{ cuda_compiler_version }} + - cuda-version {{ cuda_version }} - python - pip - rapids-build-backend >=0.3.0,<0.4.0dev0 diff --git a/pynvjitlink/CUDA_VERSION b/pynvjitlink/CUDA_VERSION new file mode 100644 index 0000000..d39b7a2 --- /dev/null +++ b/pynvjitlink/CUDA_VERSION @@ -0,0 +1 @@ +12.5