From e82a5dccf86bc679e40a36da3222b78bdd2b0224 Mon Sep 17 00:00:00 2001 From: Xin Zhang Date: Thu, 25 Nov 2021 08:53:38 +0800 Subject: [PATCH] fix sls install bug --- .../SpecDisperser/disperse_c/__init__.py | 8 +++--- setup.py | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py b/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py index 8cd2688..89127a0 100644 --- a/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py +++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py @@ -4,7 +4,7 @@ Cython """ -from . import disperse -from . import interp -#from .disperse import * -#from .interp import * +# from . import disperse +# from . import interp +from .disperse import * +from .interp import * diff --git a/setup.py b/setup.py index e750979..5162fa9 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,30 @@ from setuptools import setup, find_packages +from setuptools.extension import Extension +from setuptools.config import read_configuration + +from Cython.Build import cythonize + +import numpy + +extensions = [ + Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.interp", ["ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx"], + include_dirs = [numpy.get_include()], + libraries=["m"]), + + Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.disperse", ["ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx"], + include_dirs = [numpy.get_include()], + libraries=["m"]), +] + + +# setup( +# name = "slssim_disperse", +# ext_modules = cythonize(extensions), +# ) + + + setup(name='CSSTSim', version='0.3', packages=find_packages(), @@ -16,4 +41,5 @@ setup(name='CSSTSim', # 'Cython>=0.29.21' # 'numba>=0.50.1' # ] + ext_modules = cythonize(extensions), ) \ No newline at end of file -- GitLab