Merge branch 'master' into blis-msrv

Author: akern40

.github/workflows/ci.yaml

@@ -100,6 +100,17 @@ jobs:
         run: sudo apt-get install libopenblas-dev gfortran
       - run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0
 
+  miri:
+    runs-on: ubuntu-latest
+    name: miri
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: miri
+      - uses: Swatinem/rust-cache@v2
+      - run: ./scripts/miri-tests.sh
+
   cross_test:
     #if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
@@ -161,6 +172,7 @@ jobs:
       - format  # should format be required?
       - nostd
       - tests
+      - miri
       - cross_test
       - cargo-careful
       - docs

crates/serialization-tests/tests/serialize.rs

@@ -45,13 +45,13 @@ fn serial_many_dim_serde()
 
     {
         // Test a sliced array.
-        let mut a = ArcArray::linspace(0., 31., 32)
+        let mut a = ArcArray::from_iter(0..32)
             .into_shape_with_order((2, 2, 2, 4))
             .unwrap();
         a.slice_collapse(s![..;-1, .., .., ..2]);
         let serial = serde_json::to_string(&a).unwrap();
         println!("Encode {:?} => {:?}", a, serial);
-        let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
+        let res = serde_json::from_str::<ArcArray<i32, _>>(&serial);
         println!("{:?}", res);
         assert_eq!(a, res.unwrap());
     }
@@ -160,7 +160,7 @@ fn serial_many_dim_serde_msgpack()
 
     {
         // Test a sliced array.
-        let mut a = ArcArray::linspace(0., 31., 32)
+        let mut a = ArcArray::from_iter(0..32)
             .into_shape_with_order((2, 2, 2, 4))
             .unwrap();
         a.slice_collapse(s![..;-1, .., .., ..2]);
@@ -171,7 +171,7 @@ fn serial_many_dim_serde_msgpack()
             .unwrap();
 
         let mut deserializer = rmp_serde::Deserializer::new(&buf[..]);
-        let a_de: ArcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
+        let a_de: ArcArray<i32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
 
         assert_eq!(a, a_de);
     }
@@ -215,14 +215,14 @@ fn serial_many_dim_ron()
 
     {
         // Test a sliced array.
-        let mut a = ArcArray::linspace(0., 31., 32)
+        let mut a = ArcArray::from_iter(0..32)
             .into_shape_with_order((2, 2, 2, 4))
             .unwrap();
         a.slice_collapse(s![..;-1, .., .., ..2]);
 
         let a_s = ron_serialize(&a).unwrap();
 
-        let a_de: ArcArray<f32, _> = ron_deserialize(&a_s).unwrap();
+        let a_de: ArcArray<i32, _> = ron_deserialize(&a_s).unwrap();
 
         assert_eq!(a, a_de);
     }

ndarray-rand/tests/tests.rs

@@ -57,6 +57,7 @@ fn oversampling_without_replacement_should_panic()
 }
 
 quickcheck! {
+    #[cfg_attr(miri, ignore)] // Takes an insufferably long time
     fn oversampling_with_replacement_is_fine(m: u8, n: u8) -> TestResult {
         let (m, n) = (m as usize, n as usize);
         let a = Array::random((m, n), Uniform::new(0., 2.));
@@ -86,6 +87,7 @@ quickcheck! {
 
 #[cfg(feature = "quickcheck")]
 quickcheck! {
+    #[cfg_attr(miri, ignore)] // This takes *forever* with Miri
     fn sampling_behaves_as_expected(m: u8, n: u8, strategy: SamplingStrategy) -> TestResult {
         let (m, n) = (m as usize, n as usize);
         let a = Array::random((m, n), Uniform::new(0., 2.));

scripts/all-tests.sh

@@ -13,6 +13,8 @@ cargo build -v --no-default-features
 
 # ndarray with no features
 cargo test -p ndarray -v --no-default-features
+# ndarray with no_std-compatible features
+cargo test -p ndarray -v --no-default-features --features approx
 # all with features
 cargo test -v --features "$FEATURES" $QC_FEAT
 # all with features and release (ignore test crates which is already optimized)

scripts/miri-tests.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -x
+set -e
+
+# We rely on layout-dependent casts, which should be covered with #[repr(transparent)]
+# This should catch if we missed that
+RUSTFLAGS="-Zrandomize-layout"
+
+# Miri reports a stacked borrow violation deep within rayon, in a crate called crossbeam-epoch
+# The crate has a PR to fix this: https://github.com/crossbeam-rs/crossbeam/pull/871
+# but using Miri's tree borrow mode may resolve it for now.
+# Disabled until we can figure out a different rayon issue: https://github.com/rust-lang/miri/issues/1371
+# MIRIFLAGS="-Zmiri-tree-borrows"
+
+# General tests
+# Note that we exclude blas feature because Miri can't do cblas_gemm
+cargo miri test -v -p ndarray -p ndarray-rand --features approx,serde

src/dimension/mod.rs

@@ -1020,6 +1020,7 @@ mod test
     }
 
     quickcheck! {
+        #[cfg_attr(miri, ignore)] // Very slow on CI/CD machines
         // FIXME: This test is extremely slow, even with i16 values, investigate
         fn arith_seq_intersect_correct(
             first1: i8, len1: i8, step1: i8,

tests/array.rs

@@ -2629,6 +2629,7 @@ mod array_cow_tests
         });
     }
 
+    #[cfg_attr(miri, ignore)] // Very slow on CI/CD machines
     #[test]
     fn test_clone_from()
     {

tests/azip.rs

@@ -216,7 +216,7 @@ fn test_azip2_sum()
 }
 
 #[test]
-#[cfg(feature = "approx")]
+#[cfg(all(feature = "approx", feature = "std"))]
 fn test_azip3_slices()
 {
     use approx::assert_abs_diff_eq;
@@ -232,7 +232,7 @@ fn test_azip3_slices()
         *a += b / 10.;
         *c = a.sin();
     });
-    let res = Array::linspace(0., 3.1, 32).mapv_into(f32::sin);
+    let res = Array::from_iter(0..32).mapv(|x| f32::sin(x as f32 / 10.));
     assert_abs_diff_eq!(res, ArrayView::from(&c), epsilon = 1e-4);
 }
 

tests/dimension.rs

@@ -323,6 +323,7 @@ fn test_array_view()
 }
 
 #[test]
+#[cfg_attr(miri, ignore)] // Very slow on CI/CD machines
 #[cfg(feature = "std")]
 #[allow(clippy::cognitive_complexity)]
 fn test_all_ndindex()

tests/iterators.rs

@@ -971,6 +971,7 @@ fn test_into_iter_2d()
     assert_eq!(v, [1, 3, 2, 4]);
 }
 
+#[cfg_attr(miri, ignore)] // Very slow on CI/CD machines
 #[test]
 fn test_into_iter_sliced()
 {