Merge pull request #6429 from charris/remove-single-file-option

Remove single file option

30 files changed, 9 insertions, 194 deletions

diff --git a/.travis.yml b/.travis.yml
index 5d5c149b4..7074e7ada 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - 3.4
   - 3.5-dev
 matrix:
   include:
@@ -46,9 +47,7 @@ matrix:
             - python3-dev
             - python3-nose
     - python: 2.7
-      env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
-    - python: 3.4
-      env: NPY_RELAXED_STRIDES_CHECKING=0
+      env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 2.7
       env: USE_WHEEL=1
 before_install:
diff --git a/doc/release/1.11.0-notes.rst b/doc/release/1.11.0-notes.rst
index 891a67684..68ee370ee 100644
--- a/doc/release/1.11.0-notes.rst
+++ b/doc/release/1.11.0-notes.rst
@@ -10,8 +10,8 @@ Highlights
 
 Dropped Support:
 
-* Building with Bento is no longer supported and the associated files have
-  been removed.
+* Bento build support and related files have been removed.
+* Single file build support and related files have been removed.
 
 
 Future Changes:
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
index 84bd042f5..05166f1e5 100644
--- a/numpy/core/code_generators/genapi.py
+++ b/numpy/core/code_generators/genapi.py
@@ -311,11 +311,7 @@ class TypeApi(object):
 
     def internal_define(self):
         astr = """\
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
-    extern NPY_NO_EXPORT PyTypeObject %(type)s;
-#else
-    NPY_NO_EXPORT PyTypeObject %(type)s;
-#endif
+extern NPY_NO_EXPORT PyTypeObject %(type)s;
 """ % {'type': self.name}
         return astr
 
@@ -337,11 +333,7 @@ class GlobalVarApi(object):
 
     def internal_define(self):
         astr = """\
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
-    extern NPY_NO_EXPORT %(type)s %(name)s;
-#else
-    NPY_NO_EXPORT %(type)s %(name)s;
-#endif
+extern NPY_NO_EXPORT %(type)s %(name)s;
 """ % {'type': self.type, 'name': self.name}
         return astr
 
@@ -365,11 +357,7 @@ class BoolValuesApi(object):
 
     def internal_define(self):
         astr = """\
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyBoolScalarObject _PyArrayScalar_BoolValues[2];
-#else
-NPY_NO_EXPORT PyBoolScalarObject _PyArrayScalar_BoolValues[2];
-#endif
 """
         return astr
 
diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py
index 415cbf7fc..a97564fa4 100644
--- a/numpy/core/code_generators/generate_numpy_api.py
+++ b/numpy/core/code_generators/generate_numpy_api.py
@@ -17,15 +17,9 @@ typedef struct {
         npy_bool obval;
 } PyBoolScalarObject;
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyTypeObject PyArrayMapIter_Type;
 extern NPY_NO_EXPORT PyTypeObject PyArrayNeighborhoodIter_Type;
 extern NPY_NO_EXPORT PyBoolScalarObject _PyArrayScalar_BoolValues[2];
