Change nalgebra imports

w1th0utnam3 · w1th0utnam3 · commit dbe1d6b5487c · 2020-12-01T11:27:53.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Version 0.2.0
 
- - Added support for reading PLY files (https://github.com/w1th0utnam3/splashsurf/pull/1)
+ - Add support for reading PLY files (https://github.com/w1th0utnam3/splashsurf/pull/1)
+ - Update dependencies
+ - Re-export `nalgebra` from lib, use this from binary
 
 ## Version 0.1.0
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/splashsurf/Cargo.toml b/splashsurf/Cargo.toml
@@ -13,15 +13,14 @@ homepage = "https://github.com/w1th0utnam3/splashsurf"
 repository = "https://github.com/w1th0utnam3/splashsurf"
 
 [dependencies]
-splashsurf_lib = { path = "../splashsurf_lib", version = "0.1" }
+splashsurf_lib = { path = "../splashsurf_lib", version = "0.2" }
 structopt = "0.3"
 log = "0.4"
 fern = "0.6"
 chrono = "0.4"
 anyhow = "1.0"
 coarse-prof = "0.2"
 vtkio = "0.3"
-nalgebra = "0.23"
 num = "0.3"
 rayon = "1.5"
 ply-rs = "0.1.3"
diff --git a/splashsurf/src/io.rs b/splashsurf/src/io.rs
@@ -4,9 +4,9 @@ use std::io::{BufReader, BufWriter, Write};
 use std::path::Path;
 
 use anyhow::{anyhow, Context};
-use na::Vector3;
 use ply_rs as ply;
 use ply_rs::ply::Property;
+use splashsurf_lib::nalgebra::Vector3;
 use vtkio::model::{DataSet, Version, Vtk};
 use vtkio::{export_be, import_be};
 
diff --git a/splashsurf/src/main.rs b/splashsurf/src/main.rs
@@ -1,4 +1,3 @@
-extern crate nalgebra as na;
 extern crate ply_rs;
 
 mod io;
@@ -11,8 +10,8 @@ use std::path::PathBuf;
 
 use anyhow::{anyhow, Context};
 use log::{error, info};
-use na::Vector3;
 use rayon::prelude::*;
+use splashsurf_lib::nalgebra::Vector3;
 use splashsurf_lib::AxisAlignedBoundingBox3d;
 use structopt::StructOpt;
 
diff --git a/splashsurf/src/reconstruction.rs b/splashsurf/src/reconstruction.rs
@@ -3,8 +3,8 @@ use std::path::Path;
 use anyhow::{anyhow, Context};
 use coarse_prof::profile;
 use log::info;
-use na::Vector3;
 use splashsurf_lib::mesh::PointCloud3d;
+use splashsurf_lib::nalgebra::Vector3;
 use splashsurf_lib::{density_map, Index, Real};
 
 use crate::io;
diff --git a/splashsurf_lib/Cargo.toml b/splashsurf_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "splashsurf_lib"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["Fabian Löschner <loeschner@cs.rwth-aachen.de>"]
 license = "MIT"
 description = "Library for surface reconstruction of SPH particle data"
diff --git a/splashsurf_lib/src/aabb.rs b/splashsurf_lib/src/aabb.rs
@@ -1,8 +1,8 @@
 use std::fmt;
 use std::fmt::Debug;
 
-use na::allocator::Allocator;
-use na::{DefaultAllocator, DimName, VectorN, U2, U3};
+use nalgebra::allocator::Allocator;
+use nalgebra::{DefaultAllocator, DimName, VectorN, U2, U3};
 
 use crate::Real;
 
diff --git a/splashsurf_lib/src/density_map.rs b/splashsurf_lib/src/density_map.rs
@@ -1,7 +1,7 @@
 use coarse_prof::profile;
 use dashmap::ReadOnlyView as ReadDashMap;
 use log::{info, warn};
-use na::Vector3;
+use nalgebra::Vector3;
 use rayon::prelude::*;
 
 use crate::kernel::DiscreteSquaredDistanceCubicKernel;
diff --git a/splashsurf_lib/src/kernel.rs b/splashsurf_lib/src/kernel.rs
@@ -47,7 +47,7 @@ fn test_cubic_kernel_r_compact_support() {
 
 #[test]
 fn test_cubic_kernel_r_integral() {
-    use na::Vector3;
+    use nalgebra::Vector3;
 
     let hs = [0.025, 0.1, 2.0];
     let n = 10;
diff --git a/splashsurf_lib/src/lib.rs b/splashsurf_lib/src/lib.rs
@@ -2,7 +2,8 @@
 //! Library for surface reconstruction using marching cubes for SPH particle data. Entry point is the [reconstruct_surface] function.
 //!
 
-extern crate nalgebra as na;
+/// Re-export the version of nalgebra used by this crate
+pub use nalgebra;
 
 mod aabb;
 /// Computation of sparse density maps (evaluation of particle densities and mapping onto sparse grids)
@@ -29,7 +30,7 @@ pub use uniform_grid::{GridConstructionError, UniformGrid};
 use coarse_prof::profile;
 use log::info;
 use mesh::TriMesh3d;
-use na::Vector3;
+use nalgebra::Vector3;
 use thiserror::Error as ThisError;
 
 // TODO: Remove anyhow/thiserror from lib?
diff --git a/splashsurf_lib/src/marching_cubes.rs b/splashsurf_lib/src/marching_cubes.rs
@@ -1,6 +1,6 @@
 use coarse_prof::profile;
 use log::info;
-use na::Vector3;
+use nalgebra::Vector3;
 
 use crate::marching_cubes_lut::get_marching_cubes_triangulation;
 use crate::mesh::TriMesh3d;
diff --git a/splashsurf_lib/src/mesh.rs b/splashsurf_lib/src/mesh.rs
@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use na::Vector3;
+use nalgebra::Vector3;
 use vtkio::model::{Attribute, Attributes, CellType, Cells, DataSet};
 
 use crate::Real;
diff --git a/splashsurf_lib/src/neighborhood_search.rs b/splashsurf_lib/src/neighborhood_search.rs
@@ -1,5 +1,5 @@
 use coarse_prof::profile;
-use na::Vector3;
+use nalgebra::Vector3;
 use rayon::prelude::*;
 
 use crate::uniform_grid::UniformGrid;
diff --git a/splashsurf_lib/src/numeric_types.rs b/splashsurf_lib/src/numeric_types.rs
@@ -1,8 +1,8 @@
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
 
-use na::allocator::Allocator;
-use na::{DefaultAllocator, DimName, RealField, VectorN};
+use nalgebra::allocator::Allocator;
+use nalgebra::{DefaultAllocator, DimName, RealField, VectorN};
 use num::{Bounded, CheckedAdd, CheckedMul, CheckedSub, FromPrimitive, Integer, ToPrimitive};
 
 /// Trait that has to be implemented by [Index] and [Real] types to use them in parallelized algorithms
diff --git a/splashsurf_lib/src/uniform_grid.rs b/splashsurf_lib/src/uniform_grid.rs
@@ -2,7 +2,7 @@ use std::iter::Iterator;
 use std::ops::{Add, Sub};
 
 use itertools::iproduct;
-use na::Vector3;
+use nalgebra::Vector3;
 use num::{CheckedAdd, CheckedSub, One};
 use thiserror::Error as ThisError;
 
