Skip to content

Commit

Permalink
Merge pull request #396 from rapidsai/branch-21.12
Browse files Browse the repository at this point in the history
[gpuCI] Forward-merge branch-21.12 to branch-22.02 [skip gpuci]
  • Loading branch information
GPUtester authored Nov 22, 2021
2 parents 6415333 + 742cd1b commit ffb3799
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/cusparse_wrappers.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace detail {
inline const char* cusparse_error_to_string(cusparseStatus_t err) {
#if defined(CUDART_VERSION) && CUDART_VERSION >= 10100
return cusparseGetErrorString(err);
#else // CUDART_VERSION
#else // CUDART_VERSION
switch (err) {
_CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_SUCCESS);
_CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_NOT_INITIALIZED);
Expand Down
2 changes: 1 addition & 1 deletion cpp/scripts/run-clang-format.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import tempfile


EXPECTED_VERSION = "11.0.0"
EXPECTED_VERSION = "11.1.0"
VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)")
# NOTE: populate this list with more top-level dirs as we add more of them to
# to the cuml repo
Expand Down

0 comments on commit ffb3799

Please sign in to comment.