pointpca2 0.2.2__tar.gz → 0.3.0__tar.gz

{pointpca2-0.2.2 → pointpca2-0.3.0}/Cargo.lock

@@ -277,7 +277,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -450,18 +450,18 @@ dependencies = [
 
 [[package]]
 name = "pointpca2"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "nalgebra",
  "numpy",
- "pointpca2-rust",
+ "pointpca2-rs",
  "pyo3",
 ]
 
 [[package]]
-name = "pointpca2-rust"
-version = "0.1.0"
-source = "git+https://github.com/akaTsunemori/pointpca2-rs.git?tag=v1.2.2#353164ef997439d0ae825551f442a8c23d844dce"
+name = "pointpca2-rs"
+version = "1.3.0"
+source = "git+https://github.com/akaTsunemori/pointpca2-rs.git?tag=v1.3.0#18d4d6534f8503d4e9ce7c6e178c3e3a425b4c94"
 dependencies = [
  "kd-tree",
  "libm",
@@ -659,7 +659,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -720,9 +720,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.70"
+version = "2.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
+checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
 dependencies = [
  "proc-macro2",
  "quote",

{pointpca2-0.2.2 → pointpca2-0.3.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pointpca2"
-version = "0.2.2"
+version = "0.3.0"
 edition = "2021"
 
 [lib]
@@ -11,9 +11,9 @@ crate-type = ["cdylib"]
 nalgebra = "0.32.5"
 numpy = "0.15"
 
-[dependencies.pointpca2-rust]
+[dependencies.pointpca2-rs]
 git = "https://github.com/akaTsunemori/pointpca2-rs.git"
-tag = "v1.2.2"
+tag = "v1.3.0"
 
 [dependencies.pyo3]
 version = "0.15.1"

{pointpca2-0.2.2 → pointpca2-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pointpca2
-Version: 0.2.2
+Version: 0.3.0
 Requires-Dist: numpy >=1.26
 Requires-Dist: toml ==0.10.0
 License-File: LICENSE

pointpca2-0.3.0/src/lib.rs

@@ -0,0 +1,53 @@
+extern crate nalgebra as na;
+extern crate numpy;
+extern crate pointpca2_rs;
+
+use na::DMatrix;
+use numpy::PyArray1;
+use numpy::PyReadonlyArray2;
+use pyo3::prelude::*;
+use pyo3::wrap_pyfunction;
+
+fn as_dmatrix<'a, T>(x: &'a PyReadonlyArray2<T>) -> DMatrix<T>
+where
+    T: numpy::Element + na::Scalar,
+{
+    let data: Vec<T> = x.as_array().iter().cloned().collect();
+    DMatrix::from_row_slice(x.shape()[0], x.shape()[1], &data)
+}
+
+#[pyfunction]
+fn compute_pointpca2<'py>(
+    _py: Python<'py>,
+    points_a: PyReadonlyArray2<'py, f64>,
+    colors_a: PyReadonlyArray2<'py, u8>,
+    points_b: PyReadonlyArray2<'py, f64>,
+    colors_b: PyReadonlyArray2<'py, u8>,
+    search_size: usize,
+    verbose: bool,
+) -> &'py PyArray1<f64> {
+    let (points_a, colors_a, points_b, colors_b) = {
+        (
+            as_dmatrix(&points_a),
+            as_dmatrix(&colors_a),
+            as_dmatrix(&points_b),
+            as_dmatrix(&colors_b),
+        )
+    };
+    let pooled_predictors = pointpca2_rs::compute_pointpca2(
+        points_a,
+        colors_a,
+        points_b,
+        colors_b,
+        search_size,
+        verbose,
+    );
+    let py_array = PyArray1::from_iter(_py, pooled_predictors.iter().cloned());
+    py_array
+}
+
+#[pymodule]
+fn pointpca2(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(compute_pointpca2, m)?)?;
+    Ok(())
+}

pointpca2-0.2.2/src/lib.rs

@@ -1,73 +0,0 @@
-extern crate nalgebra as na;
-extern crate numpy;
-extern crate pointpca2_rust;
-
-use na::DMatrix;
-use numpy::PyArray1;
-use numpy::PyReadonlyArray2;
-use pointpca2_rust::features;
-use pointpca2_rust::knn_search;
-use pointpca2_rust::pooling;
-use pointpca2_rust::predictors;
-use pointpca2_rust::preprocessing;
-use pyo3::prelude::*;
-use pyo3::wrap_pyfunction;
-
-fn print_if_verbose<'a>(string: &'a str, verbose: &'a bool) {
-    if *verbose {
-        println!("{}", string);
-    }
-}
-
-fn as_dmatrix<'a, T>(x: &'a PyReadonlyArray2<T>) -> DMatrix<T>
-where
-    T: numpy::Element + na::Scalar,
-{
-    let data: Vec<T> = x.as_array().iter().cloned().collect();
-    DMatrix::from_row_slice(x.shape()[0], x.shape()[1], &data)
-}
-
-#[pyfunction]
-fn compute_pointpca2<'py>(
-    _py: Python<'py>,
-    points_a: PyReadonlyArray2<'py, f64>,
-    colors_a: PyReadonlyArray2<'py, u8>,
-    points_b: PyReadonlyArray2<'py, f64>,
-    colors_b: PyReadonlyArray2<'py, u8>,
-    search_size: usize,
-    verbose: bool,
-) -> &'py PyArray1<f64> {
-    let points_a = as_dmatrix(&points_a);
-    let colors_a = as_dmatrix(&colors_a);
-    let points_b = as_dmatrix(&points_b);
-    let colors_b = as_dmatrix(&colors_b);
-    print_if_verbose("Preprocessing", &verbose);
-    let (points_a, colors_a) = preprocessing::preprocess_point_cloud(&points_a, &colors_a);
-    let (points_b, colors_b) = preprocessing::preprocess_point_cloud(&points_b, &colors_b);
-    print_if_verbose("Performing knn search", &verbose);
-    let knn_indices_a = knn_search::knn_search(&points_a, &points_a, search_size);
-    let knn_indices_b = knn_search::knn_search(&points_b, &points_a, search_size);
-    print_if_verbose("Computing local features", &verbose);
-    let local_features = features::compute_features(
-        points_a,
-        colors_a,
-        points_b,
-        colors_b,
-        knn_indices_a,
-        knn_indices_b,
-        search_size,
-    );
-    print_if_verbose("Computing predictors", &verbose);
-    let predictors_result = predictors::compute_predictors(local_features);
-    print_if_verbose("Pooling predictors", &verbose);
-    let pooled_predictors = pooling::mean_pooling(predictors_result);
-    print_if_verbose("Done", &verbose);
-    let py_array = PyArray1::from_iter(_py, pooled_predictors.iter().cloned());
-    py_array
-}
-
-#[pymodule]
-fn pointpca2(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(compute_pointpca2, m)?)?;
-    Ok(())
-}