Skip to content

Commit 0053171

Browse files
divyegaladivyegala
committed
address reviews
1 parent d7fa7f3 commit 0053171

11 files changed

Lines changed: 12 additions & 14 deletions

File tree

‎cpp/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,7 @@ if(NOT BUILD_CPU_ONLY)
616616
FRAGMENT_TAG_FORMAT
617617
"${cagra_ns}::fragment_tag_setup_workspace<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${neighbors_ns}::tag_@query_abbrev@, ${cagra_ns}::tag_codebook_@codebook_abbrev@, @team_size@, @dataset_block_dim@, @pq_bits@, @pq_len@>"
618618
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
619+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
619620
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/setup_workspace"
620621
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
621622
)
@@ -630,6 +631,7 @@ if(NOT BUILD_CPU_ONLY)
630631
FRAGMENT_TAG_FORMAT
631632
"${cagra_ns}::fragment_tag_compute_distance<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${neighbors_ns}::tag_@query_abbrev@, ${cagra_ns}::tag_codebook_@codebook_abbrev@, @team_size@, @dataset_block_dim@, @pq_bits@, @pq_len@>"
632633
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
634+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
633635
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/compute_distance"
634636
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
635637
)
@@ -643,6 +645,7 @@ if(NOT BUILD_CPU_ONLY)
643645
FRAGMENT_TAG_FORMAT
644646
"${cagra_ns}::fragment_tag_dist_op<${neighbors_ns}::tag_@query_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${cagra_ns}::@jit_metric_tag@>"
645647
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
648+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
646649
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/dist_op"
647650
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
648651
)
@@ -657,6 +660,7 @@ if(NOT BUILD_CPU_ONLY)
657660
FRAGMENT_TAG_FORMAT
658661
"${cagra_ns}::fragment_tag_apply_normalization_standard<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${neighbors_ns}::tag_@query_abbrev@, @team_size@, @dataset_block_dim@, ${cagra_ns}::tag_norm_@norm_kind@>"
659662
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
663+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
660664
OUTPUT_DIRECTORY
661665
"${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/apply_normalization_standard"
662666
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
@@ -672,6 +676,7 @@ if(NOT BUILD_CPU_ONLY)
672676
FRAGMENT_TAG_FORMAT
673677
"${cagra_ns}::fragment_tag_search_single_cta<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@source_index_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, @topk_by_bitonic_sort@, @bitonic_sort_and_merge_multi_warps@>"
674678
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
679+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
675680
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/search_single_cta"
676681
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
677682
)
@@ -686,6 +691,7 @@ if(NOT BUILD_CPU_ONLY)
686691
FRAGMENT_TAG_FORMAT
687692
"${cagra_ns}::fragment_tag_search_single_cta_p<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@source_index_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, @topk_by_bitonic_sort@, @bitonic_sort_and_merge_multi_warps@>"
688693
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
694+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
689695
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/search_single_cta_p"
690696
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
691697
)
@@ -699,6 +705,7 @@ if(NOT BUILD_CPU_ONLY)
699705
FRAGMENT_TAG_FORMAT
700706
"${cagra_ns}::fragment_tag_search_multi_cta<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@source_index_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@>"
701707
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
708+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
702709
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/search_multi_cta"
703710
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
704711
)
@@ -712,6 +719,7 @@ if(NOT BUILD_CPU_ONLY)
712719
FRAGMENT_TAG_FORMAT
713720
"${cagra_ns}::fragment_tag_random_pickup<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@>"
714721
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
722+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
715723
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/random_pickup"
716724
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
717725
)
@@ -725,6 +733,7 @@ if(NOT BUILD_CPU_ONLY)
725733
FRAGMENT_TAG_FORMAT
726734
"${cagra_ns}::fragment_tag_compute_distance_to_child_nodes<${neighbors_ns}::tag_@data_abbrev@, ${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${neighbors_ns}::tag_index_@source_index_abbrev@>"
727735
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
736+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
728737
OUTPUT_DIRECTORY
729738
"${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/compute_distance_to_child_nodes"
730739
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
@@ -739,6 +748,7 @@ if(NOT BUILD_CPU_ONLY)
739748
FRAGMENT_TAG_FORMAT
740749
"${cagra_ns}::fragment_tag_apply_filter_kernel<${neighbors_ns}::tag_index_@index_abbrev@, ${cagra_ns}::tag_dist_@distance_abbrev@, ${neighbors_ns}::tag_index_@source_index_abbrev@>"
741750
FRAGMENT_TAG_HEADER_FILES "<cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>"
751+
"<cuvs/detail/jit_lto/common_fragments.hpp>"
742752
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/cagra/apply_filter"
743753
KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
744754
)

‎cpp/cmake/modules/generate_jit_lto_kernels.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ function(process_jit_lto_matrix_entry source_list_var)
4848
cmake_parse_arguments(_JIT_LTO "${options}" "${one_value}" "${multi_value}" ${ARGN})
4949

