fix tests

Author: mattcieslak

.github/workflows/ci.yml

@@ -27,10 +27,23 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
-      - name: cargo build (workspace)
-        run: cargo build --workspace --all-targets
+
+      # Build only the odx-rs core here. odx-py is a Python cdylib whose
+      # link step needs `-undefined dynamic_lookup` on macOS (configured in
+      # python/.cargo/config.toml, only visible when cargo runs from
+      # python/). The actual cdylib build happens in the python-tests job
+      # via maturin, which sets the right flags. We `cargo check` it here
+      # so Rust-level errors are still caught — `check` skips codegen and
+      # linking entirely.
+      - name: cargo build (odx-rs)
+        run: cargo build -p odx-rs --all-targets
+
+      - name: cargo check (odx-py)
+        run: cargo check -p odx-py
+
       - name: cargo test (odx-rs)
         run: cargo test -p odx-rs --lib
+
       - name: cargo test (integration)
         run: cargo test -p odx-rs --tests
 

src/descoteaux_sh.rs

@@ -818,7 +818,7 @@ mod tests {
         // produced silently-wrong peak amplitudes during pyAFQ aodf
         // import.
         let sh: Vec<f32> = (0..ncoeffs_for(4, true))
-            .map(|i| ((i as f32 * 0.137).sin() * 0.3 + (i as f32 * 0.21).cos() * 0.1))
+            .map(|i| (i as f32 * 0.137).sin() * 0.3 + (i as f32 * 0.21).cos() * 0.1)
             .collect();
 
         let test_dirs = [

src/formats/tortoise_mapmri.rs

@@ -552,6 +552,23 @@ fn robust_positive_percentile(values: &[f32], percentile: f32) -> f32 {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::path::PathBuf;
+
+    /// Returns the three Tortoise fixture paths if all three exist on disk,
+    /// else `None`. The fixtures live outside the repo (in a sibling
+    /// `test_data/` directory) and aren't checked in, so CI runners and
+    /// fresh clones won't have them — those test runs skip cleanly via the
+    /// `else { return; }` pattern in each test below.
+    fn tortoise_fixtures() -> Option<(PathBuf, PathBuf, PathBuf)> {
+        let coeff = PathBuf::from("../test_data/xx_mapmri.nii");
+        let tensor = PathBuf::from("../test_data/xx_L1_DT.nii");
+        let uvec = PathBuf::from("../test_data/xx_uvec.nii");
+        if coeff.exists() && tensor.exists() && uvec.exists() {
+            Some((coeff, tensor, uvec))
+        } else {
+            None
+        }
+    }
 
     #[test]
     fn infers_tortoise_radial_order_four_from_fixture_coeff_count() {
@@ -560,12 +577,16 @@ mod tests {
 
     #[test]
     fn real_fixture_selected_voxel_projects_to_finite_sh() {
+        let Some((coeff_path, tensor_path, uvec_path)) = tortoise_fixtures() else {
+            eprintln!("Tortoise fixtures not found at ../test_data/; skipping.");
+            return;
+        };
         let (coeff_dims, _, coeff_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_mapmri.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&coeff_path).unwrap();
         let (tensor_dims, _, tensor_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_L1_DT.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&tensor_path).unwrap();
         let (uvec_dims, _, uvec_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_uvec.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&uvec_path).unwrap();
         let (dims3, ncoeffs) = normalize_trailing_channels(
             &coeff_dims,
             Path::new("xx_mapmri.nii"),
@@ -607,10 +628,12 @@ mod tests {
 
     #[test]
     fn real_fixture_has_two_coeff_supported_zero_uvec_voxels() {
-        let (coeff_dims, _, coeff_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_mapmri.nii")).unwrap();
-        let (uvec_dims, _, uvec_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_uvec.nii")).unwrap();
+        let Some((coeff_path, _, uvec_path)) = tortoise_fixtures() else {
+            eprintln!("Tortoise fixtures not found at ../test_data/; skipping.");
+            return;
+        };
+        let (coeff_dims, _, coeff_data) = mrtrix::load_nifti_f32_volume(&coeff_path).unwrap();
+        let (uvec_dims, _, uvec_data) = mrtrix::load_nifti_f32_volume(&uvec_path).unwrap();
         let (dims3, ncoeffs) = normalize_trailing_channels(
             &coeff_dims,
             Path::new("xx_mapmri.nii"),
@@ -641,12 +664,16 @@ mod tests {
 
     #[test]
     fn fixture_tensor_export_order_produces_positive_eigenvalues() {
+        let Some((coeff_path, tensor_path, uvec_path)) = tortoise_fixtures() else {
+            eprintln!("Tortoise fixtures not found at ../test_data/; skipping.");
+            return;
+        };
         let (coeff_dims, _, coeff_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_mapmri.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&coeff_path).unwrap();
         let (tensor_dims, _, tensor_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_L1_DT.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&tensor_path).unwrap();
         let (uvec_dims, _, uvec_data) =
-            mrtrix::load_nifti_f32_volume(Path::new("../test_data/xx_uvec.nii")).unwrap();
+            mrtrix::load_nifti_f32_volume(&uvec_path).unwrap();
         let (dims3, ncoeffs) = normalize_trailing_channels(
             &coeff_dims,
             Path::new("xx_mapmri.nii"),