-#else
-NPY_NO_EXPORT PyTypeObject PyArrayMapIter_Type;
-NPY_NO_EXPORT PyTypeObject PyArrayNeighborhoodIter_Type;
-NPY_NO_EXPORT PyBoolScalarObject _PyArrayScalar_BoolValues[2];
-#endif
 
 %s
 
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py
index 7a33004e4..bb2ad7854 100644
--- a/numpy/core/code_generators/generate_ufunc_api.py
+++ b/numpy/core/code_generators/generate_ufunc_api.py
@@ -11,11 +11,7 @@ from genapi import \
 h_template = r"""
 #ifdef _UMATHMODULE
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyTypeObject PyUFunc_Type;
-#else
-NPY_NO_EXPORT PyTypeObject PyUFunc_Type;
-#endif
 
 %s
 
diff --git a/numpy/core/include/numpy/_numpyconfig.h.in b/numpy/core/include/numpy/_numpyconfig.h.in
index 20f21c1a7..0510ff9b2 100644
--- a/numpy/core/include/numpy/_numpyconfig.h.in
+++ b/numpy/core/include/numpy/_numpyconfig.h.in
@@ -29,7 +29,6 @@
 @DEFINE_NPY_SIZEOF_LONGLONG@
 @DEFINE_NPY_SIZEOF_PY_LONG_LONG@
 
-@DEFINE_NPY_ENABLE_SEPARATE_COMPILATION@
 @DEFINE_NPY_RELAXED_STRIDES_CHECKING@
 
 #define NPY_VISIBILITY_HIDDEN @VISIBILITY_HIDDEN@
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
index 8403ee29f..f1fe89f1a 100644
--- a/numpy/core/include/numpy/ndarraytypes.h
+++ b/numpy/core/include/numpy/ndarraytypes.h
@@ -6,11 +6,7 @@
 #include "npy_cpu.h"
 #include "utils.h"
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
-        #define NPY_NO_EXPORT NPY_VISIBILITY_HIDDEN
-#else
-        #define NPY_NO_EXPORT static
-#endif
+#define NPY_NO_EXPORT NPY_VISIBILITY_HIDDEN
 
 /* Only use thread if configured in config and python supports it */
 #if defined WITH_THREAD && !NPY_NO_SMP
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 361bf9082..aa9e03e06 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -15,8 +15,6 @@ from numpy._build_utils.apple_accelerate import (uses_accelerate_framework,
 
 from setup_common import *
 
-# Set to True to enable multiple file compilations (experimental)
-ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0")
 # Set to True to enable relaxed strides checking. This (mostly) means
 # that `strides[dim]` is ignored if `shape[dim] == 1` when setting flags.
 NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "1") != "0")
@@ -444,9 +442,6 @@ def configuration(parent_package='',top_path=None):
             else:
                 PYTHON_HAS_UNICODE_WIDE = False
 
-            if ENABLE_SEPARATE_COMPILATION:
-                moredefs.append(('ENABLE_SEPARATE_COMPILATION', 1))
-
             if NPY_RELAXED_STRIDES_CHECKING:
                 moredefs.append(('NPY_RELAXED_STRIDES_CHECKING', 1))
 
@@ -549,9 +544,6 @@ def configuration(parent_package='',top_path=None):
             moredefs.extend(cocache.check_ieee_macros(config_cmd)[1])
             moredefs.extend(cocache.check_complex(config_cmd, mathlibs)[1])
 
-            if ENABLE_SEPARATE_COMPILATION:
-                moredefs.append(('NPY_ENABLE_SEPARATE_COMPILATION', 1))
-
             if NPY_RELAXED_STRIDES_CHECKING:
                 moredefs.append(('NPY_RELAXED_STRIDES_CHECKING', 1))
 
@@ -850,11 +842,6 @@ def configuration(parent_package='',top_path=None):
     else:
         extra_info = {}
 
-    if not ENABLE_SEPARATE_COMPILATION:
-        multiarray_deps.extend(multiarray_src)
-        multiarray_src = [join('src', 'multiarray', 'multiarraymodule_onefile.c')]
-        multiarray_src.append(generate_multiarray_templated_sources)
-
     config.add_extension('multiarray',
                          sources=multiarray_src +
                                  [generate_config_h,
@@ -922,13 +909,6 @@ def configuration(parent_package='',top_path=None):
             join(codegen_dir, 'generate_ufunc_api.py'),
             join('src', 'private', 'ufunc_override.h')] + npymath_sources
 
-    if not ENABLE_SEPARATE_COMPILATION:
-        umath_deps.extend(umath_src)
-        umath_src = [join('src', 'umath', 'umathmodule_onefile.c')]
-        umath_src.append(generate_umath_templated_sources)
-        umath_src.append(join('src', 'umath', 'funcs.inc.src'))
-        umath_src.append(join('src', 'umath', 'simd.inc.src'))
-
     config.add_extension('umath',
                          sources=umath_src +
                                  [generate_config_h,
diff --git a/numpy/core/src/multiarray/_datetime.h b/numpy/core/src/multiarray/_datetime.h
index 8cfd5d851..46e1e453e 100644
--- a/numpy/core/src/multiarray/_datetime.h
+++ b/numpy/core/src/multiarray/_datetime.h
@@ -1,13 +1,8 @@
 #ifndef _NPY_PRIVATE__DATETIME_H_
 #define _NPY_PRIVATE__DATETIME_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT char *_datetime_strings[NPY_DATETIME_NUMUNITS];
 extern NPY_NO_EXPORT int _days_per_month_table[2][12];
-#else
-NPY_NO_EXPORT char *_datetime_strings[NPY_DATETIME_NUMUNITS];
-NPY_NO_EXPORT int _days_per_month_table[2][12];
-#endif
 
 NPY_NO_EXPORT void
 numpy_pydatetime_import(void);
diff --git a/numpy/core/src/multiarray/arraytypes.h b/numpy/core/src/multiarray/arraytypes.h
index 15520ce74..d1c16cdea 100644
--- a/numpy/core/src/multiarray/arraytypes.h
+++ b/numpy/core/src/multiarray/arraytypes.h
@@ -3,11 +3,9 @@
 
 #include "common.h"
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyArray_Descr LONGLONG_Descr;
 extern NPY_NO_EXPORT PyArray_Descr LONG_Descr;
 extern NPY_NO_EXPORT PyArray_Descr INT_Descr;
-#endif
 
 NPY_NO_EXPORT int
 set_typeinfo(PyObject *dict);
diff --git a/numpy/core/src/multiarray/buffer.h b/numpy/core/src/multiarray/buffer.h
index c0a1f8e26..d2ea01b34 100644
--- a/numpy/core/src/multiarray/buffer.h
+++ b/numpy/core/src/multiarray/buffer.h
@@ -1,11 +1,7 @@
 #ifndef _NPY_PRIVATE_BUFFER_H_
 #define _NPY_PRIVATE_BUFFER_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyBufferProcs array_as_buffer;
-#else
-NPY_NO_EXPORT PyBufferProcs array_as_buffer;
-#endif
 
 NPY_NO_EXPORT void
 _array_dealloc_buffer_info(PyArrayObject *self);
diff --git a/numpy/core/src/multiarray/conversion_utils.h b/numpy/core/src/multiarray/conversion_utils.h
index 59d3120a4..cd43f25c3 100644
--- a/numpy/core/src/multiarray/conversion_utils.h
+++ b/numpy/core/src/multiarray/conversion_utils.h
@@ -63,10 +63,6 @@ PyArray_ConvertMultiAxis(PyObject *axis_in, int ndim, npy_bool *out_axis_flags);
  * that it is in an unpickle context instead of a normal context without
  * evil global state like we create here.
  */
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT int evil_global_disable_warn_O4O8_flag;
-#else
-NPY_NO_EXPORT int evil_global_disable_warn_O4O8_flag;
-#endif
 
 #endif
diff --git a/numpy/core/src/multiarray/datetime_busdaycal.h b/numpy/core/src/multiarray/datetime_busdaycal.h
index 5d7325733..cd79d0bb5 100644
--- a/numpy/core/src/multiarray/datetime_busdaycal.h
+++ b/numpy/core/src/multiarray/datetime_busdaycal.h
@@ -26,11 +26,7 @@ typedef struct {
     npy_bool weekmask[7];
 } NpyBusDayCalendar;
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyTypeObject NpyBusDayCalendar_Type;
-#else
-NPY_NO_EXPORT PyTypeObject NpyBusDayCalendar_Type;
-#endif
 
 
 /*
diff --git a/numpy/core/src/multiarray/descriptor.h b/numpy/core/src/multiarray/descriptor.h
index 01a778954..ff1fc980a 100644
--- a/numpy/core/src/multiarray/descriptor.h
+++ b/numpy/core/src/multiarray/descriptor.h
@@ -36,8 +36,6 @@ NPY_NO_EXPORT PyObject *
 arraydescr_construction_repr(PyArray_Descr *dtype, int includealignflag,
                                 int shortrepr);
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT char *_datetime_strings[];
-#endif
 
 #endif
diff --git a/numpy/core/src/multiarray/getset.h b/numpy/core/src/multiarray/getset.h
index 98bd217f7..4f1209de5 100644
--- a/numpy/core/src/multiarray/getset.h
+++ b/numpy/core/src/multiarray/getset.h
@@ -1,8 +1,6 @@
 #ifndef _NPY_ARRAY_GETSET_H_
 #define _NPY_ARRAY_GETSET_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyGetSetDef array_getsetlist[];
-#endif
 
 #endif
diff --git a/numpy/core/src/multiarray/mapping.h b/numpy/core/src/multiarray/mapping.h
index 40ccabd62..4e22f79df 100644
--- a/numpy/core/src/multiarray/mapping.h
+++ b/numpy/core/src/multiarray/mapping.h
@@ -1,11 +1,7 @@
 #ifndef _NPY_ARRAYMAPPING_H_
 #define _NPY_ARRAYMAPPING_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyMappingMethods array_as_mapping;
-#else
-NPY_NO_EXPORT PyMappingMethods array_as_mapping;
-#endif
 
 
 /*
diff --git a/numpy/core/src/multiarray/methods.h b/numpy/core/src/multiarray/methods.h
index fc3b987fa..7bf87f42d 100644
--- a/numpy/core/src/multiarray/methods.h
+++ b/numpy/core/src/multiarray/methods.h
@@ -1,9 +1,7 @@
 #ifndef _NPY_ARRAY_METHODS_H_
 #define _NPY_ARRAY_METHODS_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyMethodDef array_methods[];
-#endif
 
 NPY_NO_EXPORT const char *
 npy_casting_to_string(NPY_CASTING casting);
diff --git a/numpy/core/src/multiarray/multiarraymodule_onefile.c b/numpy/core/src/multiarray/multiarraymodule_onefile.c
deleted file mode 100644
index 3924f3cf4..000000000
--- a/numpy/core/src/multiarray/multiarraymodule_onefile.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file includes all the .c files needed for a complete multiarray module.
- * This is used in the case where separate compilation is not enabled
- *
- * Note that the order of the includes matters
- */
-
-#include "common.c"
-
-#include "scalartypes.c"
-#include "scalarapi.c"
-
-#include "datetime.c"
-#include "datetime_strings.c"
-#include "datetime_busday.c"
-#include "datetime_busdaycal.c"
-#include "arraytypes.c"
-#include "vdot.c"
-
-#include "hashdescr.c"
-#include "numpyos.c"
-
-#include "descriptor.c"
-#include "flagsobject.c"
-#include "alloc.c"
-#include "ctors.c"
-#include "iterators.c"
-#include "mapping.c"
-#include "number.c"
-#include "getset.c"
-#include "sequence.c"
-#include "methods.c"
-#include "convert_datatype.c"
-#include "convert.c"
-#include "shape.c"
-#include "item_selection.c"
-#include "calculation.c"
-#include "usertypes.c"
-#include "refcount.c"
-#include "conversion_utils.c"
-#include "buffer.c"
-
-#include "nditer_constr.c"
-#include "nditer_api.c"
-#include "nditer_templ.c"
-#include "nditer_pywrap.c"
-#include "lowlevel_strided_loops.c"
-#include "dtype_transfer.c"
-#include "einsum.c"
-#include "array_assign.c"
-#include "array_assign_scalar.c"
-#include "array_assign_array.c"
-#include "ucsnarrow.c"
-#include "arrayobject.c"
-#include "numpymemoryview.c"
-#include "mem_overlap.c"
-#include "multiarraymodule.c"
-#include "compiled_base.c"
-
-#if defined(HAVE_CBLAS)
-#include "python_xerbla.c"
-#include "cblasfuncs.c"
-#endif
diff --git a/numpy/core/src/multiarray/number.h b/numpy/core/src/multiarray/number.h
index 43f04d1c6..0c8355e31 100644
--- a/numpy/core/src/multiarray/number.h
+++ b/numpy/core/src/multiarray/number.h
@@ -39,13 +39,8 @@ typedef struct {
     PyObject *conjugate;
 } NumericOps;
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT NumericOps n_ops;
 extern NPY_NO_EXPORT PyNumberMethods array_as_number;
-#else
-NPY_NO_EXPORT NumericOps n_ops;
-NPY_NO_EXPORT PyNumberMethods array_as_number;
-#endif
 
 NPY_NO_EXPORT PyObject *
 array_int(PyArrayObject *v);
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
index b5e0fde85..ee5741ae0 100644
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -3724,7 +3724,6 @@ NPY_NO_EXPORT PyTypeObject Py@NAME@ArrType_Type = {
 
 /**end repeat**/
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 /*
  * This table maps the built-in type numbers to their scalar
  * type numbers.  Note that signed integers are mapped to INTNEG_SCALAR,
@@ -3760,7 +3759,6 @@ _npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES];
  */
 NPY_NO_EXPORT signed char
 _npy_type_promotion_table[NPY_NTYPES][NPY_NTYPES];
-#endif
 
 NPY_NO_EXPORT void
 initialize_casting_tables(void)
diff --git a/numpy/core/src/multiarray/scalartypes.h b/numpy/core/src/multiarray/scalartypes.h
index c9b80f9b3..b8d6cf83e 100644
--- a/numpy/core/src/multiarray/scalartypes.h
+++ b/numpy/core/src/multiarray/scalartypes.h
@@ -2,7 +2,6 @@
 #define _NPY_SCALARTYPES_H_
 
 /* Internal look-up tables */
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT unsigned char
 _npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES];
 extern NPY_NO_EXPORT signed char
@@ -13,18 +12,6 @@ extern NPY_NO_EXPORT signed char
 _npy_smallest_type_of_kind_table[NPY_NSCALARKINDS];
 extern NPY_NO_EXPORT signed char
 _npy_next_larger_type_table[NPY_NTYPES];
-#else
-NPY_NO_EXPORT unsigned char
-_npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES];
-NPY_NO_EXPORT signed char
-_npy_scalar_kinds_table[NPY_NTYPES];
-NPY_NO_EXPORT signed char
-_npy_type_promotion_table[NPY_NTYPES][NPY_NTYPES];
-NPY_NO_EXPORT signed char
-_npy_smallest_type_of_kind_table[NPY_NSCALARKINDS];
-NPY_NO_EXPORT signed char
-_npy_next_larger_type_table[NPY_NTYPES];
-#endif
 
 NPY_NO_EXPORT void
 initialize_casting_tables(void);
diff --git a/numpy/core/src/multiarray/sequence.h b/numpy/core/src/multiarray/sequence.h
index 321c0200f..b28c50d97 100644
--- a/numpy/core/src/multiarray/sequence.h
+++ b/numpy/core/src/multiarray/sequence.h
@@ -1,10 +1,6 @@
 #ifndef _NPY_ARRAY_SEQUENCE_H_
 #define _NPY_ARRAY_SEQUENCE_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PySequenceMethods array_as_sequence;
-#else
-NPY_NO_EXPORT PySequenceMethods array_as_sequence;
-#endif
 
 #endif
diff --git a/numpy/core/src/multiarray/usertypes.h b/numpy/core/src/multiarray/usertypes.h
index 51f6a8720..b3e386c5c 100644
--- a/numpy/core/src/multiarray/usertypes.h
+++ b/numpy/core/src/multiarray/usertypes.h
@@ -1,11 +1,7 @@
 #ifndef _NPY_PRIVATE_USERTYPES_H_
 #define _NPY_PRIVATE_USERTYPES_H_
 
-#ifdef NPY_ENABLE_SEPARATE_COMPILATION
 extern NPY_NO_EXPORT PyArray_Descr **userdescrs;
-#else
-NPY_NO_EXPORT PyArray_Descr **userdescrs;
-#endif
 
 NPY_NO_EXPORT void
 PyArray_InitArrFuncs(PyArray_ArrFuncs *f);
diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src
index a46b9e7a8..854c1e17a 100644
--- a/numpy/core/src/umath/loops.c.src
+++ b/numpy/core/src/umath/loops.c.src
@@ -6,10 +6,8 @@
 #include "Python.h"
 
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 #define NO_IMPORT_ARRAY
-#endif
 
 #include "numpy/npy_common.h"
 #include "numpy/arrayobject.h"
diff --git a/numpy/core/src/umath/reduction.c b/numpy/core/src/umath/reduction.c
index bb4c0f44e..ecd387777 100644
--- a/numpy/core/src/umath/reduction.c
+++ b/numpy/core/src/umath/reduction.c
@@ -13,10 +13,8 @@
 #include <Python.h>
 
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 #define NO_IMPORT_ARRAY
-#endif
 
 #include <numpy/arrayobject.h>
 
diff --git a/numpy/core/src/umath/scalarmath.c.src b/numpy/core/src/umath/scalarmath.c.src
index 010261214..c371a079f 100644
--- a/numpy/core/src/umath/scalarmath.c.src
+++ b/numpy/core/src/umath/scalarmath.c.src
@@ -11,10 +11,9 @@
 
 #include "Python.h"
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 #define NO_IMPORT_ARRAY
-#endif
+
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
 #include "numpy/arrayscalars.h"
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 4bc9582b4..63ed4f492 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -29,10 +29,9 @@
 #include "Python.h"
 
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
+
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 #define NO_IMPORT_ARRAY
-#endif
 
 #include "npy_pycompat.h"
 
diff --git a/numpy/core/src/umath/ufunc_type_resolution.c b/numpy/core/src/umath/ufunc_type_resolution.c
index 6f4f4123d..ce9eec4b6 100644
--- a/numpy/core/src/umath/ufunc_type_resolution.c
+++ b/numpy/core/src/umath/ufunc_type_resolution.c
@@ -14,10 +14,8 @@
 #include "Python.h"
 
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 #define NO_IMPORT_ARRAY
-#endif
 
 #include "npy_pycompat.h"
 
diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c
index d19d5b9d2..45accb970 100644
--- a/numpy/core/src/umath/umathmodule.c
+++ b/numpy/core/src/umath/umathmodule.c
@@ -21,9 +21,7 @@
 #include "Python.h"
 
 #include "npy_config.h"
-#ifdef ENABLE_SEPARATE_COMPILATION
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
-#endif
 
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
diff --git a/numpy/core/src/umath/umathmodule_onefile.c b/numpy/core/src/umath/umathmodule_onefile.c
deleted file mode 100644
index 3661ad81a..000000000
--- a/numpy/core/src/umath/umathmodule_onefile.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "loops.c"
-#include "scalarmath.c"
-
-#include "ufunc_object.c"
-#include "ufunc_type_resolution.c"
-#include "reduction.c"
-#include "umathmodule.c"