STY: create include directory for headers

Author: qwhelan

bottleneck/src/bottleneck.h renamed to bottleneck/include/bottleneck.h

@@ -42,7 +42,7 @@
     #define PyString_InternFromString PyUnicode_InternFromString
 #endif
 
-#define VARKEY              METH_VARARGS | METH_KEYWORDS
+#define VARKEY              (((unsigned)METH_VARARGS) | ((unsigned)METH_KEYWORDS))
 #define error_converting(x) (((x) == -1) && PyErr_Occurred())
 
 #define VALUE_ERR(text)   PyErr_SetString(PyExc_ValueError, text)

bottleneck/src/iterators.h renamed to bottleneck/include/iterators.h

@@ -35,8 +35,7 @@ struct _iter {
 };
 typedef struct _iter iter;
 
-static inline void
-init_iter_one(iter *it, PyArrayObject *a, int axis) {
+static inline void init_iter_one(iter *it, PyArrayObject *a, int axis) {
     const int       ndim = PyArray_NDIM(a);
     const npy_intp *shape = PyArray_SHAPE(a);
     const npy_intp *strides = PyArray_STRIDES(a);
@@ -89,8 +88,8 @@ init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder) {
     it->a_ravel = NULL;
 
     /* The fix for relaxed strides checking in numpy and the fix for
-     * issue #183 has left this if..else tree in need of a refactor from the
-     * the ground up */
+   * issue #183 has left this if..else tree in need of a refactor from the
+   * the ground up */
     if (ndim == 1) {
         it->ndim_m2 = -1;
         it->length = shape[0];
@@ -101,14 +100,14 @@ init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder) {
         it->astride = 0;
     } else if (C_CONTIGUOUS(a) && !F_CONTIGUOUS(a)) {
         /* The &&! in the next two else ifs is to deal with relaxed
-         * stride checking introduced in numpy 1.12.0; see gh #161 */
+     * stride checking introduced in numpy 1.12.0; see gh #161 */
         it->ndim_m2 = -1;
         it->axis = ndim - 1;
         it->length = PyArray_SIZE(a);
         it->astride = 0;
         for (i = ndim - 1; i > -1; i--) {
             /* protect against length zero  strides such as in
-             * np.ones((2, 2))[..., np.newaxis] */
+       * np.ones((2, 2))[..., np.newaxis] */
             if (strides[i] == 0) {
                 continue;
             }
@@ -122,7 +121,7 @@ init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder) {
             it->astride = 0;
             for (i = 0; i < ndim; i++) {
                 /* protect against length zero  strides such as in
-                 * np.ones((2, 2), order='F')[np.newaxis, ...] */
+         * np.ones((2, 2), order='F')[np.newaxis, ...] */
                 if (strides[i] == 0) {
                     continue;
                 }

bottleneck/src/bn_config.py

@@ -149,7 +149,7 @@ def check_gcc_intrinsic(cmd: Config, intrinsic: str, value: str) -> bool:
 
 def create_config_h(config: Config) -> None:
     dirname = os.path.dirname(__file__)
-    config_h = os.path.join(dirname, "bn_config.h")
+    config_h = os.path.join(dirname, "../include", "bn_config.h")
 
     if (
         os.path.exists(config_h)

setup.py

@@ -47,7 +47,7 @@ def initialize_options(self) -> None:
                     if os.path.exists(generated_file):
                         self.delete_files.append(generated_file)
 
-        config_h = "bottleneck/src/bn_config.h"
+        config_h = "bottleneck/include/bn_config.h"
         if os.path.exists(config_h):
             self.delete_files.append(config_h)
 
@@ -81,6 +81,7 @@ def finalize_options(self) -> None:
         # place numpy includes first, see gh #156
         self.include_dirs.insert(0, numpy.get_include())
         self.include_dirs.append("bottleneck/src")
+        self.include_dirs.append("bottleneck/include")
 
     def build_extensions(self) -> None:
         from bn_template import make_c_files
@@ -125,9 +126,9 @@ def get_cpu_arch_flags() -> List[str]:
 
 def prepare_modules() -> List[Extension]:
     base_includes = [
-        "bottleneck/src/bottleneck.h",
-        "bottleneck/src/bn_config.h",
-        "bottleneck/src/iterators.h",
+        "bottleneck/include/bottleneck.h",
+        "bottleneck/include/bn_config.h",
+        "bottleneck/include/iterators.h",
     ]
 
     arch_flags = get_cpu_arch_flags()