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.

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

Reconciling primitives moved to RAFT #4583

Merged
merged 54 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d615950
Using metrics from raft
cjnolet Feb 16, 2022
142b328
Updating
cjnolet Feb 16, 2022
ad03b86
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Feb 16, 2022
9722d08
Adding knn back
cjnolet Feb 16, 2022
8b1de6b
Updating copyrights
cjnolet Feb 16, 2022
5ea7a91
Adding specializations for knn gtests
cjnolet Feb 17, 2022
11e50ca
adding more specializations
cjnolet Feb 17, 2022
7cc8d21
More specializations
cjnolet Feb 17, 2022
e08dea6
Updating style
cjnolet Feb 17, 2022
41a1c5e
No longer building brute_force_knn prim anywhere
cjnolet Feb 18, 2022
a421dab
Fixing style
cjnolet Feb 18, 2022
bb474e2
Fixing copyright and removing a couple more distance funcs
cjnolet Feb 18, 2022
f5b3c66
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Feb 18, 2022
dbde267
Removing prims moved over to raft
cjnolet Feb 18, 2022
80428f1
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Feb 19, 2022
375142e
Reverting get_raft cmake
cjnolet Feb 19, 2022
8d57a72
Using distance already specialized
cjnolet Feb 19, 2022
de49049
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Feb 23, 2022
53d730a
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Mar 1, 2022
004d215
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Mar 17, 2022
0172a5b
Merge branch 'branch-22.04' into imp-2204-metrics_to_raft
cjnolet Mar 30, 2022
d95746a
updating get_raft
cjnolet Mar 30, 2022
3f24aea
Fixing includes
cjnolet Mar 30, 2022
1583169
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Mar 31, 2022
1ba60f5
Removing raft allocator from gram
cjnolet Mar 31, 2022
48edbc5
Merge remote-tracking branch 'rapidsai/branch-22.04' into imp-2204-me…
cjnolet Apr 5, 2022
d49a04e
Merge remote-tracking branch 'rapidsai/branch-22.06' into imp-2204-me…
cjnolet Apr 5, 2022
0e0e693
Removing prims benchmarks which are being moved to raft
cjnolet Apr 6, 2022
bfeeafb
Fixing completeness score
cjnolet Apr 6, 2022
9985e69
Fixing completeness score for now
cjnolet Apr 6, 2022
8663dc9
Fixing get_raft.cmake
cjnolet Apr 7, 2022
74d5be0
Merge remote-tracking branch 'rapidsai/branch-22.06' into imp-2204-me…
cjnolet May 13, 2022
0510bb5
Merge remote-tracking branch 'rapidsai/branch-22.06' into imp-2204-me…
cjnolet May 24, 2022
4571f06
Merge remote-tracking branch 'rapidsai/branch-22.08' into imp-2204-me…
cjnolet Jun 2, 2022
acee2f7
Merge remote-tracking branch 'rapidsai/branch-22.08' into imp-2204-me…
cjnolet Jun 6, 2022
756fa29
Merge branch 'branch-22.10' into imp-2204-metrics_to_raft
cjnolet Oct 3, 2022
352e6fb
emoving more files
cjnolet Oct 3, 2022
873e277
Fixing style
cjnolet Oct 3, 2022
74e1888
Merge remote-tracking branch 'rapidsai/branch-22.12' into imp-2204-me…
cjnolet Oct 14, 2022
e1fb7b7
Fixing sv test
cjnolet Oct 14, 2022
ee4b0e9
Fixing svm test
cjnolet Oct 15, 2022
2f641d6
Fixing style
cjnolet Oct 15, 2022
d05f754
Fixing more style
cjnolet Oct 15, 2022
5c27e9f
Removing gram test
cjnolet Oct 15, 2022
1e5c2be
Adding knn classify/regress tests back in
cjnolet Oct 15, 2022
c97694e
Fixing information criterion use
cjnolet Oct 15, 2022
011ebb0
Fixing bad merge
cjnolet Oct 15, 2022
1fe951b
Still fixing bad merge
cjnolet Oct 15, 2022
0d67a29
Removing duplicated labels prims
cjnolet Oct 16, 2022
a7ee4a8
Final cleanup
cjnolet Oct 16, 2022
9c0d308
Reverting get_raft.cmake
cjnolet Oct 18, 2022
edee19c
Fixing header definition and namespace for kernel gram API
cjnolet Oct 18, 2022
2a26900
Fixing style
cjnolet Oct 18, 2022
977690f
Fixing small error in v_measure
cjnolet Oct 19, 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
15 changes: 2 additions & 13 deletions cpp/bench/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,9 @@ endif()
if(BUILD_CUML_PRIMS_BENCH)
# (please keep the filenames in alphabetical order)
add_executable(${PRIMS_BENCH_TARGET}
prims/add.cu
prims/distance_cosine.cu
prims/distance_exp_l2.cu
prims/distance_l1.cu
prims/distance_unexp_l2.cu
prims/fused_l2_nn.cu
prims/gram_matrix.cu
prims/gram_matrix.cu
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation here is bad

prims/main.cpp
prims/make_blobs.cu
prims/map_then_reduce.cu
prims/matrix_vector_op.cu
prims/permute.cu
prims/reduce.cu
prims/rng.cu)
)

target_compile_options(${PRIMS_BENCH_TARGET}
PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUML_CXX_FLAGS}>"
Expand Down
69 changes: 0 additions & 69 deletions cpp/bench/prims/add.cu

This file was deleted.

109 changes: 0 additions & 109 deletions cpp/bench/prims/distance_common.cuh

This file was deleted.

27 changes: 0 additions & 27 deletions cpp/bench/prims/distance_cosine.cu

This file was deleted.

28 changes: 0 additions & 28 deletions cpp/bench/prims/distance_exp_l2.cu

This file was deleted.

27 changes: 0 additions & 27 deletions cpp/bench/prims/distance_l1.cu

This file was deleted.

28 changes: 0 additions & 28 deletions cpp/bench/prims/distance_unexp_l2.cu

This file was deleted.

Loading