BUG: Must fix PyArray_RUNTIME_VERSION backport logic

seberg · seberg · commit 3a365b647fa0 · 2023-11-15T11:50:57.000+01:00
diff --git a/numpy/_core/include/numpy/npy_2_compat.h b/numpy/_core/include/numpy/npy_2_compat.h
@@ -32,14 +32,15 @@
 
 /*
  * Allow users to use `PyArray_RUNTIME_VERSION` when vendoring the file for
- * compilation with NumPy 1.x
+ * compilation with NumPy 1.x.
+ * Simply do not define when compiling with 2.x.  It must be defined later
+ * as it is set during `import_array()`.
  */
-#ifndef PyArray_RUNTIME_VERSION
-  /* IF we are compiling with NumPy 2, something is wrong: */
-  #if NPY_ABI_VERSION >= 0x02000000
-    #error "PyArray_RUNTIME_VERSION not defined, but `npy_2_compat.h` included"
-  #endif
-  /* Just hardcode it to the NPY_FEATURE_VERSION */
+#if !defined(PyArray_RUNTIME_VERSION) && NPY_ABI_VERSION < 0x02000000
+  /*
+   * If we are compiling with NumPy 1.x, PyArray_RUNTIME_VERSION so we
+   * pretend the `PyArray_RUNTIME_VERSION` is `NPY_FEATURE_VERSION`.
+   */
   #define PyArray_RUNTIME_VERSION NPY_FEATURE_VERSION
 #endif
 
