Merge pull request #2 from rapidsai/branch-0.15

Update forked 0.15 from release
rapidsai · Jul 23, 2020 · d56987a · d56987a
2 parents 6addadc + b6ef2a8
commit d56987a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - PR #26: Fix bug in RAFT_EXPECTS (add parentheses surrounding cond)
 - PR #34: Fix issue with incorrect docker image being used in local build script
 - PR #35: Remove #include <nccl.h> from `raft/error.hpp`
+- PR #40: Preemptively fixed future CUDA 11 related errors.
 
 # RAFT 0.14.0 (Date TBD)
 

diff --git a/cpp/include/raft/sparse/cusparse_wrappers.h b/cpp/include/raft/sparse/cusparse_wrappers.h
@@ -43,7 +43,7 @@ namespace detail {
 
 inline const char* cusparse_error_to_string(cusparseStatus_t err) {
 #if defined(CUDART_VERSION) && CUDART_VERSION >= 10100
-  return cusparseGetErrorString(status);
+  return cusparseGetErrorString(err);
 #else   // CUDART_VERSION
   switch (err) {
     _CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_SUCCESS);

diff --git a/cpp/include/raft/spectral/matrix_wrappers.hpp b/cpp/include/raft/spectral/matrix_wrappers.hpp
@@ -168,9 +168,9 @@ struct sparse_matrix_t {
     //get (scratch) external device buffer size:
     //
     size_t bufferSize;
-    CUSPARSE_CHECK(cusparsespmv_buffersize(cusparse_h, opA, &alpha, matA, vecX,
-                                           &beta, vecY, alg, &bufferSize,
-                                           stream));
+    CUSPARSE_CHECK(
+      cusparsespmv_buffersize(cusparse_h, trans, &alpha, matA, vecX, &beta,
+                              vecY, CUSPARSE_CSRMV_ALG1, &bufferSize, stream));
 
     //allocate external buffer:
     //