5050
populate_matrix_variables("${_JIT_LTO_MATRIX_JSON_ENTRY}")
51-
5251
string(CONFIGURE "${_JIT_LTO_NAME_FORMAT}" kernel_name @ONLY)
5352
string(CONFIGURE "${_JIT_LTO_FRAGMENT_TAG_FORMAT}" fragment_tag @ONLY)
5453

‎cpp/include/cuvs/detail/jit_lto/cagra/cagra_fragments.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
#pragma once
77

8-
#include <cuvs/detail/jit_lto/common_fragments.hpp>
9-
108
#include <cstdint>
119

1210
namespace cuvs::neighbors::cagra::detail {

‎cpp/src/neighbors/detail/cagra/jit_lto_kernels/cagra_planner_base.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <cuvs/detail/jit_lto/AlgorithmPlanner.hpp>
99
#include <cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>
10+
#include <cuvs/detail/jit_lto/common_fragments.hpp>
1011
#include <cuvs/distance/distance.hpp>
1112
#include <raft/core/logger.hpp>
1213

‎cpp/src/neighbors/detail/cagra/shared_launcher_jit.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
// Include tags header before any other includes that might open namespaces
98
#include <cuvs/detail/jit_lto/cagra/cagra_fragments.hpp>
9+
#include <cuvs/detail/jit_lto/common_fragments.hpp>
1010

1111
#include "../../sample_filter.cuh" // For none_sample_filter, bitset_filter
1212
#include "jit_lto_kernels/cagra_bitset.cuh" // is_bitset_filter, cagra_bitset, cagra_sample_filter, extract

‎cpp/src/neighbors/ivf_flat/ivf_flat_interleaved_scan_explicit_inst.cuh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
typename cuvs::spatial::knn::detail::utils::config<T>::value_t, \
2323
IdxT, \
2424
SampleFilterT>(const index<T, IdxT>& index, \
25-
const search_params& params, \
2625
const T* queries, \
2726
const uint32_t* coarse_query_results, \
2827
const uint32_t n_queries, \

‎cpp/src/neighbors/ivf_flat/ivf_flat_interleaved_scan_ext.cuh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
namespace cuvs::neighbors::ivf_flat::detail {
2222
template <typename T, typename AccT, typename IdxT, typename IvfSampleFilterT>
2323
void ivfflat_interleaved_scan(const index<T, IdxT>& index,
24-
const search_params& params,
2524
const T* queries,
2625
const uint32_t* coarse_query_results,
2726
const uint32_t n_queries,
@@ -45,7 +44,6 @@ void ivfflat_interleaved_scan(const index<T, IdxT>& index,
4544
typename cuvs::spatial::knn::detail::utils::config<T>::value_t, \
4645
IdxT, \
4746
SampleFilterT>(const index<T, IdxT>& index, \
48-
const search_params& params, \
4947
const T* queries, \
5048
const uint32_t* coarse_query_results, \
5149
const uint32_t n_queries, \

‎cpp/src/neighbors/ivf_flat/ivf_flat_interleaved_scan_jit.cuh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ template <int Capacity,
137137
typename MetricTag,
138138
typename PostLambdaTag>
139139
void launch_kernel(const index<T, IdxT>& index,
140-
const search_params& params,
141140
const T* queries,
142141
const uint32_t* coarse_index,
143142
const uint32_t num_queries,
@@ -423,7 +422,6 @@ struct select_interleaved_scan_kernel {
423422
*/
424423
template <typename T, typename AccT, typename IdxT, typename IvfSampleFilterT>
425424
void ivfflat_interleaved_scan(const index<T, IdxT>& index,
426-
const search_params& params,
427425
const T* queries,
428426
const uint32_t* coarse_query_results,
429427
const uint32_t n_queries,
@@ -460,7 +458,6 @@ void ivfflat_interleaved_scan(const index<T, IdxT>& index,
460458
select_min,
461459
metric,
462460
index,
463-
params,
464461
queries,
465462
coarse_query_results,
466463
n_queries,

‎cpp/src/neighbors/ivf_flat/ivf_flat_search.cuh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ void search_impl(raft::resources const& handle,
194194
// query the gridDimX size to store probes topK output
195195
ivfflat_interleaved_scan<T, typename utils::config<T>::value_t, IdxT, IvfSampleFilterT>(
196196
index,
197-
params,
198197
nullptr,
199198
nullptr,
200199
n_queries,
@@ -251,7 +250,6 @@ void search_impl(raft::resources const& handle,
251250

252251
ivfflat_interleaved_scan<T, typename utils::config<T>::value_t, IdxT, IvfSampleFilterT>(
253252
index,
254-
params,
255253
queries,
256254
coarse_indices_dev.data(),
257255
n_queries,

‎cpp/src/neighbors/refine/refine_device.cuh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ void refine_device(
104104

105105
cuvs::neighbors::ivf_flat::detail::ivfflat_interleaved_scan<data_t, acc_t, int64_t>(
106106
refinement_index,
107-
cuvs::neighbors::ivf_flat::search_params(),
108107
queries.data_handle(),
109108
fake_coarse_idx.data(),
110109
static_cast<uint32_t>(n_queries),

0 commit comments

Comments
 (0)