Merge branch 'develop'

kachark · Mar 31, 2024 · d149268 · d149268
2 parents e4fccde + b2db66e
commit d149268
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ cxx-build = "1.0"
 pyo3 = { version = "0.20", features = ["auto-initialize"] }
 numpy = "0.20"
 rand = "0.8"
-criterion = "0.3"
+criterion = { version = "0.4", features = ["html_reports"] }
 
 [features]
 default = ["ndarray-linalg-openblas-system"]

diff --git a/build.rs b/build.rs
@@ -1,4 +1,7 @@
 fn main() {
+    // Temporary workaround to find M1 mac location of homebrew libraries
+    println!("cargo:rustc-link-search=/opt/homebrew/opt/openblas/lib");
+
     cxx_build::bridge("src/exact/ffi.rs")
         .file("src/exact/fast_transport/EMD_wrapper.cpp")
         .flag_if_supported("-std=c++14")

diff --git a/examples/emd_2D/main.rs b/examples/emd_2D/main.rs
@@ -1,8 +1,8 @@
 use ndarray::prelude::*;
 use ndarray_stats::QuantileExt;
 
-use rust_optimal_transport as ot;
 use ot::prelude::*;
+use rust_optimal_transport as ot;
 
 mod plot;
 

diff --git a/examples/emd_2D/plot.rs b/examples/emd_2D/plot.rs
@@ -15,7 +15,6 @@ pub fn plot_py(
 
     // Start the python interpreter
     Python::with_gil(|py| {
-
         // Import matplotlib
         let plt = py.import("matplotlib.pyplot")?;
 

diff --git a/examples/sinkhorn_1D/main.rs b/examples/sinkhorn_1D/main.rs
@@ -1,8 +1,8 @@
 use ndarray::{prelude::*, stack};
 use ndarray_stats::QuantileExt;
 
-use rust_optimal_transport as ot;
 use ot::prelude::*;
+use rust_optimal_transport as ot;
 
 mod plot;
 

diff --git a/examples/sinkhorn_1D/plot.rs b/examples/sinkhorn_1D/plot.rs
@@ -14,7 +14,6 @@ pub fn plot_py(
 
     // Start the python interpreter
     Python::with_gil(|py| {
-
         // Import matplotlib
         let plt = py.import("matplotlib.pyplot")?;