Provide compatibility with distutils

Several renames have been made to certain compiler definitions that were used to determine the current target, as well as the macros in the dispatch configuration headers. These changes were necessary to allow for the modification of the prefix 'NPY_' in case this work is used outside of NumPy.
numpy · rgommers · Jul 16, 2023 · Jul 18, 2023 · Jul 18, 2023 · Jul 18, 2023
commit 9a139d3410130f00f6c44542982172b4295866f0
diff --git a/numpy/core/src/_simd/_simd.c b/numpy/core/src/_simd/_simd.c
@@ -85,9 +85,13 @@ PyMODINIT_FUNC PyInit__simd(void)
                 goto err;                                                      \
             }                                                                  \
         }
-
-    NPY__CPU_DISPATCH_CALL(NPY_CPU_HAVE, ATTACH_MODULE, MAKE_MSVC_HAPPY)
-    NPY__CPU_DISPATCH_BASELINE_CALL(ATTACH_BASELINE_MODULE, MAKE_MSVC_HAPPY)
+    #ifdef NPY__CPU_MESON_BUILD
+        NPY_MTARGETS_CONF_DISPATCH(NPY_CPU_HAVE, ATTACH_MODULE, MAKE_MSVC_HAPPY)
+        NPY_MTARGETS_CONF_BASELINE(ATTACH_BASELINE_MODULE, MAKE_MSVC_HAPPY)
+    #else
+        NPY__CPU_DISPATCH_CALL(NPY_CPU_HAVE, ATTACH_MODULE, MAKE_MSVC_HAPPY)
+        NPY__CPU_DISPATCH_BASELINE_CALL(ATTACH_BASELINE_MODULE, MAKE_MSVC_HAPPY)
+    #endif
     return m;
 err:
     Py_DECREF(m);

diff --git a/numpy/core/src/_simd/_simd.dispatch.c.src b/numpy/core/src/_simd/_simd.dispatch.c.src
@@ -919,7 +919,9 @@ NPY_CPU_DISPATCH_CURFX(simd_create_module)(void)
 {
     static struct PyModuleDef defs = {
         .m_base = PyModuleDef_HEAD_INIT,
-    #ifdef NPY__CPU_TARGET_CURRENT
+    #if defined(NPY_MTARGETS_CURRENT) // meson build
+        .m_name = "numpy.core._simd." NPY_TOSTRING(NPY_MTARGETS_CURRENT),
+    #elif defined(NPY__CPU_TARGET_CURRENT)
         .m_name = "numpy.core._simd." NPY_TOSTRING(NPY__CPU_TARGET_CURRENT),
     #else
         .m_name = "numpy.core._simd.baseline",

diff --git a/numpy/core/src/common/npy_cpu_dispatch.h b/numpy/core/src/common/npy_cpu_dispatch.h
@@ -43,6 +43,7 @@
         #endif
     #endif
 #endif // !NPY_DISABLE_OPTIMIZATION
+#ifndef NPY__CPU_MESON_BUILD
 /**
  * Macro NPY_CPU_DISPATCH_CURFX(NAME)
  *
@@ -261,5 +262,5 @@
     ((TESTED_FEATURES) ? (NPY_CAT(NPY_CAT(LEFT, _), TARGET_NAME) __VA_ARGS__) : (void) 0),
 #define NPY_CPU_DISPATCH_CALL_ALL_BASE_CB_(LEFT, ...) \
     ( LEFT __VA_ARGS__ )
-
+#endif // NPY__CPU_MESON_BUILD
 #endif  // NUMPY_CORE_SRC_COMMON_NPY_CPU_DISPATCH_H_