Revert back to NPY_SIMD_FMA3

Raghuveer Devulapalli · Raghuveer Devulapalli · commit 2983386814ce · 2024-06-20T08:51:42.000-07:00
diff --git a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp
@@ -30,7 +30,7 @@ namespace hn = hwy::HWY_NAMESPACE;
  * elements or when there's no native FUSED support instead of fallback to libc
  */
 
-#if HWY_NATIVE_FMA  // native support
+#if NPY_SIMD_FMA3  // native support
 typedef enum
 {
     SIMD_COMPUTE_SIN,
@@ -192,7 +192,7 @@ simd_sincos_f32(const float *src, npy_intp ssrc, float *dst, npy_intp sdst,
     npyv_cleanup();
     }
 }
-#endif // HWY_NATIVE_FMA
+#endif // NPY_SIMD_FMA3
 
 /* Disable SIMD code sin/cos f64 and revert to libm: see
  * https://mail.python.org/archives/list/numpy-discussion@python.org/thread/C6EYZZSR4EWGVKHAZXLE7IBILRMNVK7L/
@@ -213,7 +213,7 @@ DISPATCH_DOUBLE_FUNC(cos)
 NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_sin)
 (char **args, npy_intp const *dimensions, npy_intp const *steps, void *NPY_UNUSED(data))
 {
-#if HWY_NATIVE_FMA
+#if NPY_SIMD_FMA3
     const npy_float *src = (npy_float*)args[0];
           npy_float *dst = (npy_float*)args[1];
 
@@ -242,7 +242,7 @@ NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_sin)
 NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_cos)
 (char **args, npy_intp const *dimensions, npy_intp const *steps, void *NPY_UNUSED(data))
 {
-#if HWY_NATIVE_FMA
+#if NPY_SIMD_FMA3
     const npy_float *src = (npy_float*)args[0];
           npy_float *dst = (npy_float*)args[1];
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace hn = hwy::HWY_NAMESPACE;`
`30`	`30`	`* elements or when there's no native FUSED support instead of fallback to libc`
`31`	`31`	`*/`
`32`	`32`
`33`		`-#if HWY_NATIVE_FMA // native support`
	`33`	`+#if NPY_SIMD_FMA3 // native support`
`34`	`34`	`typedef enum`
`35`	`35`	`{`
`36`	`36`	`SIMD_COMPUTE_SIN,`
`@@ -192,7 +192,7 @@ simd_sincos_f32(const float src, npy_intp ssrc, float dst, npy_intp sdst,`
`192`	`192`	`npyv_cleanup();`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`-#endif // HWY_NATIVE_FMA`
	`195`	`+#endif // NPY_SIMD_FMA3`
`196`	`196`
`197`	`197`	`/* Disable SIMD code sin/cos f64 and revert to libm: see`
`198`	`198`	`* https://mail.python.org/archives/list/[email protected]/thread/C6EYZZSR4EWGVKHAZXLE7IBILRMNVK7L/`
`@@ -213,7 +213,7 @@ DISPATCH_DOUBLE_FUNC(cos)`
`213`	`213`	`NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_sin)`
`214`	`214`	`(char *args, npy_intp const dimensions, npy_intp const steps, void NPY_UNUSED(data))`
`215`	`215`	`{`
`216`		`-#if HWY_NATIVE_FMA`
	`216`	`+#if NPY_SIMD_FMA3`
`217`	`217`	`const npy_float src = (npy_float)args[0];`
`218`	`218`	`npy_float dst = (npy_float)args[1];`
`219`	`219`
`@@ -242,7 +242,7 @@ NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_sin)`
`242`	`242`	`NPY_NO_EXPORT void NPY_CPU_DISPATCH_CURFX(FLOAT_cos)`
`243`	`243`	`(char *args, npy_intp const dimensions, npy_intp const steps, void NPY_UNUSED(data))`
`244`	`244`	`{`
`245`		`-#if HWY_NATIVE_FMA`
	`245`	`+#if NPY_SIMD_FMA3`
`246`	`246`	`const npy_float src = (npy_float)args[0];`
`247`	`247`	`npy_float dst = (npy_float)args[1];`
`248`	`248`