Fixing android aarch, non fp16 build.

LaurentMazare · Sep 18, 2023 · 8fd18af · 8fd18af
1 parent 32fb2c3
commit 8fd18af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/gemm-f16/src/gemm.rs b/gemm-f16/src/gemm.rs
@@ -1079,6 +1079,7 @@ pub mod f16 {
         }
 
         #[cfg(target_arch = "aarch64")]
+        #[cfg(target_feature = "fp16")]
         {
             if gemm_common::feature_detected!("neon") {
                 neon::gemm_basic
@@ -1087,6 +1088,12 @@ pub mod f16 {
             }
         }
 
+        #[cfg(target_arch = "aarch64")]
+        #[cfg(not(target_feature = "fp16"))]
+        {
+            scalar::gemm_basic
+        }
+
         #[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))]
         {
             scalar::gemm_basic
@@ -1147,6 +1154,7 @@ pub mod f16 {
     }
 
     #[cfg(target_arch = "aarch64")]
+    #[cfg(target_features = "fp16")]
     mod neon {
         use super::*;
         use crate::microkernel::neon::f16::{MR_DIV_N, NR, UKR};

diff --git a/gemm-f16/src/microkernel.rs b/gemm-f16/src/microkernel.rs
@@ -344,6 +344,7 @@ pub mod neon {
         }
     }
 
+    #[cfg(target_feature = "fp16")]
     pub mod f16 {
         use core::arch::{aarch64::uint16x8_t, asm};
         use core::mem::transmute;