Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update conda recipes. #12368

Merged
merged 5 commits into from
Dec 20, 2022
Merged

Update conda recipes. #12368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb4d766
Update conda recipes.
bdice Dec 13, 2022
a8bca95
Revert pin_compatible changes.
bdice Dec 13, 2022
8b85860
Use --channel.
bdice Dec 20, 2022
44450cc
Update tests, pinning spacing, CONDA_PY specification.
bdice Dec 20, 2022
594577b
Merge branch 'branch-23.02' into update-conda-recipes
bdice Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SUITEERROR=0
rapids-print-env

rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
--channel "${CPP_CHANNEL}" \
libcudf libcudf_kafka libcudf-tests

rapids-logger "Check GPU usage"
Expand Down
2 changes: 1 addition & 1 deletion ci/test_java.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rapids-logger "Downloading artifacts from previous jobs"
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
--channel "${CPP_CHANNEL}" \
libcudf

SUITEERROR=0
Expand Down
6 changes: 3 additions & 3 deletions ci/test_notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)

rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
-c "${PYTHON_CHANNEL}" \
cudf
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
cudf libcudf

NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")"
pushd notebooks
Expand Down
4 changes: 2 additions & 2 deletions ci/test_python_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ SUITEERROR=0
rapids-print-env

rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
-c "${PYTHON_CHANNEL}" \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
cudf libcudf
8 changes: 4 additions & 4 deletions ci/test_python_other.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
source "$(dirname "$0")/test_python_common.sh"

rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
-c "${PYTHON_CHANNEL}" \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
dask-cudf cudf_kafka custreamz

rapids-logger "Check GPU usage"
Expand Down Expand Up @@ -56,8 +56,8 @@ popd

set -e
rapids-mamba-retry install \
-c "${CPP_CHANNEL}" \
-c "${PYTHON_CHANNEL}" \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
strings_udf
set +e

Expand Down
28 changes: 13 additions & 15 deletions conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

