Skip to content

Commit

Permalink
[REVIEW] Adding Support for CuPy 8.x and Fixing Tests (#2910)
Browse files Browse the repository at this point in the history
* Increasing tolerance of test_kbinsdiscretizer per Victor's comments

* Updating CHANGELOG

* Updating cupy version to `cupy>7.1.0,<9.0.0a0` everywhere.

* Updating CHANGELOG to match CuPy 8.x Changes
  • Loading branch information
mdemoret-nv authored Oct 5, 2020
1 parent 5b2d4df commit 207129b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
- PR #2863: in FIL, rename leaf_value_t enums to more descriptive
- PR #2867: improve stability of FIL benchmark measurements
- PR #2892 Update ci/local/README.md
- PR #2910: Adding Support for CuPy 8.x

## Bug Fixes
- PR #2882: Allow import on machines without GPUs
Expand All @@ -66,7 +67,7 @@
- PR #2856: Fix LabelEncoder for filtered input
- PR #2855: Updates for RMM being header only
- PR #2880: Fix bugs in Auto-ARIMA when s==None
- PR #2877: TSNE exception for n_components > 2
- PR #2877: TSNE exception for n_components > 2
- PR #2879: Update unit test for LabelEncoder on filtered input

# cuML 0.15.0 (Date TBD)
Expand Down
2 changes: 1 addition & 1 deletion ci/mg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ nvidia-smi
logger "Activate conda env..."
source activate gdf
conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
"cupy>=7,<8.0.0a0" \
"cupy>7.1.0,<9.0.0a0" \
"cudatoolkit=${CUDA_REL}" \
"cudf=${MINOR_VERSION}" \
"rmm=${MINOR_VERSION}" \
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ requirements:
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
- treelite=0.92
- cupy>=7,<=8.0.0dev.rapidsai0.15
- cupy>7.1.0,<9.0.0a0
- nccl>=2.5
- ucx-py {{ minor_version }}
- dask>=2.12.0
Expand Down
10 changes: 6 additions & 4 deletions python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ This folder contains the Python and Cython code of the algorithms and ML primiti

Contents:

- [Build Configuration](#build-configuration)
- [RAFT Integration in cuml.raft](#raft-integration-in-cumlraft)
- [Running Unit Tests](#build-requirements)
- [cuML Python Package](#cuml-python-package)
- [Build Configuration](#build-configuration)
- [RAFT Integration in cuml.raft](#raft-integration-in-cumlraft)
- [Build Requirements](#build-requirements)
- [Python Tests](#python-tests)

### Build Configuration

Expand Down Expand Up @@ -60,7 +62,7 @@ To build cuML's Python package, the following dependencies are required:
- cudf version matching the cuML version
- libcuml version matching the cuML version
- libcuml={{ version }}
- cupy>=7,<8.0.0a0
- cupy>7.1.0,<9.0.0a0
- joblib >=0.11

Packages required for multigpu algorithms*:
Expand Down
2 changes: 1 addition & 1 deletion python/cuml/test/test_preprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def test_kbinsdiscretizer(blobs_dataset, n_bins, # noqa: F811
sk_r_X = transformer.inverse_transform(sk_t_X)

if strategy == 'kmeans':
assert_allclose(t_X, sk_t_X, ratio_tol=0.1)
assert_allclose(t_X, sk_t_X, ratio_tol=0.2)
else:
assert_allclose(t_X, sk_t_X)
assert_allclose(r_X, sk_r_X)
Expand Down

0 comments on commit 207129b

Please sign in to comment.