# HG changeset patch # User Tuomo Valkonen # Date 1778278594 18000 # Node ID 49b062acace97e7c3b33b81573f055ae24f82539 # Parent c3a4f4bb87f7ca871ce9ba7871cde8a6ef70e602 Do not directly depend on ndarray, but through numpy diff -r c3a4f4bb87f7 -r 49b062acace9 Cargo.toml --- a/Cargo.toml Wed Apr 22 22:32:00 2026 -0500 +++ b/Cargo.toml Fri May 08 17:16:34 2026 -0500 @@ -39,7 +39,6 @@ serde_json = "1.0.140" nalgebra = "0.34" numpy = { version = "0.27.0", features = ["nalgebra"] } -ndarray = "0.16.1" log = { version = "0.4.28", features = [ "max_level_debug", "release_max_level_warn", diff -r c3a4f4bb87f7 -r 49b062acace9 src/python_access/diff_mapping.rs --- a/src/python_access/diff_mapping.rs Wed Apr 22 22:32:00 2026 -0500 +++ b/src/python_access/diff_mapping.rs Fri May 08 17:16:34 2026 -0500 @@ -8,7 +8,7 @@ use alg_tools::linops::IdOp; use alg_tools::mapping::{ClosedSpace, DifferentiableImpl, Instance, Mapping, Space}; use anyhow::anyhow; -use ndarray::Dimension; +use numpy::ndarray::Dimension; use numpy::{Ix1, Ix2}; use pointsource_algs::forward_model::{BoundedCurvature, BoundedCurvatureGuess}; use pointsource_algs::prox_penalty::{RadonSquared, StepLengthBound, StepLengthBoundPair}; diff -r c3a4f4bb87f7 -r 49b062acace9 src/python_access/numpy_array.rs --- a/src/python_access/numpy_array.rs Wed Apr 22 22:32:00 2026 -0500 +++ b/src/python_access/numpy_array.rs Fri May 08 17:16:34 2026 -0500 @@ -5,7 +5,7 @@ use alg_tools::euclidean::wrap::{WrapGuard, WrapGuardMut, Wrapped}; use alg_tools::types::Float; use nalgebra::{DMatrix, DMatrixView, DMatrixViewMut, Dyn}; -use ndarray::{Dimension, Ix1, Ix2}; +use numpy::ndarray::{Dimension, Ix1, Ix2}; use numpy::{PyArray, PyArrayMethods, PyReadonlyArray, PyReadwriteArray, ToPyArray}; use pyo3::prelude::*;