Merge pull request #9 from rapidsai/branch-0.15

merge with upstream
rapidsai · Jun 19, 2020 · c19f605 · c19f605
2 parents d268886 + 0a22708
commit c19f605
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - PR #2413: CumlArray and related methods updates to account for cuDF.Buffer contiguity update
 - PR #2424: --singlegpu flag fix on build.sh script
 - PR #2432: Using correct algo_name for UMAP in benchmark tests
+- PR #2447: Drop `nvstrings`
 
 # cuML 0.14.0 (03 Jun 2020)
 

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -46,7 +46,6 @@ conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
       "cudatoolkit=${CUDA_REL}" \
       "cudf=${MINOR_VERSION}" \
       "rmm=${MINOR_VERSION}" \
-      "nvstrings=${MINOR_VERSION}" \
       "libcumlprims=0.15.0a200607" \
       "dask-cudf=${MINOR_VERSION}" \
       "dask-cuda=${MINOR_VERSION}" \

diff --git a/ci/mg/build.sh b/ci/mg/build.sh
@@ -47,7 +47,6 @@ conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
       "cudatoolkit=${CUDA_REL}" \
       "cudf=${MINOR_VERSION}" \
       "rmm=${MINOR_VERSION}" \
-      "nvstrings=${MINOR_VERSION}" \
       "libcumlprims=${MINOR_VERSION}" \
       "lapack" \
       "cmake==3.14.3" \