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

Build fix for CUDA 12.2 #1870

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Build fix for CUDA 12.2 #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff8f6a
Build fix for CUDA 12.2
benfred Oct 3, 2023
0b828c9
Merge branch 'branch-23.12' into fix_cuda_12_2
cjnolet Oct 5, 2023
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
23 changes: 23 additions & 0 deletions cpp/cmake/patches/ggnn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
diff --git a/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh b/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
index 890420e..d792903 100644
--- a/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
+++ b/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
@@ -62,7 +62,7 @@ struct SimpleKNNSymCache {
const ValueT dist_half)
: dist_query(dist_query), dist_half(dist_half) {}

- __device__ __forceinline__ DistQueryAndHalf() {}
+ DistQueryAndHalf() = default;
};

struct DistanceAndNorm {
@@ -98,8 +98,7 @@ struct SimpleKNNSymCache {
KeyT cache;
DistQueryAndHalf dist;
bool flag;
-
- __device__ __forceinline__ SyncTempStorage() {}
+ SyncTempStorage() = default;
};

public:
diff --git a/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh b/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh
index 8cbaf0d..6eb72ac 100644
--- a/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/core/kvp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct KeyValuePair {
Value value; ///< Item value

/// Constructor
RAFT_INLINE_FUNCTION KeyValuePair() {}
KeyValuePair() = default;

#ifdef _RAFT_HAS_CUDA
/// Conversion Constructor to allow integration w/ cub
Expand Down