Rename FloatArray to FloatVector

Author: pierd

instant-distance-py/src/lib.rs

@@ -29,7 +29,7 @@ fn instant_distance_py(_: Python, m: &PyModule) -> PyResult<()> {
 
 #[pyclass]
 struct HnswMap {
-    inner: instant_distance::HnswMap<FloatArray, MapValue>,
+    inner: instant_distance::HnswMap<FloatVector, MapValue>,
 }
 
 #[pymethods]
@@ -39,7 +39,7 @@ impl HnswMap {
     fn build(points: &PyList, values: &PyList, config: &Config) -> PyResult<Self> {
         let points = points
             .into_iter()
-            .map(FloatArray::try_from)
+            .map(FloatVector::try_from)
             .collect::<Result<Vec<_>, PyErr>>()?;
 
         let values = values
@@ -55,7 +55,7 @@ impl HnswMap {
     #[staticmethod]
     fn load(fname: &str) -> PyResult<Self> {
         let hnsw_map =
-            bincode::deserialize_from::<_, instant_distance::HnswMap<FloatArray, MapValue>>(
+            bincode::deserialize_from::<_, instant_distance::HnswMap<FloatVector, MapValue>>(
                 BufReader::with_capacity(32 * 1024 * 1024, File::open(fname)?),
             )
             .map_err(|e| PyValueError::new_err(format!("deserialization error: {e:?}")))?;
@@ -78,7 +78,7 @@ impl HnswMap {
     ///
     /// For best performance, reusing `Search` objects is recommended.
     fn search(slf: Py<Self>, point: &PyAny, search: &mut Search, py: Python<'_>) -> PyResult<()> {
-        let point = FloatArray::try_from(point)?;
+        let point = FloatVector::try_from(point)?;
         let _ = slf.try_borrow(py)?.inner.search(&point, &mut search.inner);
         search.cur = Some((HnswType::Map(slf.clone_ref(py)), 0));
         Ok(())
@@ -90,7 +90,7 @@ impl HnswMap {
 /// For now, this uses a squared Euclidean distance metric.
 #[pyclass]
 struct Hnsw {
-    inner: instant_distance::Hnsw<FloatArray>,
+    inner: instant_distance::Hnsw<FloatVector>,
 }
 
 #[pymethods]
@@ -100,7 +100,7 @@ impl Hnsw {
     fn build(input: &PyList, config: &Config) -> PyResult<(Self, Vec<u32>)> {
         let points = input
             .into_iter()
-            .map(FloatArray::try_from)
+            .map(FloatVector::try_from)
             .collect::<Result<Vec<_>, PyErr>>()?;
 
         let (inner, ids) = instant_distance::Builder::from(config).build_hnsw(points);
@@ -111,7 +111,7 @@ impl Hnsw {
     /// Load an index from the given file name
     #[staticmethod]
     fn load(fname: &str) -> PyResult<Self> {
-        let hnsw = bincode::deserialize_from::<_, instant_distance::Hnsw<FloatArray>>(
+        let hnsw = bincode::deserialize_from::<_, instant_distance::Hnsw<FloatVector>>(
             BufReader::with_capacity(32 * 1024 * 1024, File::open(fname)?),
         )
         .map_err(|e| PyValueError::new_err(format!("deserialization error: {e:?}")))?;
@@ -134,7 +134,7 @@ impl Hnsw {
     ///
     /// For best performance, reusing `Search` objects is recommended.
     fn search(slf: Py<Self>, point: &PyAny, search: &mut Search, py: Python<'_>) -> PyResult<()> {
-        let point = FloatArray::try_from(point)?;
+        let point = FloatVector::try_from(point)?;
         let _ = slf.try_borrow(py)?.inner.search(&point, &mut search.inner);
         search.cur = Some((HnswType::Hnsw(slf.clone_ref(py)), 0));
         Ok(())
@@ -346,21 +346,21 @@ impl Neighbor {
 }
 
 #[derive(Clone, Deserialize, Serialize)]
-struct FloatArray(AVec<f32>);
+struct FloatVector(AVec<f32>);
 
-impl TryFrom<&PyAny> for FloatArray {
+impl TryFrom<&PyAny> for FloatVector {
     type Error = PyErr;
 
     fn try_from(value: &PyAny) -> Result<Self, Self::Error> {
-        let mut new = FloatArray(AVec::with_capacity(32, value.len()?));
+        let mut new = FloatVector(AVec::with_capacity(32, value.len()?));
         for val in value.iter()? {
             new.0.push(val?.extract()?);
         }
         Ok(new)
     }
 }
 
-impl Point for FloatArray {
+impl Point for FloatVector {
     fn distance(&self, rhs: &Self) -> f32 {
         debug_assert_eq!(self.0.len(), rhs.0.len());