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.

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

Require ucx-proc=*=gpu #3038

Merged
merged 1 commit into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
- PR #2984: Fix GPU test scripts gcov error
- PR #2990: Reduce MNMG kneighbors regressor test threshold
- PR #2997: Changing ARIMA `get/set_params` to `get/set_fit_params`
- PR #3038: Require `ucx-proc=*=gpu`

# cuML 0.15.0 (Date TBD)

Expand Down
2 changes: 1 addition & 1 deletion ci/checks/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ source activate gdf
cd $WORKSPACE
export GIT_DESCRIBE_TAG=`git describe --tags`
export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
conda install "ucx-py=${MINOR_VERSION}"
conda install "ucx-py=${MINOR_VERSION}" "ucx-proc=*=gpu"

# Run flake8 and get results/return code
FLAKE=`flake8 --exclude=cpp,thirdparty,__init__.py,versioneer.py && flake8 --config=python/.flake8.cython`
Expand Down
1 change: 1 addition & 0 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
"dask-cudf=${MINOR_VERSION}" \
"dask-cuda=${MINOR_VERSION}" \
"ucx-py=${MINOR_VERSION}" \
"ucx-proc=*=gpu" \
"xgboost=1.2.0dev.rapidsai0.16" \
"rapids-build-env=${MINOR_VERSION}.*" \
"rapids-notebook-env=${MINOR_VERSION}.*" \
Expand Down
1 change: 1 addition & 0 deletions ci/mg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
"dask-cudf=${MINOR_VERSION}" \
"dask-cuda=${MINOR_VERSION}" \
"ucx-py=${MINOR_VERSION}" \
"ucx-proc=*=gpu" \
"statsmodels" \
"xgboost==1.1.0dev.rapidsai0.15" \
"lightgbm"
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/cuml_dev_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies:
- dask-cudf=0.16.*
- dask-cuda=0.16.*
- ucx-py=0.16.*
- ucx-proc=*=gpu
- dask-ml
- doxygen>=1.8.20
- libfaiss>=1.6.3
Expand All @@ -34,4 +35,4 @@ dependencies:
# To install different versions of packages contained in those meta packages,
# it is recommended to remove those meta packages (without removing the actual
# packages contained in the environment) first with:
# conda remove --force rapids-build-env rapids-notebook-env rapids-doc-env
# conda remove --force rapids-build-env rapids-notebook-env rapids-doc-env
1 change: 1 addition & 0 deletions conda/environments/cuml_dev_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies:
- dask-cudf=0.16.*
- dask-cuda=0.16.*
- ucx-py=0.16.*
- ucx-proc=*=gpu
- dask-ml
- doxygen>=1.8.20
- libfaiss>=1.6.3
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cuml_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies:
- dask-cudf=0.16.*
- dask-cuda=0.16.*
- ucx-py=0.16.*
- ucx-proc=*=gpu
- dask-ml
- doxygen>=1.8.20
- libfaiss>=1.6.3
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ requirements:
- libcumlprims {{ minor_version }}
- cudatoolkit {{ cuda_version }}.*
- ucx-py {{ minor_version }}
- ucx-proc=*=gpu
run:
- python x.x
- cudf {{ minor_version }}
Expand All @@ -44,6 +45,7 @@ requirements:
- cupy>7.1.0,<9.0.0a0
- nccl>=2.5
- ucx-py {{ minor_version }}
- ucx-proc=*=gpu
- dask>=2.12.0
- distributed>=2.12.0
- joblib >=0.11
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/libcuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ requirements:
- cudf {{ minor_version }}
- cudatoolkit {{ cuda_version }}.*
- ucx-py {{ minor_version }}
- ucx-proc=*=gpu
- libcumlprims {{ minor_version }}
- lapack
- treelite=0.93
Expand All @@ -46,6 +47,7 @@ requirements:
- cudf {{ minor_version }}
- nccl>=2.5
- ucx-py {{ minor_version }}
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- treelite=0.93
- faiss-proc=*=cuda
Expand Down