Reorganize the quantization directory

rs/cli/src/index_viewer.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
 use index::hnsw::reader::HnswReader;
 use index::hnsw::utils::GraphTraversal;
-use quantization::pq::ProductQuantizer;
+use quantization::pq::pq::ProductQuantizer;
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

rs/index/src/hnsw/builder.rs

@@ -533,7 +533,7 @@ impl<Q: Quantizer> GraphTraversal<Q> for HnswBuilder<Q> {
 mod tests {
     use std::fs;
 
-    use quantization::pq::ProductQuantizer;
+    use quantization::pq::pq::ProductQuantizer;
     use utils::test_utils::generate_random_vector;
 
     use super::*;

rs/index/src/hnsw/reader.rs

@@ -100,8 +100,8 @@ mod tests {
     use std::fs;
 
     use quantization::no_op::{NoQuantizer, NoQuantizerWriter};
-    use quantization::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
-    use quantization::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
+    use quantization::pq::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
+    use quantization::pq::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
     use utils::test_utils::generate_random_vector;
 
     use super::*;

rs/index/src/hnsw/writer.rs

@@ -266,8 +266,8 @@ mod tests {
     use std::vec;
 
     use ordered_float::NotNan;
-    use quantization::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
-    use quantization::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
+    use quantization::pq::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
+    use quantization::pq::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
     use utils::test_utils::generate_random_vector;
 
     use super::*;

rs/index_server/src/index_provider.rs

@@ -2,7 +2,7 @@ use index::hnsw::reader::HnswReader;
 use index::index::BoxedIndex;
 use index::spann::reader::SpannReader;
 use index_writer::config::BaseConfig;
-use quantization::pq::ProductQuantizer;
+use quantization::pq::pq::ProductQuantizer;
 
 pub struct IndexProvider {
     data_directory: String,

rs/index_writer/src/hnsw_reindexer.rs

@@ -4,7 +4,7 @@ use index::hnsw::reader::HnswReader;
 use index::hnsw::writer::HnswWriter;
 use index::vector::VectorStorageConfig;
 use log::error;
-use quantization::pq::ProductQuantizer;
+use quantization::pq::pq::ProductQuantizer;
 
 #[derive(Parser)]
 struct Args {

rs/index_writer/src/index_writer.rs

@@ -5,8 +5,8 @@ use index::ivf::builder::{IvfBuilder, IvfBuilderConfig};
 use index::ivf::writer::IvfWriter;
 use log::{debug, info};
 use quantization::no_op::{NoQuantizer, NoQuantizerWriter};
-use quantization::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
-use quantization::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
+use quantization::pq::pq::{ProductQuantizer, ProductQuantizerConfig, ProductQuantizerWriter};
+use quantization::pq::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
 use rand::seq::SliceRandom;
 
 use crate::config::{

rs/quantization/benches/pq_dist.rs

@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
-use quantization::pq::ProductQuantizerConfig;
-use quantization::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
+use quantization::pq::pq::ProductQuantizerConfig;
+use quantization::pq::pq_builder::{ProductQuantizerBuilder, ProductQuantizerBuilderConfig};
 use quantization::quantization::Quantizer;
 use strum::IntoEnumIterator;
 use utils::distance::l2::L2DistanceCalculatorImpl;

rs/quantization/src/lib.rs

@@ -1,9 +1,7 @@
 #![feature(portable_simd)]
 pub mod no_op;
 pub mod pq;
-pub mod pq_builder;
 pub mod quantization;
 pub mod rabitq;
-pub mod rabitq_builder;
 pub mod reader;
 pub mod typing;

rs/quantization/src/pq/mod.rs

@@ -0,0 +1,2 @@
+pub mod pq;
+pub mod pq_builder;

rs/quantization/src/pq_builder.rs → rs/quantization/src/pq/pq_builder.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use kmeans::*;
 use log::debug;
 
-use crate::pq::{ProductQuantizer, ProductQuantizerConfig};
+use crate::pq::pq::{ProductQuantizer, ProductQuantizerConfig};
 
 pub struct ProductQuantizerBuilderConfig {
     pub max_iteration: usize,

rs/quantization/src/rabitq/mod.rs

@@ -0,0 +1,2 @@
+pub mod rabitq;
+pub mod rabitq_builder;

rs/quantization/src/rabitq_builder.rs → rs/quantization/src/rabitq/rabitq_builder.rs

@@ -7,7 +7,7 @@ use ndarray_linalg::solve::Inverse;
 use ndarray_rand::rand_distr::StandardNormal;
 use ndarray_rand::RandomExt;
 
-use crate::rabitq::RabitQ;
+use crate::rabitq::rabitq::RabitQ;
 
 pub struct RabitQBuilder {
     dimension: usize,

rs/quantization/src/reader.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use anyhow::Result;
 
 use crate::no_op::{NoQuantizer, NoQuantizerReader};
-use crate::pq::{ProductQuantizer, ProductQuantizerReader};
+use crate::pq::pq::{ProductQuantizer, ProductQuantizerReader};
 
 pub struct QuantizationReader {
     base_directory: String,