Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REVIEW] Fix RAFT warnings #56

Merged
merged 10 commits into from
Aug 24, 2020
Merged

[REVIEW] Fix RAFT warnings #56

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a687256
replace deprecated rmm get_default_resource with get_current_device_r…
seunghwak Aug 21, 2020
26469f2
reorder buffer_base initializer list to match the declration order
seunghwak Aug 21, 2020
6c3fd88
reorder std_comms initializer list to match the declaration order
seunghwak Aug 21, 2020
461c3d7
suppress few trivial warnings
seunghwak Aug 21, 2020
7316549
bug fix (compiler reported this in a warning... please do not ignore …
seunghwak Aug 21, 2020
b7e9980
update change log
seunghwak Aug 21, 2020
76b17f6
Merge branch 'branch-0.16' of github.com:rapidsai/raft into bug_warning
seunghwak Aug 21, 2020
d4cfda4
resolve merge conflicts
seunghwak Aug 22, 2020
c0fb138
suppress cuSparse related "deprecated" warnings
seunghwak Aug 24, 2020
cc0052b
clang-format
seunghwak Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
suppress cuSparse related "deprecated" warnings
  • Loading branch information
@seunghwak
seunghwak committed Aug 24, 2020
commit c0fb138452f0c9ffad9cdb42a66d408c2752a5bd
33 changes: 29 additions & 4 deletions cpp/include/raft/sparse/cusparse_wrappers.h
View file
Open in desktop
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 Expand Up @@ -124,16 +124,22 @@ inline cusparseStatus_t cusparsegthr(cusparseHandle_t handle, int nnz,
const double* vals, double* vals_sorted,
int* d_P, cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseDgthr(handle, nnz, vals, vals_sorted, d_P,
CUSPARSE_INDEX_BASE_ZERO);
#pragma GCC diagnostic pop
}
template <>
inline cusparseStatus_t cusparsegthr(cusparseHandle_t handle, int nnz,
const float* vals, float* vals_sorted,
int* d_P, cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseSgthr(handle, nnz, vals, vals_sorted, d_P,
CUSPARSE_INDEX_BASE_ZERO);
#pragma GCC diagnostic pop
}
/** @} */

Expand Down Expand Up @@ -205,8 +211,11 @@ inline cusparseStatus_t cusparsegemmi(cusparseHandle_t handle, int m, int n,
const int* cscRowIndB, const float* beta,
float* C, int ldc, cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseSgemmi(handle, m, n, k, nnz, alpha, A, lda, cscValB,
cscColPtrB, cscRowIndB, beta, C, ldc);
#pragma GCC diagnostic pop
}
template <>
inline cusparseStatus_t cusparsegemmi(cusparseHandle_t handle, int m, int n,
Expand All @@ -217,8 +226,11 @@ inline cusparseStatus_t cusparsegemmi(cusparseHandle_t handle, int m, int n,
const int* cscRowIndB, const double* beta,
double* C, int ldc, cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseDgemmi(handle, m, n, k, nnz, alpha, A, lda, cscValB,
cscColPtrB, cscRowIndB, beta, C, ldc);
#pragma GCC diagnostic pop
}
/** @} */

Expand Down Expand Up @@ -689,11 +701,14 @@ inline cusparseStatus_t cusparsecsrgemm2_buffersizeext(
const int* indicesD, csrgemm2Info_t info, size_t* pBufferSizeInBytes,
cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseScsrgemm2_bufferSizeExt(
handle, m, n, k, alpha, matA, nnzA, rowindA, indicesA, matB, nnzB, rowindB,
indicesB, beta, matD, nnzD, rowindD, indicesD, info, pBufferSizeInBytes);
#pragma GCC diagnostic pop
}

template <>
inline cusparseStatus_t cusparsecsrgemm2_buffersizeext(
cusparseHandle_t handle, int m, int n, int k, const double* alpha,
Expand All @@ -704,9 +719,12 @@ inline cusparseStatus_t cusparsecsrgemm2_buffersizeext(
const int* indicesD, csrgemm2Info_t info, size_t* pBufferSizeInBytes,
cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseDcsrgemm2_bufferSizeExt(
handle, m, n, k, alpha, matA, nnzA, rowindA, indicesA, matB, nnzB, rowindB,
indicesB, beta, matD, nnzD, rowindD, indicesD, info, pBufferSizeInBytes);
#pragma GCC diagnostic pop
}

inline cusparseStatus_t cusparsecsrgemm2nnz(
Expand All @@ -718,11 +736,13 @@ inline cusparseStatus_t cusparsecsrgemm2nnz(
int* rowindC, int* nnzC, const csrgemm2Info_t info, void* pBuffer,
cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseXcsrgemm2Nnz(handle, m, n, k, matA, nnzA, rowindA, indicesA,
matB, nnzB, rowindB, indicesB, matD, nnzD,
rowindD, indicesD, matC, rowindC, nnzC, info,
pBuffer);
#pragma GCC diagnostic pop
}

template <typename T>
Expand All @@ -748,12 +768,14 @@ inline cusparseStatus_t cusparsecsrgemm2(
int* csrColIndC, const csrgemm2Info_t info, void* pBuffer,
cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseScsrgemm2(handle, m, n, k, alpha, descrA, nnzA, csrValA,
csrRowPtrA, csrColIndA, descrB, nnzB, csrValB,
csrRowPtrB, csrColIndB, beta, descrD, nnzD, csrValD,
csrRowPtrD, csrColIndD, descrC, csrValC, csrRowPtrC,
csrColIndC, info, pBuffer);
#pragma GCC diagnostic pop
}

template <>
Expand All @@ -768,11 +790,14 @@ inline cusparseStatus_t cusparsecsrgemm2(
int* csrColIndC, const csrgemm2Info_t info, void* pBuffer,
cudaStream_t stream) {
CUSPARSE_CHECK(cusparseSetStream(handle, stream));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return cusparseDcsrgemm2(handle, m, n, k, alpha, descrA, nnzA, csrValA,
csrRowPtrA, csrColIndA, descrB, nnzB, csrValB,
csrRowPtrB, csrColIndB, beta, descrD, nnzD, csrValD,
csrRowPtrD, csrColIndD, descrC, csrValC, csrRowPtrC,
csrColIndC, info, pBuffer);
#pragma GCC diagnostic pop
}

/** @} */
Expand Down