{% 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 py_version=environ.get('CONDA_PY', 38) %}
{% set cuda_version='.'.join(environ.get('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}

package:
name: cudf
Expand All @@ -18,7 +18,6 @@ build:
string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
Expand All @@ -45,19 +44,19 @@ requirements:
- ninja
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- protobuf>=3.20.1,<3.21.0a0
- protobuf >=3.20.1,<3.21.0a0
- python
- cython >=0.29,<0.30
- scikit-build>=0.13.1
- scikit-build >=0.13.1
- setuptools
- numba >=0.56.2
- dlpack>=0.5,<0.6.0a0
- dlpack >=0.5,<0.6.0a0
- pyarrow =9
- libcudf ={{ version }}
- rmm ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
run:
- protobuf>=3.20.1,<3.21.0a0
- protobuf >=3.20.1,<3.21.0a0
- python
- typing_extensions
- pandas >=1.0,<1.6.0dev0
Expand All @@ -68,20 +67,19 @@ requirements:
- libcudf {{ version }}
- fastavro >=0.22.0
- {{ pin_compatible('rmm', max_pin='x.x') }}
- fsspec>=0.6.0
- fsspec >=0.6.0
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- nvtx >=0.2.1
- packaging
- cachetools
- cubinlinker # CUDA enhanced compatibility.
- cuda-python >=11.7.1,<12.0

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
imports: # [linux64]
- cudf # [linux64]
test:
requires:
- cudatoolkit ={{ cuda_version }}
imports:
- cudf

about:
home: https://rapids.ai/
Expand Down
21 changes: 9 additions & 12 deletions conda/recipes/cudf_kafka/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Copyright (c) 2020-2022, NVIDIA CORPORATION.

{% 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('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set py_version = environ.get('PY_VER', '3.8') %}
{% set py_version_numeric = py_version.replace('.', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}

package:
name: cudf_kafka
Expand All @@ -15,10 +14,9 @@ source:

build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: py{{ py_version_numeric }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
Expand Down Expand Up @@ -50,12 +48,11 @@ requirements:
- python-confluent-kafka >=1.7.0,<1.8.0a0
- cudf ={{ version }}

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
imports: # [linux64]
- cudf_kafka # [linux64]
test:
requires:
- cudatoolkit ={{ cuda_version }}
imports:
- cudf_kafka

about:
home: https://rapids.ai/
Expand Down
25 changes: 11 additions & 14 deletions conda/recipes/custreamz/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.

{% 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('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set py_version = environ.get('PY_VER', '3.8') %}
{% set py_version_numeric = py_version.replace('.', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}

package:
name: custreamz
Expand All @@ -15,10 +14,9 @@ source:

build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: py{{ py_version_numeric }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
Expand All @@ -40,17 +38,16 @@ requirements:
- python
- streamz
- cudf ={{ version }}
- dask>=2022.12.0
- distributed>=2022.12.0
- dask >=2022.12.0
- distributed >=2022.12.0
- python-confluent-kafka >=1.7.0,<1.8.0a0
- cudf_kafka ={{ version }}

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
imports: # [linux64]
- custreamz # [linux64]
test:
requires:
- cudatoolkit ={{ cuda_version }}
imports:
- custreamz

about:
home: https://rapids.ai/
Expand Down
28 changes: 13 additions & 15 deletions conda/recipes/dask-cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.

{% 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 py_version=environ.get('CONDA_PY', 38) %}
{% set cuda_version='.'.join(environ.get('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}

package:
name: dask-cudf
Expand All @@ -18,7 +18,6 @@ build:
string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
Expand All @@ -35,22 +34,21 @@ requirements:
host:
- python
- cudf ={{ version }}
- dask>=2022.12.0
- distributed>=2022.12.0
- dask >=2022.12.0
- distributed >=2022.12.0
- cudatoolkit ={{ cuda_version }}
run:
- python
- cudf ={{ version }}
- dask>=2022.12.0
- distributed>=2022.12.0
- dask >=2022.12.0
- distributed >=2022.12.0
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
imports: # [linux64]
- dask_cudf # [linux64]
test:
requires:
- cudatoolkit ={{ cuda_version }}
imports:
- dask_cudf


about:
Expand Down
14 changes: 7 additions & 7 deletions conda/recipes/libcudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}
{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0

Expand Down Expand Up @@ -36,10 +36,10 @@ requirements:
- ninja
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- librmm {{ minor_version }}.*
- cudatoolkit {{ cuda_version }}.*
- cuda-nvrtc-dev {{ cuda_version }}.*
- cuda-nvtx {{ cuda_version }}.*
- librmm ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
- cuda-nvrtc-dev ={{ cuda_version }}
- cuda-nvtx ={{ cuda_version }}
- libcurand-dev
- arrow-cpp {{ arrow_cpp_version }}
- dlpack {{ dlpack_version }}
Expand All @@ -61,7 +61,7 @@ outputs:
- cmake {{ cmake_version }}
run:
- cudatoolkit {{ cuda_spec }}
- librmm {{ minor_version }}.*
- librmm ={{ minor_version }}
- arrow-cpp {{ arrow_cpp_version }}
- dlpack {{ dlpack_version }}
test:
Expand Down Expand Up @@ -340,7 +340,7 @@ outputs:
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- {{ pin_subpackage('libcudf', exact=True) }}
- cuda-nvtx {{ cuda_version }}.*
- cuda-nvtx ={{ cuda_version }}
run:
- {{ pin_subpackage('libcudf', exact=True) }}
about:
Expand Down
22 changes: 10 additions & 12 deletions conda/recipes/strings_udf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

{% 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 py_version=environ.get('CONDA_PY', 38) %}
{% set cuda_version='.'.join(environ.get('RAPIDS_CUDA_VERSION', '11.5.2').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}

package:
name: strings_udf
Expand All @@ -18,7 +18,6 @@ build:
string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
Expand Down Expand Up @@ -47,12 +46,12 @@ requirements:
host:
- python
- cython >=0.29,<0.30
- scikit-build>=0.13.1
- scikit-build >=0.13.1
- setuptools
- numba >=0.54
- libcudf ={{ version }}
- cudf ={{ version }}
- cudatoolkit {{ cuda_version }}.*
- cudatoolkit ={{ cuda_version }}
run:
- python
- typing_extensions
Expand All @@ -64,12 +63,11 @@ requirements:
- cachetools
- ptxcompiler >=0.7.0 # CUDA enhanced compatibility. See https://github.com/rapidsai/ptxcompiler

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
imports: # [linux64]
- strings_udf # [linux64]
test:
requires:
- cudatoolkit ={{ cuda_version }}
imports:
- strings_udf

about:
home: https://rapids.ai/
Expand Down