From 701d260fa687698ac56fd625973ef2005eb8a5cd Mon Sep 17 00:00:00 2001 From: geo-ant <54497890+geo-ant@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:47:57 +0200 Subject: [PATCH] rayon parallel feature w/o nightly features on old compilers --- .github/workflows/nalgebra-ci-build.yml | 2 +- Cargo.toml | 2 +- tests/lib.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nalgebra-ci-build.yml b/.github/workflows/nalgebra-ci-build.yml index d7027127..467a3090 100644 --- a/.github/workflows/nalgebra-ci-build.yml +++ b/.github/workflows/nalgebra-ci-build.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: test - run: cargo test --features arbitrary,rand,serde-serialize,sparse,debug,io,compare,libm,proptest-support,slow-tests,rkyv-safe-deser,rayon; + run: cargo test --features arbitrary,rand,serde-serialize,sparse,debug,io,compare,libm,proptest-support,slow-tests,rkyv-safe-deser,rayon-par; test-nalgebra-glm: runs-on: ubuntu-latest steps: diff --git a/Cargo.toml b/Cargo.toml index 7e7df5b4..ff3407fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ libm = [ "simba/libm" ] libm-force = [ "simba/libm_force" ] macros = [ "nalgebra-macros" ] cuda = [ "cust_core", "simba/cuda" ] -rayon = [ "std", "dep:rayon" ] +rayon-par = [ "std", "rayon" ] # Conversion convert-mint = [ "mint" ] diff --git a/tests/lib.rs b/tests/lib.rs index fb13b3ae..49384d8a 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -10,8 +10,8 @@ compile_error!( ); // make sure to test the parallel iterators for all builds that do not require no_std -#[cfg(all(feature = "std", not(feature = "rayon")))] -compile_error!("Please additionally enable the `rayon` feature to compile and run the tests"); +#[cfg(all(feature = "std", not(feature = "rayon-par")))] +compile_error!("Please additionally enable the `rayon-par` feature to compile and run the tests"); #[cfg(all(feature = "debug", feature = "compare", feature = "rand"))] #[macro_use]