diff options
| -rw-r--r-- | numpy/distutils/misc_util.py | 9 | ||||
| -rw-r--r-- | numpy/lib/utils.py | 19 |
2 files changed, 13 insertions, 15 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 456363ecb..fad34e712 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1372,14 +1372,7 @@ def get_numpy_include_dirs(): include_dirs = Configuration.numpy_include_dirs[:] if not include_dirs: import numpy - if numpy.show_config is None: - # running from numpy_core source directory - include_dirs.append(njoin(os.path.dirname(numpy.__file__), - 'core', 'include')) - else: - # using installed numpy core headers - import numpy.core as core - include_dirs.append(njoin(os.path.dirname(core.__file__), 'include')) + include_dirs = [ numpy.get_include() ] # else running numpy/core/setup.py return include_dirs diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index 743985250..3e74da8d0 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -1,3 +1,4 @@ +import os import sys import inspect import types @@ -40,10 +41,15 @@ def get_include(): Extension('extension_name', ... include_dirs=[numpy.get_include()]) """ - from numpy.distutils.misc_util import get_numpy_include_dirs - include_dirs = get_numpy_include_dirs() - assert len(include_dirs)==1,`include_dirs` - return include_dirs[0] + import numpy + if numpy.show_config is None: + # running from numpy source directory + d = os.path.join(os.path.dirname(numpy.__file__), 'core', 'include') + else: + # using installed numpy core headers + import numpy.core as core + d = os.path.join(os.path.dirname(core.__file__), 'include') + return d def get_numarray_include(type=None): """Return the directory in the package that contains the numpy/*.h header @@ -54,15 +60,14 @@ def get_numarray_include(type=None): import numpy Extension('extension_name', ... - include_dirs=[numpy.get_include()]) + include_dirs=[numpy.get_numarray_include()]) """ from numpy.numarray import get_numarray_include_dirs - from numpy.distutils.misc_util import get_numpy_include_dirs include_dirs = get_numarray_include_dirs() if type is None: return include_dirs[0] else: - return include_dirs + get_numpy_include_dirs() + return include_dirs + [get_include()] if sys.version_info < (2, 4): |