guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in python3 (pull request #5)

Browse source 
Port to python3, large code cleanup

* Fixed command line for cosmotool

* Fix path

* Dump command line is log file

* Fix important typo

* Modify paths for example

* Fix path again

* Use an explicit constructor

* Change file to open (python 2->3)

* python3 fix for xrange in periodic_kdtree.py

* Fixed index for Np, numPart, numZones, numZonesTot, partID, zoneID in catalogUtil.py
This commit is contained in:
Guilhem Lavaux 2020-12-29 08:56:33 +00:00
parent 8249256508
commit affb56ff48
392 changed files with 4092 additions and 260938 deletions
Download patch file Download diff file Expand all files Collapse all files

58
external/external_cosmotool.cmake vendored
View file

@ -2,31 +2,47 @@
# Build CosmoTool
##################
IF (Boost_INTERNAL_INSTALL)
SET(BOOST_DEF -DBoost_DIR:STRING=${Boost_INTERNAL_INSTALL} -DBOOST_ROOT:STRING=${Boost_INTERNAL_INSTALL})
ELSE()
SET(BOOST_DEF)
ENDIF()
#v1.0.0a7.tar.bz2
ExternalProject_Add(cosmotool
URL https://bitbucket.org/glavaux/cosmotool/get/7e436bb.tar.gz
DEPENDS ${cosmotool_DEPS}
SOURCE_DIR ${COSMOTOOL_DIR}
PREFIX ${BUILD_PREFIX}/cosmotool-prefix
SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/cosmotool
CMAKE_ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DHDF5_DIR=${HDF5_ROOTDIR}
-DHDF5_ROOTDIR=${HDF5_ROOTDIR}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/cosmotool
-DNETCDF_INCLUDE_PATH=${NETCDF_INCLUDE_PATH}
-DNETCDFCPP_INCLUDE_PATH=${NETCDFCPP_INCLUDE_PATH}
-DGSL_INCLUDE_PATH=${GSL_INCLUDE_PATH}
-DGSL_LIBRARY=${GSL_LIBRARY}
-DGSLCBLAS_LIBRARY=${GSLCBLAS_LIBRARY}
-DNETCDF_LIBRARY=${NETCDF_LIBRARY}
-DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY}
-DENABLE_SHARP=OFF
-DBUILD_PYTHON=OFF
-DBoost_INCLUDE_DIR=${Boost_INCLUDE_DIRS}
${CYTHON_OPTION}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${EXT_INSTALL}
-DCMAKE_PREFIX_PATH:STRING=${SPECIAL_PREFIX_PATH}
-DEIGEN_PATH:STRING=${EIGEN_PATH}
-DCMAKE_MODULE_PATH:STRING=${EXT_INSTALL}/share/cmake;${CMAKE_MODULE_PATH}
-DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DHDF5_DIR:STRING=${HDF5_ROOTDIR}/share/cmake
-DHDF5_ROOTDIR:STRING=${HDF5_ROOTDIR}
-DNETCDF_INCLUDE_PATH:STRING=${NETCDF_INCLUDE_PATH}
-DNETCDFCPP_INCLUDE_PATH:STRING=${NETCDFCPP_INCLUDE_PATH}
-DGSL_INCLUDE_PATH:STRING=${GSL_INCLUDE}
-DGSL_LIBRARY:STRING=${GSL_LIBRARY}
-DGSLCBLAS_LIBRARY:STRING=${GSL_CBLAS_LIBRARY}
-DINTERNAL_GSL:BOOL=OFF
-DINTERNAL_EIGEN:BOOL=ON
-DYORICK_SUPPORT:BOOL=OFF
-DENABLE_SHARP:BOOL=OFF
-DBUILD_PYTHON:BOOL=OFF
-DENABLE_OPENMP:BOOL=${ENABLE_OPENMP}
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH:BOOL=ON
-DBoost_DEBUG:BOOL=ON
${BOOST_DEF}
-DZLIB_LIBRARY:STRING=${ZLIB_LIBRARY}
BUILD_BYPRODUCTS ${EXT_INSTALL}/lib/libCosmoTool.a
LIST_SEPARATOR ;
)
SET(COSMOTOOL_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cosmotool/lib/libCosmoTool.a)
set(COSMOTOOL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cosmotool/include)
SET(COSMOTOOL_LIBRARY ${EXT_INSTALL}/lib/libCosmoTool.a)
set(COSMOTOOL_INCLUDE_PATH ${EXT_INSTALL}/include)
include_directories(${COSMOTOOL_INCLUDE_PATH} )