From fd195b542ce1820492b802f16cadb2b5e4c9f841 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 16 Nov 2021 17:00:25 -0500 Subject: [PATCH] Update `conda` recipes for Enhanced Compatibility effort (#1889) This PR updates the `conda` recipe build strings and `cudatoolkit` version specifications as part of the Enhanced Compatibility efforts. The build strings have been updated to only include the major CUDA version (i.e. `librmm-21.12.00a-cuda11_gc781527_12.tar.bz2`) and the `cudatoolkit` version specifications will now be formatted like `cudatoolkit >=x,=11,<12.0a0`). Moving forward, we'll build the packages with a single CUDA version (i.e. `11.4`) and test them in environments with different CUDA versions (i.e. `11.0`, `11.2`, `11.4`, etc.). Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cugraph/pull/1889 --- conda/recipes/cugraph/meta.yaml | 5 +++-- conda/recipes/libcugraph/meta.yaml | 5 +++-- conda/recipes/pylibcugraph/meta.yaml | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index f7df64119be..176053d1b39 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -5,6 +5,7 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %} +{% set cuda_major=cuda_version.split('.')[0] %} {% set py_version=environ.get('CONDA_PY', 36) %} package: name: cugraph @@ -15,7 +16,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CC - CXX @@ -41,7 +42,7 @@ requirements: - distributed>=2021.09.1 - ucx-py 0.23 - ucx-proc=*=gpu - - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} about: home: http://rapids.ai/ diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 73c65813cdc..d625180940b 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -5,6 +5,7 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version='.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %} +{% set cuda_major=cuda_version.split('.')[0] %} package: name: libcugraph version: {{ version }} @@ -14,7 +15,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CC - CXX @@ -43,7 +44,7 @@ requirements: - faiss-proc=*=cuda - libfaiss 1.7.0 *_cuda run: - - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - nccl>=2.9.9 - ucx-proc=*=gpu - faiss-proc=*=cuda diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index 3f476ce873a..232e4388181 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -5,6 +5,7 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %} +{% set cuda_major=cuda_version.split('.')[0] %} {% set py_version=environ.get('CONDA_PY', 36) %} package: name: pylibcugraph @@ -15,7 +16,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CC - CXX @@ -33,7 +34,7 @@ requirements: run: - python x.x - libcugraph={{ version }} - - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} about: home: http://rapids.ai/