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

Cleaning up cusparse_wrappers #441

Merged
merged 20 commits into from
Feb 8, 2022
Merged

Cleaning up cusparse_wrappers #441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
67271eb
Removing deprecated (and unused) functions from cusparse_wrappers
cjnolet Jan 12, 2022
41676d5
Updating cusparse wrappers to remove deprecation warnings
cjnolet Jan 31, 2022
5e16bdc
Separating cusparse macros so the cusparse wrappers don't need to be…
cjnolet Jan 31, 2022
d7b54a9
Merge branch 'branch-22.04' into imp-2204-fix_deprecated_cusparse
cjnolet Jan 31, 2022
2b2d363
Fixing style
cjnolet Jan 31, 2022
1c1f365
Moving cusparse_wrappers behind detail namespace. These shouldn't be
cjnolet Jan 31, 2022
ebd4032
Moving cusparse wrappers to detail and adjusting all includes
cjnolet Jan 31, 2022
47d5176
Updating style
cjnolet Jan 31, 2022
d9e8eec
Fixing definitions.
cjnolet Jan 31, 2022
9a30ac5
Changing cusparse include
cjnolet Jan 31, 2022
8dd3564
Adding doxygen for missing param
cjnolet Feb 1, 2022
75c095c
Fixing cusparse API compatibility for CUDA versions < 11.2
cjnolet Feb 1, 2022
0ce2d3a
Fixing doc
cjnolet Feb 1, 2022
65cfd04
Fixing doc and style
cjnolet Feb 1, 2022
213b314
Fixing bad return
cjnolet Feb 1, 2022
a0aa3f6
Moving cusparse wrappers to detail namespace
cjnolet Feb 1, 2022
b50bbb1
Merge branch 'branch-22.04' into imp-2204-fix_deprecated_cusparse
cjnolet Feb 4, 2022
d5dc78d
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-fi…
cjnolet Feb 8, 2022
f04f591
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-fi…
cjnolet Feb 8, 2022
16474fb
Fixing merge
cjnolet Feb 8, 2022
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
Moving cusparse wrappers to detail and adjusting all includes
  • Loading branch information
@cjnolet
cjnolet committed Jan 31, 2022
commit ebd40325d6c6354315d224de5a653c0235ece314
2 changes: 1 addition & 1 deletion cpp/doxygen/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ RECURSIVE = YES

EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/linalg/symmetrize.hpp \ # Contains device code
@CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/csr.hpp \ # Contains device code
@CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/cusparse_wrappers.h
@CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/detail/cusparse_wrappers.h

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/convert/detail/coo.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cusparse_v2.h>
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <thrust/device_ptr.h>
#include <thrust/scan.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/convert/detail/csr.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/handle.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>

#include <thrust/device_ptr.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/convert/detail/dense.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cusparse_v2.h>
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <thrust/device_ptr.h>
#include <thrust/scan.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/detail/csr.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cusparse_v2.h>
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/detail/cusparse_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//(2.) to enforce a lower version,
//
//`#define CUDA_ENFORCE_LOWER
// #include <raft/sparse/cusparse_wrappers.h>`
// #include <raft/sparse/detail/cusparse_wrappers.h>`
//
// (i.e., before including this header)
//
Expand Down
1 change: 1 addition & 0 deletions cpp/include/raft/sparse/detail/cusparse_wrappers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#pragma once

#include <cusparse_v2.h>
#include <raft/error.hpp>
#include <raft/sparse/detail/cusparse_macros.h>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/detail/bin_distance.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/linalg/distance_type.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/detail/utils.h>
#include <raft/sparse/distance/common.h>
#include <raft/sparse/distance/detail/ip_distance.cuh>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/detail/coo_spmv.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/mr/device/buffer.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include "../../csr.hpp"
#include "../../detail/utils.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/detail/ip_distance.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/linalg/distance_type.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <raft/sparse/convert/csr.hpp>
#include <raft/sparse/convert/dense.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/detail/l2_distance.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <raft/linalg/distance_type.h>
#include <raft/linalg/unary_op.cuh>
#include <raft/sparse/csr.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/detail/utils.h>
#include <raft/sparse/distance/common.h>
#include <raft/sparse/distance/detail/ip_distance.cuh>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/detail/lp_distance.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/linalg/distance_type.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <rmm/device_uvector.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/distance/distance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/linalg/distance_type.h>
#include <raft/mr/device/buffer.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <raft/sparse/convert/coo.hpp>
#include <raft/sparse/convert/csr.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/linalg/detail/add.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>
#include <rmm/exec_policy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/linalg/detail/norm.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cusparse_v2.h>
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <thrust/device_ptr.h>
#include <thrust/scan.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/linalg/detail/spectral.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <raft/cudart_utils.h>

#include <raft/cuda_utils.cuh>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/spectral/partition.hpp>
#include <rmm/device_uvector.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/linalg/detail/symmetrize.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>
#include <rmm/exec_policy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/linalg/detail/transpose.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>

#include <thrust/device_ptr.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/detail/filter.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>
#include <rmm/exec_policy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/detail/reduce.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/mr/device/buffer.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <raft/device_atomics.cuh>
#include <raft/sparse/op/sort.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/detail/row_op.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <thrust/device_ptr.h>
#include <thrust/scan.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/detail/slice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/linalg/unary_op.cuh>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <thrust/device_ptr.h>
#include <thrust/scan.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/detail/sort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <raft/cuda_utils.cuh>
#include <raft/cudart_utils.h>
#include <raft/sparse/coo.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/detail/utils.h>
#include <rmm/exec_policy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/spectral/matrix_wrappers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <raft/cudart_utils.h>
#include <raft/handle.hpp>
#include <raft/linalg/cublas_wrappers.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>

#include <thrust/fill.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/sparse/csr_row_slice.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <raft/handle.hpp>

#include <gtest/gtest.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/op/slice.hpp>

#include <rmm/device_uvector.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/sparse/csr_to_dense.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <gtest/gtest.h>
#include <raft/sparse/convert/dense.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <rmm/device_uvector.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/test/sparse/csr_transpose.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cudart_utils.h>
#include <raft/handle.hpp>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/linalg/transpose.hpp>

#include "../test_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/sparse/dist_coo_spmv.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <raft/cudart_utils.h>
#include <raft/linalg/distance_type.h>
#include <raft/linalg/unary_op.cuh>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <rmm/device_uvector.hpp>

#include <raft/sparse/convert/coo.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/sparse/distance.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <raft/cudart_utils.h>
#include <raft/linalg/distance_type.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

#include <raft/sparse/distance/distance.hpp>

Expand Down
4 changes: 2 additions & 2 deletions cpp/test/sparse/knn.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

#include "../test_utils.h"
#include <raft/linalg/distance_type.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>
#include <raft/sparse/selection/knn.hpp>

#include <raft/cudart_utils.h>
#include <raft/sparse/cusparse_wrappers.h>
#include <raft/sparse/detail/cusparse_wrappers.h>

namespace raft {
namespace sparse {
Expand Down