diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 73b681dc061..5c6461d0796 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -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" diff --git a/ci/test_java.sh b/ci/test_java.sh index d2c63351b5f..a0ba7c41607 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -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 diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index add9c98f137..0665b74144e 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -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 diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 1e0d149cdf0..107540c0192 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -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 diff --git a/ci/test_python_other.sh b/ci/test_python_other.sh index cbd919f6ab4..d7a5e288193 100755 --- a/ci/test_python_other.sh +++ b/ci/test_python_other.sh @@ -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" @@ -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 diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 842cb9f1dce..2d0b32b6f7c 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -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 @@ -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 @@ -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 @@ -68,7 +67,7 @@ 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 @@ -76,12 +75,11 @@ requirements: - 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/ diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 0c0d7c1fce2..5fa0411803b 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -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 @@ -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 @@ -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/ diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index d657658b281..13d54011e02 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -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 @@ -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 @@ -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/ diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index eb157b8b0a9..feb9e53e37f 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -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 @@ -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 @@ -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: diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index eeb1eb29e25..021c7e6cfef 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -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 @@ -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 }} @@ -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: @@ -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: diff --git a/conda/recipes/strings_udf/meta.yaml b/conda/recipes/strings_udf/meta.yaml index 08c75baee1a..0928c5d3315 100644 --- a/conda/recipes/strings_udf/meta.yaml +++ b/conda/recipes/strings_udf/meta.yaml @@ -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 @@ -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 @@ -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 @@ -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/