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

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

Browse Source
This commit is contained in:
Guilhem Lavaux 2021-06-20 13:37:45 +02:00
commit b8c9288fc7
6 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -71,7 +71,7 @@ SET(CPACK_PACKAGE_VENDOR "Guilhem Lavaux")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENCE_CeCILL_V2") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENCE_CeCILL_V2")
SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "2")
SET(CPACK_PACKAGE_VERSION_PATCH "2${EXTRA_VERSION}") SET(CPACK_PACKAGE_VERSION_PATCH "3${EXTRA_VERSION}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CosmoToolbox-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CosmoToolbox-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
SET(CPACK_STRIP_FILES "lib/libCosmoTool.so") SET(CPACK_STRIP_FILES "lib/libCosmoTool.so")
SET(CPACK_SOURCE_IGNORE_FILES SET(CPACK_SOURCE_IGNORE_FILES

8
conda/conda_build_config.yaml
View File

@ -1,8 +1,10 @@
python: python:
- 3.7
- 3.8
- 3.9 - 3.9
- 3.8
- 3.7
numpy: numpy:
- 1.11
- 1.19 - 1.19
gsl:
- 2.4

27
conda/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: cosmotool name: cosmotool
version: "1.2.2" version: "1.2.3"
source: source:
git_rev: 03033b6 git_rev: 03033b6
@ -8,41 +8,40 @@ source:
requirements: requirements:
build: build:
- numpy >=1.11 - python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- cython # [build_platform != target_platform]
- numpy # [build_platform != target_platform]
- {{ compiler('c') }} - {{ compiler('c') }}
- {{ compiler('cxx') }} - {{ compiler('cxx') }}
- python
- setuptools
- cython
- healpy
- numexpr
- cffi
- pyfftw
- gsl
- h5py
host: host:
- python - python
- pip
- numpy
- pkgconfig
- numexpr - numexpr
- cython - cython
- healpy - healpy
- cffi - cffi
- pyfftw - pyfftw
- gsl - gsl {{ gsl }}
- h5py - h5py
run: run:
- numpy
- python - python
- {{ pin_compatible('numpy') }}
- healpy - healpy
- numexpr - numexpr
- cffi - cffi
- pyfftw - pyfftw
- h5py - h5py
- {{ pin_compatible('gsl') }}
test: test:
imports: imports:
- cosmotool - cosmotool
requires:
- pip
about: about:
home: https://bitbucket.org/glavaux/cosmotool home: https://bitbucket.org/glavaux/cosmotool

2
requirements.txt
View File

@ -1,4 +1,4 @@
numpy numpy<1.19
cffi cffi
numexpr numexpr
pyfftw pyfftw

2
setup.py
View File

@ -223,7 +223,7 @@ class BuildCMakeExt(build_ext):
CosmoTool_extension = CMakeExtension(name="cosmotool") CosmoTool_extension = CMakeExtension(name="cosmotool")
setup(name='cosmotool', setup(name='cosmotool',
version='1.2.2', version='1.2.3',
packages=["cosmotool"], packages=["cosmotool"],
package_dir={'cosmotool': 'python/cosmotool'}, package_dir={'cosmotool': 'python/cosmotool'},
install_requires=['numpy','cffi','numexpr','pyfftw','h5py'], install_requires=['numpy','cffi','numexpr','pyfftw','h5py'],

4
src/hdf5_array.hpp
View File

@ -426,7 +426,7 @@ namespace CosmoTool {
#define CTOOL_HDF5_INSERT_ELEMENT(r, STRUCT, element) \ #define CTOOL_HDF5_INSERT_ELEMENT(r, STRUCT, element) \
{ \ { \
::CosmoTool::get_hdf5_data_type<BOOST_PP_TUPLE_ELEM(2, 0, element)> t; \ ::CosmoTool::get_hdf5_data_type<BOOST_PP_TUPLE_ELEM(2, 0, element)> t; \
position = HOFFSET(STRUCT, BOOST_PP_TUPLE_ELEM(2, 1, element)); \ long position = HOFFSET(STRUCT, BOOST_PP_TUPLE_ELEM(2, 1, element)); \
const char *field_name = BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(2, 1, element)); \ const char *field_name = BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(2, 1, element)); \
type.insertMember(field_name, position, t.type()); \ type.insertMember(field_name, position, t.type()); \
} }
@ -439,7 +439,6 @@ namespace CosmoTool { \
\ \
TNAME() : type(sizeof(STRUCT)) \ TNAME() : type(sizeof(STRUCT)) \
{ \ { \
long position; \
BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ELEMENT, STRUCT, ATTRIBUTES) \ BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ELEMENT, STRUCT, ATTRIBUTES) \
} \ } \
\ \
@ -471,7 +470,6 @@ namespace CosmoTool { \
\ \
TNAME() : type(sizeof(STRUCT)) \ TNAME() : type(sizeof(STRUCT)) \
{ \ { \
long position; \
BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ENUM_ELEMENT, STRUCT, ATTRIBUTES) \ BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ENUM_ELEMENT, STRUCT, ATTRIBUTES) \
} \ } \
\ \