guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/glavaux/cosmotool

Browse Source
This commit is contained in:
LAVAUX Guilhem 2020-04-28 21:08:42 +02:00
commit b73fc74ee4
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/CMakeLists.txt
View File

@ -50,11 +50,11 @@ if(APPLE)
set(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup") set(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup")
endif() endif()
target_link_libraries(_cosmotool ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_cosmotool PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES})
target_link_libraries(_cosmo_power ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_cosmo_power PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES})
target_link_libraries(_cosmo_cic ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_cosmo_cic PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES})
target_link_libraries(_project ) target_link_libraries(_project )
target_link_libraries(_fast_interp ${CosmoTool_local} ) target_link_libraries(_fast_interp PRIVATE ${CosmoTool_local} )
SET(ct_TARGETS _cosmotool _project _cosmo_power _cosmo_cic _fast_interp ) SET(ct_TARGETS _cosmotool _project _cosmo_power _cosmo_cic _fast_interp )

2
python/_cosmo_power.pyx
View File

@ -81,7 +81,7 @@ cdef class CosmologyPower:
if 'ns' in cosmo: if 'ns' in cosmo:
self.power.n = cosmo['ns'] self.power.n = cosmo['ns']
if 'T27' in cosmo: if 'T27' in cosmo:
self.power.THETA_27 = cosmo['T27'] self.power.Theta_27 = cosmo['T27']
assert self.power.OMEGA_C > 0 assert self.power.OMEGA_C > 0

1
python/dummy.c Normal file
View File

@ -0,0 +1 @@
static void dummyFunc() {}

4
setup.py
View File

@ -21,7 +21,7 @@ class CMakeExtension(Extension):
doesn't try to build your sources for you doesn't try to build your sources for you
""" """
def __init__(self, name, sources=[]): def __init__(self, name, sources=["python/dummy.c"]):
super().__init__(name = name, sources = sources) super().__init__(name = name, sources = sources)
@ -218,7 +218,7 @@ class BuildCMakeExt(build_ext):
CosmoTool_extension = CMakeExtension(name="cosmotool") CosmoTool_extension = CMakeExtension(name="cosmotool")
setup(name='cosmotool', setup(name='cosmotool',
version='1.0.0a2', version='1.0.0a4',
packages=["cosmotool"], packages=["cosmotool"],
package_dir={'cosmotool': 'python/cosmotool'}, package_dir={'cosmotool': 'python/cosmotool'},
setup_requires=['cython','cffi','numexpr'], setup_requires=['cython','cffi','numexpr'],