Merge branch 'branch-0.8' of https://github.com/rapidsai/cuml into en…

…h-ext-clang-format
rlratzel · May 22, 2019 · a4b45e1 · a4b45e1
2 parents 47c872e + 30ce5c6
commit a4b45e1
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 392 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -4,7 +4,7 @@
 
 To install cuML from source, ensure the dependencies are met:
 
-1. [cuDF](https://github.com/rapidsai/cudf) (>=0.7)
+1. [cuDF](https://github.com/rapidsai/cudf) (>=0.8)
 2. zlib
 3. cmake (>= 3.12.4)
 4. CUDA (>= 9.2)
@@ -124,6 +124,3 @@ cuML's cmake has the following configurable flags available:
 | GPU_ARCHS |  List of GPU architectures, semicolon-separated | 60;70;75  | List of GPU architectures that all artifacts are compiled for.  |
 | KERNEL_INFO | [ON, OFF]  | OFF  | Enable/disable kernel resource usage info in nvcc. |
 | LINE_INFO | [ON, OFF]  | OFF  | Enable/disable lineinfo in nvcc.  |
-
-
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,9 +15,11 @@
 - PR #579: Introduce cumlHandle for cd and sgd, and propagate C++ errors in cython level for cd and sgd
 - PR #604: Adding cumlHandle to kNN, spectral methods, and UMAP
 - PR #616: Enable clang-format for enforcing coding style
+- PR #622: Updated to use 0.8 dependencies
 
 ## Bug Fixes
 - PR #584: Added missing virtual destructor to deviceAllocator and hostAllocator
+- PR #620: C++: Removed old unit-test files in ml-prims
 
 
 # cuML 0.7.0 (10 May 2019)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
@@ -15,9 +15,9 @@ export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
 export PARALLEL_LEVEL=4
 
 # Set versions of packages needed to be grabbed
-export CUDF_VERSION=0.7.*
-export NVSTRINGS_VERSION=0.7.*
-export RMM_VERSION=0.7.*
+export CUDF_VERSION=0.8.*
+export NVSTRINGS_VERSION=0.8.*
+export RMM_VERSION=0.8.*
 
 # Set home to the job's workspace
 export HOME=$WORKSPACE

diff --git a/ci/docs/build.sh b/ci/docs/build.sh
@@ -14,8 +14,8 @@ function logger() {
 export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
 export PARALLEL_LEVEL=4
 export CUDA_REL=${CUDA_VERSION%.*}
-export CUDF_VERSION=0.7.*
-export RMM_VERSION=0.7.*
+export CUDF_VERSION=0.8.*
+export RMM_VERSION=0.8.*
 
 # Set home to the job's workspace
 export HOME=$WORKSPACE

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -16,9 +16,9 @@ export PARALLEL_LEVEL=4
 export CUDA_REL=${CUDA_VERSION%.*}
 
 # Set versions of packages needed to be grabbed
-export CUDF_VERSION=0.7.*
-export NVSTRINGS_VERSION=0.7.*
-export RMM_VERSION=0.7.*
+export CUDF_VERSION=0.8.*
+export NVSTRINGS_VERSION=0.8.*
+export RMM_VERSION=0.8.*
 
 # Set home to the job's workspace
 export HOME=$WORKSPACE

diff --git a/conda/recipes/cuml-cuda10/meta.yaml b/conda/recipes/cuml-cuda10/meta.yaml
@@ -28,14 +28,14 @@ requirements:
     - setuptools
     - cython>=0.29,<0.30
     - cmake>=3.12.4
-    - cudf 0.7*
+    - cudf 0.8*
     - libcuml={{ version }}
     - libcumlMG
     - cudatoolkit {{ cuda_version }}.*
   run:
     - python x.x
     - setuptools
-    - cudf 0.7*
+    - cudf 0.8*
     - libcuml={{ version }}
     - libcumlMG
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml
@@ -28,13 +28,13 @@ requirements:
     - setuptools
     - cython>=0.29,<0.30
     - cmake>=3.12.4
-    - cudf 0.7*
+    - cudf 0.8*
     - libcuml={{ version }}
     - cudatoolkit {{ cuda_version }}.*
   run:
     - python x.x
     - setuptools
-    - cudf 0.7*
+    - cudf 0.8*
     - libcuml={{ version }}
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
 

diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml
@@ -27,12 +27,12 @@ build:
 requirements:
   build:
     - cmake>=3.12.4
-    - cudf 0.7*
+    - cudf 0.8*
     - cudatoolkit {{ cuda_version }}.*
     - lapack
     - libclang
   run:
-    - cudf 0.7*
+    - cudf 0.8*
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
 
 about:

diff --git a/cpp/src_prims/linalg/add.h b/cpp/src_prims/linalg/add.h
@@ -79,7 +79,7 @@ __global__ void add_dev_scalar_kernel(math_t* outDev, const math_t* inDev,
  */
 template <typename math_t, typename IdxType = int>
 void addDevScalar(math_t* outDev, const math_t* inDev, const math_t* singleScalarDev,
-                   int len, cudaStream_t stream)
+                  IdxType len, cudaStream_t stream)
 {
     // TODO: block dimension has not been tuned
     dim3 block (256);

diff --git a/cpp/src_prims/linalg/subtract.h b/cpp/src_prims/linalg/subtract.h
@@ -82,7 +82,7 @@ __global__ void subtract_dev_scalar_kernel(math_t* outDev, const math_t* inDev,
  */
 template <typename math_t, typename IdxType = int, int TPB = 256>
 void subtractDevScalar(math_t* outDev, const math_t* inDev, const math_t* singleScalarDev,
-                         IdxType len, cudaStream_t stream)
+                       IdxType len, cudaStream_t stream)
 {
     // Just for the note - there is no way to express such operation with cuBLAS in effective way
     // https://stackoverflow.com/questions/14051064/add-scalar-to-vector-in-blas-cublas-cuda

diff --git a/cpp/src_prims/linalg/vector_broadcast.h b/cpp/src_prims/linalg/vector_broadcast.h
diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt
@@ -120,6 +120,7 @@ if(BUILD_PRIMS_TESTS)
     # (please keep the filenames in alphabetical order)
     add_executable(prims
       prims/add.cu
+      prims/add_sub_dev_scalar.cu
       prims/array.cu
       prims/binary_op.cu
       prims/ternary_op.cu

diff --git a/cpp/test/old/add_and_sub_dev_scalar.cu b/cpp/test/old/add_and_sub_dev_scalar.cu