update CI rustc, add arm

alecmocatta · Jul 15, 2020 · 6477391 · 6477391
1 parent 7b6d507
commit 6477391
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,8 +13,8 @@ jobs:
   parameters:
     endpoint: alecmocatta
     default:
-      rust_toolchain: nightly-2020-06-10
-      rust_lint_toolchain: nightly-2020-06-10
+      rust_toolchain: stable nightly
+      rust_lint_toolchain: nightly-2020-07-12
       rust_flags: ''
       rust_features: ''
       rust_target_check: ''
@@ -29,4 +29,4 @@ jobs:
         rust_target_run: 'x86_64-apple-darwin'
       linux:
         imageName: 'ubuntu-latest'
-        rust_target_run: 'x86_64-unknown-linux-gnu i686-unknown-linux-gnu x86_64-unknown-linux-musl i686-unknown-linux-musl'
+        rust_target_run: 'x86_64-unknown-linux-gnu i686-unknown-linux-gnu x86_64-unknown-linux-musl i686-unknown-linux-musl aarch64-unknown-linux-gnu aarch64-unknown-linux-musl'
diff --git a/src/distinct.rs b/src/distinct.rs
@@ -214,7 +214,7 @@ where
 		assert_eq!(src.alpha, self.alpha);
 		assert_eq!(src.p, self.p);
 		assert_eq!(src.m.len(), self.m.len());
-		#[cfg(feature = "packed_simd")]
+		#[cfg(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64")))]
 		{
 			assert_eq!(self.m.len() % u8s::lanes(), 0); // TODO: high error rate can trigger this
 			assert_eq!(u8s::lanes(), f32s::lanes() * 4);
@@ -246,7 +246,7 @@ where
 			// https://github.com/AdamNiederer/faster/issues/37
 			// (src.m.simd_iter(faster::u8s(0)),self.m.simd_iter_mut(faster::u8s(0))).zip()
 		}
-		#[cfg(not(feature = "packed_simd"))]
+		#[cfg(not(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64"))))]
 		{
 			let mut zero = 0;
 			let mut sum = 0.0;
@@ -267,7 +267,7 @@ where
 		assert_eq!(src.alpha, self.alpha);
 		assert_eq!(src.p, self.p);
 		assert_eq!(src.m.len(), self.m.len());
-		#[cfg(feature = "packed_simd")]
+		#[cfg(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64")))]
 		{
 			assert_eq!(self.m.len() % u8s::lanes(), 0);
 			assert_eq!(u8s::lanes(), f32s::lanes() * 4);
@@ -297,7 +297,7 @@ where
 			self.zero = usize::try_from(zero.wrapping_sum()).unwrap();
 			self.sum = f64::from(sum.sum());
 		}
-		#[cfg(not(feature = "packed_simd"))]
+		#[cfg(not(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64"))))]
 		{
 			let mut zero = 0;
 			let mut sum = 0.0;
@@ -457,7 +457,7 @@ impl<V: ?Sized> IntersectPlusUnionIsPlus for HyperLogLog<V> {
 	const VAL: bool = true;
 }
 
-#[cfg(feature = "packed_simd")]
+#[cfg(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64")))]
 mod simd {
 	pub use packed_simd::{self, Cast, FromBits, IntoBits};
 	use std::marker::PhantomData;
@@ -560,7 +560,7 @@ mod simd {
 		}
 	}
 }
-#[cfg(feature = "packed_simd")]
+#[cfg(all(feature = "packed_simd", any(target_arch = "x86", target_arch = "x86_64")))]
 use simd::{f32s, u32s, u8s, u8s_sad_out, u8sq, Cast, FromBits, IntoBits, Sad};
 
 #[cfg(test)]