updt: move hnsw mod to hnswcore crate pkg for more unit tests

Signed-off-by: weedge <[email protected]>

Author: weedge

Cargo.toml

@@ -43,4 +43,4 @@ redis = "0.23"
 redis-module = { version = "2.0.5", features = ["default"] }
 
 [workspace]
-members = ["rust/usearch", "rust/faiss", "rust/hnsw"]
+members = ["rust/usearch", "rust/faiss", "rust/hnsw/hnswcore", "rust/hnsw"]

Makefile

@@ -59,6 +59,9 @@ build:
 build_faiss:
 	export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo build --manifest-path rust/faiss/Cargo.toml $(CARGO_FLAGS)
 
+build_hnswcore:
+	cargo build --manifest-path rust/hnsw/hnswcore/Cargo.toml $(CARGO_FLAGS)
+
 build_hnsw:
 	cargo build --manifest-path rust/hnsw/Cargo.toml $(CARGO_FLAGS)
 
@@ -76,13 +79,22 @@ endif
 
 #----------------------------------------------------------------------------------------------
 
-test: cargo_test
+test: cargo_test_workspace
+
+cargo_test_workspace: build
+	export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --workspace \
+		--exclude redisxann-hnsw \
+		--exclude redisxann-usearch \
+		--exclude redisxann-faiss \
+		$(CARGO_FLAGS)
 
-cargo_test:
-	export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --workspace $(CARGO_FLAGS)
-# export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --doc --workspace $(CARGO_FLAGS)
+cargo_test: build
+	export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --tests $(CARGO_FLAGS)
 
-.PHONY: test cargo_test
+cargo_test_doc:
+	export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --doc --workspace $(CARGO_FLAGS)
+
+.PHONY: test cargo_test cargo_test_workspace cargo_test_doc
 
 #----------------------------------------------------------------------------------------------
 
@@ -94,3 +106,5 @@ info:
 	cargo --version
 	rustup --version
 	rustup show
+
+.PHONY: info

rust/hnsw/Cargo.toml

@@ -23,10 +23,8 @@ path = "src/lib.rs"
 redis-module = { version = "2.0.5", features = ["default"] }
 lazy_static = "1.4.0"
 rand = "0.8.5"
-ordered-float = { version = "1.0.2" }
+ordered-float = { version = "4.1.0" }
 owning_ref = "0.4.1"
 #num = "0.4.1"
 num-traits = "^0.2"
-
-[dev-dependencies]
-redis-module = { version = "2.0.5", features = ["default"] }
+hnswcore = { path = "./hnswcore" }

rust/hnsw/hnswcore/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "hnswcore"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.8.5"
+ordered-float = { version = "4.1.0" }
+owning_ref = "0.4.1"
+#num = "0.4.1"
+num-traits = "^0.2"

rust/hnsw/src/LICENSE renamed to rust/hnsw/hnswcore/LICENSE

@@ -1,7 +1,7 @@
 use super::metrics;
 
 use num_traits::Float;
-use ordered_float::OrderedFloat;
+use ordered_float::{FloatCore, OrderedFloat};
 use owning_ref::{RefMutRefMut, RefRef, RwLockReadGuardRef, RwLockWriteGuardRefMut};
 use rand::prelude::*;
 use std::cell::RefCell;
@@ -236,7 +236,7 @@ type SimPairRef<T, R> = Rc<RefCell<_SimPair<T, R>>>;
 struct _SimPair<T, R>
 where
     T: Float,
-    R: Float,
+    R: Float + FloatCore,
 {
     pub sim: OrderedFloat<R>,
     pub node: Node<T>,
@@ -246,12 +246,12 @@ where
 struct SimPair<T, R>(SimPairRef<T, R>)
 where
     T: Float,
-    R: Float;
+    R: Float + FloatCore;
 
 impl<T, R> SimPair<T, R>
 where
     T: Float,
-    R: Float,
+    R: Float + FloatCore,
 {
     fn new(sim: OrderedFloat<R>, node: Node<T>) -> Self {
         let sp = _SimPair { sim, node };
@@ -270,19 +270,19 @@ where
 impl<T, R> PartialEq for SimPair<T, R>
 where
     T: Float,
-    R: Float,
+    R: Float + FloatCore,
 {
     fn eq(&self, other: &Self) -> bool {
         self.0.borrow().sim == other.0.borrow().sim
     }
 }
 
-impl<T: Float, R: Float> Eq for SimPair<T, R> {}
+impl<T: Float, R: Float + FloatCore> Eq for SimPair<T, R> {}
 
 impl<T, R> PartialOrd for SimPair<T, R>
 where
     T: Float,
-    R: Float,
+    R: Float + FloatCore,
 {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         self.0.borrow().sim.partial_cmp(&other.0.borrow().sim)
@@ -292,7 +292,7 @@ where
 impl<T, R> Ord for SimPair<T, R>
 where
     T: Float,
-    R: Float,
+    R: Float + FloatCore,
 {
     fn cmp(&self, other: &Self) -> Ordering {
         self.0.borrow().sim.cmp(&other.0.borrow().sim)
@@ -378,7 +378,7 @@ impl<T: Float, R: Float> fmt::Debug for Index<T, R> {
 impl<T, R> Index<T, R>
 where
     T: Float + Send + Sync + 'static,
-    R: Float,
+    R: Float + FloatCore,
 {
     pub fn add_node(
         &mut self,

rust/hnsw/src/hnsw/core.rs renamed to rust/hnsw/hnswcore/src/core.rs

@@ -0,0 +1,2 @@
+pub mod core;
+pub mod metrics;

rust/hnsw/hnswcore/src/lib.rs

@@ -1,5 +1,5 @@
-use crate::hnsw::core::*;
-use crate::hnsw::metrics::euclidean;
+use hnswcore::core::*;
+use hnswcore::metrics::euclidean;
 use std::sync::Arc;
 // use std::{thread, time};
 

rust/hnsw/src/hnsw/metrics.rs renamed to rust/hnsw/hnswcore/src/metrics.rs

@@ -1,4 +1,4 @@
-use crate::hnsw::metrics;
+use hnswcore::metrics;
 
 #[test]
 fn diff_is_zero() {