Commit 38c68810 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

change package name to "csst_msc_sim", change version number to 3.0.0

parent 50a9f005
...@@ -16,7 +16,10 @@ from Cython.Build import cythonize ...@@ -16,7 +16,10 @@ from Cython.Build import cythonize
import numpy import numpy
class CTypes(Extension): pass
class CTypes(Extension):
pass
class build_ext(build_ext): class build_ext(build_ext):
...@@ -34,24 +37,29 @@ class build_ext(build_ext): ...@@ -34,24 +37,29 @@ class build_ext(build_ext):
return ext_name + '.so' return ext_name + '.so'
return super().get_ext_filename(ext_name) return super().get_ext_filename(ext_name)
extensions = [ extensions = [
Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.interp", ["ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx"], Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.interp", ["ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx"],
include_dirs = [numpy.get_include()], include_dirs=[numpy.get_include()],
libraries=["m"]), libraries=["m"]),
Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.disperse", ["ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx"], Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.disperse", ["ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx"],
include_dirs = [numpy.get_include()], include_dirs=[numpy.get_include()],
libraries=["m"]), libraries=["m"]),
] ]
df_module = [CTypes('ObservationSim.Instrument.Chip.libBF.libmoduleBF', df_module = [CTypes('ObservationSim.Instrument.Chip.libBF.libmoduleBF',
['ObservationSim/Instrument/Chip/libBF/diffusion_X1.c', 'ObservationSim/Instrument/Chip/libBF/nrutil.c'], ['ObservationSim/Instrument/Chip/libBF/diffusion_X1.c',
include_dirs=['ObservationSim/Instrument/Chip/libBF/', '/usr/include'] 'ObservationSim/Instrument/Chip/libBF/nrutil.c'],
)] include_dirs=[
'ObservationSim/Instrument/Chip/libBF/', '/usr/include']
)]
cti_module = [CTypes('ObservationSim.Instrument.Chip.libCTI.libmoduleCTI', cti_module = [CTypes('ObservationSim.Instrument.Chip.libCTI.libmoduleCTI',
['ObservationSim/Instrument/Chip/libCTI/src/add_CTI.c', 'ObservationSim/Instrument/Chip/libCTI/src/nrutil.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran1.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran2.c', 'ObservationSim/Instrument/Chip/libCTI/src/poidev.c', 'ObservationSim/Instrument/Chip/libCTI/src/gammln.c', 'ObservationSim/Instrument/Chip/libCTI/src/gasdev.c', 'ObservationSim/Instrument/Chip/libCTI/src/sort.c', 'ObservationSim/Instrument/Chip/libCTI/src/creattraps.c'], ['ObservationSim/Instrument/Chip/libCTI/src/add_CTI.c', 'ObservationSim/Instrument/Chip/libCTI/src/nrutil.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran1.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran2.c', 'ObservationSim/Instrument/Chip/libCTI/src/poidev.c',
include_dirs=['ObservationSim/Instrument/Chip/libCTI/src/', '/usr/include'] 'ObservationSim/Instrument/Chip/libCTI/src/gammln.c', 'ObservationSim/Instrument/Chip/libCTI/src/gasdev.c', 'ObservationSim/Instrument/Chip/libCTI/src/sort.c', 'ObservationSim/Instrument/Chip/libCTI/src/creattraps.c'],
)] include_dirs=[
'ObservationSim/Instrument/Chip/libCTI/src/', '/usr/include']
)]
# setup( # setup(
...@@ -67,8 +75,8 @@ with open("requirements.txt", "r") as f: ...@@ -67,8 +75,8 @@ with open("requirements.txt", "r") as f:
if not req.startswith("#") and req.__contains__("==") if not req.startswith("#") and req.__contains__("==")
] ]
setup(name='CSSTSim', setup(name='csst_msc_sim',
version='2.1.0', version='3.0.0',
packages=find_packages(), packages=find_packages(),
# install_requires=[ # install_requires=[
# # 'numpy>=1.18.5', # # 'numpy>=1.18.5',
...@@ -84,7 +92,7 @@ setup(name='CSSTSim', ...@@ -84,7 +92,7 @@ setup(name='CSSTSim',
# # 'numba>=0.50.1' # # 'numba>=0.50.1'
# ], # ],
package_data = { package_data={
'ObservationSim.Astrometry.lib': ['libshao.so'], 'ObservationSim.Astrometry.lib': ['libshao.so'],
'ObservationSim.Instrument.Chip.libBF': ['libmoduleBF.so'], 'ObservationSim.Instrument.Chip.libBF': ['libmoduleBF.so'],
'ObservationSim.Instrument.Chip.libCTI': ['libmoduleCTI.so'], 'ObservationSim.Instrument.Chip.libCTI': ['libmoduleCTI.so'],
...@@ -92,13 +100,13 @@ setup(name='CSSTSim', ...@@ -92,13 +100,13 @@ setup(name='CSSTSim',
'ObservationSim.MockObject.data.led': ['*.fits'], 'ObservationSim.MockObject.data.led': ['*.fits'],
'ObservationSim.Instrument.data': ['*.txt', '*.dat', '*.json'], 'ObservationSim.Instrument.data': ['*.txt', '*.dat', '*.json'],
'ObservationSim.Instrument.data.field_distortion': ['*.pickle'], 'ObservationSim.Instrument.data.field_distortion': ['*.pickle'],
'ObservationSim.Instrument.data.ccd': ['*.txt','*.json'], 'ObservationSim.Instrument.data.ccd': ['*.txt', '*.json'],
'ObservationSim.Instrument.data.filters': ['*.txt', '*.list', '*.dat'], 'ObservationSim.Instrument.data.filters': ['*.txt', '*.list', '*.dat'],
'ObservationSim.Instrument.data.throughputs': ['*.txt', '*.dat'], 'ObservationSim.Instrument.data.throughputs': ['*.txt', '*.dat'],
'ObservationSim.Instrument.data.sls_conf': ['*.conf', '*.fits'], 'ObservationSim.Instrument.data.sls_conf': ['*.conf', '*.fits'],
'ObservationSim.Instrument.data.flatCube': ['*.fits'], 'ObservationSim.Instrument.data.flatCube': ['*.fits'],
'Catalog.data': ['*.fits','*.so'], 'Catalog.data': ['*.fits', '*.so'],
'ObservationSim.Config.Header':['*.fits','*.lst'], 'ObservationSim.Config.Header': ['*.fits', '*.lst'],
'ObservationSim.Straylight.data': ['*.dat'], 'ObservationSim.Straylight.data': ['*.dat'],
'ObservationSim.Straylight.data.sky': ['*.dat'], 'ObservationSim.Straylight.data.sky': ['*.dat'],
'ObservationSim.Straylight.lib': ['*'], 'ObservationSim.Straylight.lib': ['*'],
...@@ -106,6 +114,6 @@ setup(name='CSSTSim', ...@@ -106,6 +114,6 @@ setup(name='CSSTSim',
python_requires=">=3.11", # Python版本要求 python_requires=">=3.11", # Python版本要求
install_requires=requirements, install_requires=requirements,
ext_modules = cythonize(extensions) + df_module + cti_module, ext_modules=cythonize(extensions) + df_module + cti_module,
cmdclass={'build_ext': build_ext} cmdclass={'build_ext': build_ext}
) )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment