Skip to content

Commit 740b78e

Browse files
committed
fix compilation errors
1 parent 075c1ba commit 740b78e

2 files changed

Lines changed: 9 additions & 26 deletions

File tree

cpp/src/preprocessing/quantize/detail/pq.cuh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -502,30 +502,6 @@ inline auto make_pq_params_from_vpq(const cuvs::neighbors::vpq_params& in_params
502502
max_train_points_per_vq_cluster};
503503
}
504504

505-
inline auto make_pq_params_from_vpq(const cuvs::neighbors::vpq_params& in_params,
506-
const uint64_t n_rows)
507-
-> cuvs::preprocessing::quantize::pq::params
508-
{
509-
const uint32_t pq_n_centers = 1 << in_params.pq_bits;
510-
uint32_t max_train_points_per_vq_cluster = in_params.max_train_points_per_vq_cluster;
511-
if (in_params.vq_n_centers > 0) {
512-
max_train_points_per_vq_cluster =
513-
std::min<uint32_t>(max_train_points_per_vq_cluster,
514-
n_rows * in_params.vq_kmeans_trainset_fraction / in_params.vq_n_centers);
515-
}
516-
return cuvs::preprocessing::quantize::pq::params{
517-
in_params.pq_bits,
518-
in_params.pq_dim,
519-
true,
520-
true,
521-
in_params.vq_n_centers,
522-
in_params.kmeans_n_iters,
523-
in_params.pq_kmeans_type,
524-
std::min<uint32_t>(in_params.max_train_points_per_pq_code,
525-
n_rows * in_params.pq_kmeans_trainset_fraction / pq_n_centers),
526-
max_train_points_per_vq_cluster};
527-
}
528-
529505
template <typename DatasetT, typename MathT, typename IdxT>
530506
auto vpq_build(const raft::resources& res,
531507
const cuvs::neighbors::vpq_params& params,

cpp/tests/preprocessing/product_quantization.cu

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ class ProductQuantizationTest : public ::testing::TestWithParam<ProductQuantizat
147147
auto orig_data = raft::make_device_matrix_view<T, int64_t>(dataset_.data_handle(), n_take, dim);
148148

149149
std::optional<raft::device_vector_view<const uint32_t, int64_t>> vq_labels_view = std::nullopt;
150-
if (vq_labels) { vq_labels_view = raft::make_const_mdspan(vq_labels.value()); }
150+
if (vq_labels) {
151+
vq_labels_view = raft::make_device_vector_view<const uint32_t, int64_t>(
152+
vq_labels.value().data_handle(), static_cast<int64_t>(n_take));
153+
}
151154
inverse_transform(handle,
152155
quantizer,
153156
raft::device_matrix_view<const uint8_t, int64_t>(
@@ -242,7 +245,11 @@ class ProductQuantizationTest : public ::testing::TestWithParam<ProductQuantizat
242245

243246
void testViewQuantizer()
244247
{
245-
params config{params_.pq_bits, params_.pq_dim, true, false};
248+
params config;
249+
config.pq_bits = params_.pq_bits;
250+
config.pq_dim = params_.pq_dim;
251+
config.use_subspaces = true;
252+
config.use_vq = false;
246253

247254
if ((n_samples_ < (1 << params_.pq_bits)) || (n_features_ % params_.pq_dim != 0) ||
248255
(static_cast<uint32_t>(n_samples_) < params_.n_vq_centers)) {

0 commit comments

Comments
 (0)