From ea5aff9a97d7446c1d17f5a5c116747042b64147 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 15 Oct 2021 16:00:50 -0400 Subject: [PATCH] update build string & version specs --- conda/recipes/cudf/meta.yaml | 5 +++-- conda/recipes/libcudf/meta.yaml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 268f6c6fe05..615135a6f6b 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -4,6 +4,7 @@ {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set py_version=environ.get('CONDA_PY', 36) %} {% set cuda_version='.'.join(environ.get('CUDA', '10.1').split('.')[:2]) %} +{% set cuda_major=cuda_version.split('.')[0] %} package: name: cudf @@ -14,7 +15,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: - VERSION_SUFFIX - PARALLEL_LEVEL @@ -46,7 +47,7 @@ requirements: - fastavro >=0.22.0 - {{ pin_compatible('rmm', max_pin='x.x') }} - fsspec>=0.6.0 - - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - nvtx >=0.2.1 - packaging - cachetools diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index fd687de6698..4409fa4bf39 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -3,6 +3,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', '10.1').split('.')[:2]) %} +{% set cuda_major=cuda_version.split('.')[0] %} package: name: libcudf @@ -13,7 +14,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 @@ -41,7 +42,7 @@ requirements: - arrow-cpp-proc * cuda - dlpack>=0.5,<0.6.0a0 run: - - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - arrow-cpp * *cuda - arrow-cpp-proc * cuda - {{ pin_compatible('dlpack', max_pin='x.x') }}