Skip to content

fix installation for users who don't already have numpy #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrofrog merged 1 commit into from
Jun 28, 2019
Merged

fix installation for users who don't already have numpy #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from setuptools import setup, Extension, find_packages
from distutils.command.sdist import sdist
from distutils.command.build_py import build_py
from distutils.command.build_ext import build_ext

from hyperion.testing.helper import HyperionTest
from hyperion.version import __version__, __dev__
Expand All @@ -35,31 +36,34 @@ def run(self):
if not self.unstable:
open(version_file, 'w').write(content)


class NumpyBuildExt(build_ext):
def run(self):
import numpy
self.include_dirs.append(numpy.get_include())
build_ext.run(self)


cmdclass = {}
cmdclass['build_py'] = build_py
cmdclass['test'] = HyperionTest
cmdclass['sdist'] = custom_sdist
cmdclass['build_ext'] = NumpyBuildExt

if 'egg_info' in sys.argv:

ext_modules = []

else:

from numpy import get_include as get_numpy_include
numpy_includes = get_numpy_include()

ext_modules = [Extension("hyperion.util._integrate_core",
['hyperion/util/_integrate_core.c'],
include_dirs=[numpy_includes],
extra_compile_args=['-Wno-error=declaration-after-statement']),
Extension("hyperion.util._interpolate_core",
['hyperion/util/_interpolate_core.c'],
include_dirs=[numpy_includes],
extra_compile_args=['-Wno-error=declaration-after-statement']),
Extension("hyperion.importers._discretize_sph",
['hyperion/importers/_discretize_sph.c'],
include_dirs=[numpy_includes],
extra_compile_args=['-Wno-error=declaration-after-statement']),
Extension("hyperion.grid._voronoi_core",
['hyperion/grid/_voronoi_core.c',
Expand All @@ -75,8 +79,7 @@ def run(self):
'hyperion/grid/voro++/v_compute.cc',
'hyperion/grid/voro++/wall.cc'],
extra_compile_args = ['-O2', '-Wno-error=declaration-after-statement'],
extra_link_args=['-lstdc++'],
include_dirs=[numpy_includes])]
extra_link_args=['-lstdc++'])]

scripts = ['hyperion', 'hyperion2fits']

Expand Down