diff options
| -rw-r--r-- | numpy/core/include/numpy/random/bitgen.h (renamed from numpy/random/src/bitgen.h) | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | numpy/random/common.pxd | 2 | ||||
| -rw-r--r-- | numpy/random/setup.py | 1 | ||||
| -rw-r--r-- | numpy/random/src/distributions/distributions.h | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/numpy/random/src/bitgen.h b/numpy/core/include/numpy/random/bitgen.h index 9ebc15346..0adaaf2ee 100644 --- a/numpy/random/src/bitgen.h +++ b/numpy/core/include/numpy/random/bitgen.h @@ -6,6 +6,8 @@ #include <stdbool.h> #include <stdint.h> +/* Must match the declaration in numpy/random/common.pxd */ + typedef struct bitgen { void *state; uint64_t (*next_uint64)(void *st); diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 1a9c8410c..338502791 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -610,7 +610,7 @@ def configuration(parent_package='',top_path=None): config.add_include_dirs(join(local_dir, "src")) config.add_include_dirs(join(local_dir)) - config.add_data_files('include/numpy/*.h') + config.add_data_dir('include/numpy') config.add_include_dirs(join('src', 'npymath')) config.add_include_dirs(join('src', 'multiarray')) config.add_include_dirs(join('src', 'umath')) diff --git a/numpy/random/common.pxd b/numpy/random/common.pxd index ac0a94bb0..2f7baa06e 100644 --- a/numpy/random/common.pxd +++ b/numpy/random/common.pxd @@ -5,7 +5,7 @@ from libc.stdint cimport (uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t) from libc.math cimport sqrt -cdef extern from "src/bitgen.h": +cdef extern from "numpy/random/bitgen.h": struct bitgen: void *state uint64_t (*next_uint64)(void *st) nogil diff --git a/numpy/random/setup.py b/numpy/random/setup.py index 3bfeeaca1..378184d3b 100644 --- a/numpy/random/setup.py +++ b/numpy/random/setup.py @@ -36,7 +36,6 @@ def configuration(parent_package='', top_path=None): config.add_data_dir('tests') config.add_data_files('common.pxd') config.add_data_files('bit_generator.pxd') - config.add_data_files('src/bitgen.h') EXTRA_LINK_ARGS = [] # Math lib diff --git a/numpy/random/src/distributions/distributions.h b/numpy/random/src/distributions/distributions.h index 03b8ec371..c8cdfd20f 100644 --- a/numpy/random/src/distributions/distributions.h +++ b/numpy/random/src/distributions/distributions.h @@ -9,7 +9,7 @@ #include "Python.h" #include "numpy/npy_common.h" #include "numpy/npy_math.h" -#include "src/bitgen.h" +#include "numpy/random/bitgen.h" /* * RAND_INT_TYPE is used to share integer generators with RandomState which |