Merge branch 'feat/convolutions' into rust

Author: ivan-aksamentov

Cargo.lock

@@ -92,6 +92,7 @@ lazy_static = "=1.5.0"
 log = "=0.4.28"
 maplit = { version = "=1.0.2", features = [] }
 multimap = { version = "=0.10.1", features = ["serde_impl"] }
+ndarray-conv = { version = "=0.5.0", features = [] }
 num = "=0.4.3"
 num-integer = "=0.1.46"
 num-traits = "=0.2.19"

Cargo.toml

@@ -10,11 +10,9 @@ publish.workspace = true
 repository.workspace = true
 version.workspace = true
 
-
 [lib]
 crate-type = ["lib"]
 
-
 [dependencies]
 phyloxml = { path = "../phyloxml" }
 usher-mat-utils = { path = "../usher-mat-utils" }
@@ -53,6 +51,7 @@ lazy_static = { workspace = true }
 log = { workspace = true }
 maplit = { workspace = true }
 multimap = { workspace = true }
+ndarray-conv = { workspace = true }
 num = { workspace = true }
 num-integer = { workspace = true }
 num-traits = { workspace = true }
@@ -92,7 +91,6 @@ tikv-jemallocator = { workspace = true }
 [target.'cfg(all(target_arch = "aarch64", target_os = "linux", target_env = "musl"))'.dependencies]
 tikv-jemallocator = { workspace = true }
 
-
 [features]
 "png" = ["image", "plotters/bitmap_backend", "plotters/ttf"]