diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 6af6f5c8a9c47d07efba8ed329cfa17e73384328..ce843335f2da476a4b2b31d83bba4315cacc363b 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -52,7 +52,7 @@ LCG_external_package(lcgenv 1.3.8 LCG_external_package(4suite 1.0.2p1 ) LCG_external_package(absl_py 0.2.2 ) LCG_external_package(AIDA 3.2.1 ) -LCG_external_package(arrow 0.8.0 ) +LCG_external_package(arrow 0.13.0 ) LCG_external_package(asn1crypto 0.24.0 ) LCG_external_package(astor 0.7.1 ) LCG_external_package(atomicwrites 1.1.5 ) @@ -102,7 +102,7 @@ else() endif() LCG_external_package(cx_oracle 6.4.1 ) LCG_external_package(cycler 0.10.0 ) -LCG_external_package(cython 0.28.4 ) +LCG_external_package(cython 0.29.7 ) LCG_external_package(dask 0.18.1 ) if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(Davix 0.7.1 ) @@ -119,7 +119,7 @@ LCG_external_package(expat 2.2.5 LCG_external_package(fastjet 3.3.0 ) LCG_external_package(fftw 3.3.4 fftw3 ) LCG_external_package(fjcontrib 1.030 ) -LCG_external_package(flatbuffers 1.8.0 ) +LCG_external_package(flatbuffers 1.11.0 ) LCG_external_package(fmt 5.2.1 ) LCG_external_package(flex 2.6.0 ) LCG_external_package(fontconfig 2.12.6 ) @@ -307,7 +307,7 @@ LCG_external_package(py 1.5.4 LCG_external_package(py2neo 4.0.0 ) LCG_external_package(py4j 0.10.7 ) LCG_external_package(pyanalysis 2.0 ) -LCG_external_package(pyarrow 0.8.0 ) +LCG_external_package(pyarrow ${arrow_native_version} ) LCG_external_package(pycparser 2.19 ) LCG_external_package(pydot 1.2.4 ) LCG_external_package(pydot_ng 1.0.0 ) @@ -320,7 +320,7 @@ LCG_external_package(PyHEADTAIL 1.12.4 LCG_external_package(pyjapc 1.5.6 ) LCG_external_package(pyparsing 2.2.0 ) LCG_external_package(pyqt5 5.12 ) -# LCG_external_package(pyqtwebengine 5.12.1 ) +#LCG_external_package(pyqtwebengine 5.12.1 ) LCG_external_package(pystan 2.17.1.0 ) LCG_external_package(pytest 3.6.3 ) LCG_external_package(pytest_runner 4.2 ) diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake index 26701b229c00b7c1bbdd4021257a0118d0528b78..2714e53d3d08f4699c35e6a758a7e63ce187ab22 100644 --- a/cmake/toolchain/heptools-dev-generators.cmake +++ b/cmake/toolchain/heptools-dev-generators.cmake @@ -1,7 +1,7 @@ set(MCGENPATH MCGenerators) if(LCG_PYTHON_VERSION EQUAL 2) - LCG_external_package(yoda 1.7.4 ${MCGENPATH}/yoda cython=0.28.4 ) + LCG_external_package(yoda 1.7.4 ${MCGENPATH}/yoda cython=0.29.7 ) LCG_external_package(rivet 2.6.2 ${MCGENPATH}/rivet yoda=1.7.4 ) LCG_external_package(rivet 2.7.0 ${MCGENPATH}/rivet yoda=1.7.4 ) LCG_external_package(madgraph5amc 2.6.2.atlas ${MCGENPATH}/madgraph5amc author=2.6.2) @@ -9,7 +9,7 @@ if(LCG_PYTHON_VERSION EQUAL 2) endif(LCG_PYTHON_VERSION EQUAL 2) if(LCG_PYTHON_VERSION EQUAL 3) - LCG_external_package(yoda 1.7.0-py3 ${MCGENPATH}/yoda cython=0.28.4 ) + LCG_external_package(yoda 1.7.0-py3 ${MCGENPATH}/yoda cython=0.29.7 ) LCG_external_package(rivet 2.6.0-py3 ${MCGENPATH}/rivet yoda=1.7.0-py3 ) endif(LCG_PYTHON_VERSION EQUAL 3) diff --git a/cmake/toolchain/heptools-hsf.cmake b/cmake/toolchain/heptools-hsf.cmake index 653e18c1eff759fb777a1264fe7c28088a36de51..35feb02d5d7d4472350002e69c4d85dc0fefb179 100644 --- a/cmake/toolchain/heptools-hsf.cmake +++ b/cmake/toolchain/heptools-hsf.cmake @@ -56,7 +56,7 @@ LCG_external_package(hepmc3 3.0.0 LCG_external_package(4suite 1.0.2p1 ) LCG_external_package(absl_py 0.2.2 ) LCG_external_package(AIDA 3.2.1 ) -LCG_external_package(arrow 0.8.0 ) +LCG_external_package(arrow 0.13.0 ) LCG_external_package(asn1crypto 0.24.0 ) LCG_external_package(astor 0.7.1 ) LCG_external_package(atomicwrites 1.1.5 ) @@ -108,7 +108,7 @@ else() endif() LCG_external_package(cx_oracle 6.4.1 ) LCG_external_package(cycler 0.10.0 ) -LCG_external_package(cython 0.28.4 ) +LCG_external_package(cython 0.29.7 ) LCG_external_package(dask 0.18.1 ) if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(Davix 0.7.1 ) @@ -125,7 +125,7 @@ LCG_external_package(expat 2.2.5 LCG_external_package(fastjet 3.3.0 ) LCG_external_package(fftw 3.3.4 fftw3 ) LCG_external_package(fjcontrib 1.030 ) -LCG_external_package(flatbuffers 1.8.0 ) +LCG_external_package(flatbuffers 1.11.0 ) LCG_external_package(fmt 5.2.1 ) LCG_external_package(flex 2.6.0 ) LCG_external_package(fontconfig 2.12.6 ) @@ -318,7 +318,7 @@ LCG_external_package(py 1.5.4 LCG_external_package(py2neo 4.0.0 ) LCG_external_package(py4j 0.10.7 ) LCG_external_package(pyanalysis 2.0 ) -LCG_external_package(pyarrow 0.8.0 ) +LCG_external_package(pyarrow ${arrow_native_version} ) LCG_external_package(pycparser 2.19 ) LCG_external_package(pydot 1.2.4 ) LCG_external_package(pydot_ng 1.0.0 ) diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 17b76f7dc8389ae0dacaae5785cddfcc08261720..f665ffc9af825c1f4dd6fdc3f5c091bc86e8a3ed 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -29,15 +29,22 @@ LCGPackage_Add( DEPENDS Python setuptools ) -#---Apache Arrow--------------------------------------------------- +#---arrow--------------------------------------------------------------------------------------------- LCGPackage_Add( arrow URL ${GenURL}/apache-arrow-${arrow_native_version}.tar.gz ENVIRONMENT FLATBUFFERS_HOME=${flatbuffers_home} - CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR>/cpp -DARROW_USE_SSE=ON -DARROW_PYTHON=ON -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${Boost_extra_configuration} + CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR>/cpp + -DARROW_USE_SSE=ON + -DARROW_PYTHON=ON + -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + ${Boost_extra_configuration} BUILD_COMMAND make INSTALL_COMMAND make install - DEPENDS Boost Python numpy flatbuffers + DEPENDS Boost Python numpy flatbuffers IF LCG_OS STREQUAL mac THEN autoconf ENDIF )