Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nlanggut/lcgcmake
  • ndiederi/lcgcmake
  • jcarcell/lcgcmake
  • tehmann/lcgcmake-parallel-publishing
  • agheata/lcgcmake
  • lprimomo/lcgcmake
  • heli/lcgcmake
  • ewelina/lcgcmake
  • dkonst/lcgcmake
  • sailer/lcgcmake
  • adye/lcgcmake
  • razumov/lcgcmake
  • jiling/lcgcmake
  • ganis/lcgcmake
  • mato/lcgcmake
  • lhcb-core/lcgcmake
  • dguest/lcgcmake
  • lforthom/lcgcmake
  • efe/lcgcmake
  • dasalama/lcgcmake
  • valassi/lcgcmake
  • bcouturi/lcgcmake
  • vavolkl/lcgcmake
  • graemes/lcgcmake
  • GENSER/lcgcmake
  • jwsmith/lcgcmake
  • hegner/lcgcmake
  • clemenci/lcgcmake
  • sft/lcgcmake
29 results
Show changes
Commits on Source (32)
Showing
with 4692 additions and 3413 deletions
......@@ -380,7 +380,7 @@ def get_available_compilers(arch, osvers):
try:
resp = urllib2.urlopen(urlinfo)
for l in resp.readlines():
if l[0] == '#' : continue
if l[0] == '#' or not l.strip() : continue
d = parse_info(l)
if d['NAME'] in ('clang','gcc'):
compilers[make_compilerversion(d['NAME'],d['VERSION'])] = {'NAME':'-'.join((d['NAME'],d['VERSION'],d['HASH'])),'DEPENDS': d['DEPENDS']}
......
......@@ -52,7 +52,7 @@ if("${url}" MATCHES "^[a-z]+://")
#---extract file------------------------------------------------------------------------------------
if(NOT nodecompress)
if(file MATCHES "(\\.|=)(gz|tgz|zip)$")
if(file MATCHES "(\\.|=)(gz|tgz)$")
get_filename_component(filename "${file}" ABSOLUTE)
if(NOT EXISTS "${filename}")
message(FATAL_ERROR "error: file to decompress does not exist: '${filename}'")
......@@ -62,26 +62,31 @@ if("${url}" MATCHES "^[a-z]+://")
if(NOT rv EQUAL 0)
message(FATAL_ERROR "error: decompressing of '${filename}' failed")
endif()
string(REGEX REPLACE "(\\.|=)(gz|tgz|zip)$" "" dirname ${filename})
string(REGEX REPLACE "(\\.|=)(gz|tgz)$" "" dirname ${filename})
elseif(file MATCHES "(\\.|=)(zip)$")
get_filename_component(filename "${file}" ABSOLUTE)
if(NOT EXISTS "${filename}")
message(FATAL_ERROR "error: file to decompress does not exist: '${filename}'")
endif()
message(STATUS "decompressing... src='${filename}'")
execute_process(COMMAND unzip -a ${filename} -d ${source_dir} RESULT_VARIABLE rv)
if(NOT rv EQUAL 0)
message(FATAL_ERROR "error: decompressing of '${filename}' failed")
endif()
string(REGEX REPLACE "(\\.|=)(zip)$" "" dirname ${filename})
elseif(file MATCHES "(\\.|=)(tar\\.xz|tar)$")
get_filename_component(filename "${file}" ABSOLUTE)
if(NOT EXISTS "${filename}")
message(FATAL_ERROR "error: file to decompress does not exist: '${filename}'")
endif()
message(STATUS "decompressing... src='${filename}'")
execute_process(COMMAND tar xf ${filename} -C ${source_dir} RESULT_VARIABLE rv)
if(NOT rv EQUAL 0)
message(FATAL_ERROR "error: decompressing of '${filename}' failed")
endif()
string(REGEX REPLACE "(\\.|=)(tar\\.xz|tar)$" "" dirname ${filename})
else()
message(STATUS "file is already de-compressed src='${filename}'")
endif()
endif()
......
......@@ -108,12 +108,13 @@ LCG_external_package(Boost 1.70.0
LCG_external_package(C50 2.07 )
LCG_external_package(cachetools 3.1.1 )
LCG_external_package(cairo 1.17.2 )
LCG_external_package(cartopy 0.17.0 )
LCG_external_package(catboost 0.9.1.1 )
LCG_external_package(ccache 3.7.1 )
LCG_external_package(certifi 2019.3.9 )
LCG_external_package(cffi 1.12.2 )
LCG_external_package(chardet 3.0.4 )
LCG_external_package(CLHEP 2.4.1.0 clhep )
LCG_external_package(CLHEP 2.4.1.2 clhep )
LCG_external_package(click 7.0 )
LCG_external_package(cloudpickle 1.2.1 )
LCG_external_package(CMake 3.14.3 )
......@@ -142,7 +143,7 @@ if(NOT ${LCG_OS} STREQUAL mac)
endif()
LCG_external_package(decorator 4.3.2 )
LCG_external_package(defusedxml 0.6.0 )
LCG_external_package(delphes 3.4.2pre17 )
LCG_external_package(delphes 3.4.2pre18 )
LCG_external_package(dill 0.2.9 )
LCG_external_package(distributed 1.28.1 )
LCG_external_package(doxygen 1.8.15 )
......@@ -264,6 +265,7 @@ LCG_external_package(libaio 0.3.110-1
LCG_external_package(libffi 3.2.1 )
LCG_external_package(libgeotiff 1.5.1 )
LCG_external_package(libgit2 0.28.2 )
LCG_external_package(libsodium 1.0.18 )
LCG_external_package(libtool 2.4.2 )
if( NOT ${LCG_OS} MATCHES ubuntu|mac )
LCG_external_package(libxkbcommon 0.7.1 )
......@@ -379,6 +381,7 @@ LCG_external_package(pyqt5 5.12
LCG_external_package(PyRDF 0.1.0 )
LCG_external_package(pyrsistent 0.15.2 )
LCG_external_package(pystan 2.19.0.0 )
LCG_external_package(pyshp 2.1.0 )
LCG_external_package(pytables 3.5.2 )
LCG_external_package(pytest 4.6.2 )
LCG_external_package(pytest_runner 5.1 )
......
......@@ -6,6 +6,7 @@ if(LCG_PYTHON_VERSION EQUAL 2)
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)
LCG_external_package(madgraph5amc 2.6.5.atlas ${MCGENPATH}/madgraph5amc author=2.6.5)
LCG_external_package(madgraph5amc 2.6.6.atlas ${MCGENPATH}/madgraph5amc author=2.6.6)
LCG_external_package(openloops 2.0.0 ${MCGENPATH}/openloops)
LCG_external_package(sherpa 2.2.7 ${MCGENPATH}/sherpa author=2.2.7 hepevt=10000 openloops=2.0.0)
LCG_external_package(sherpa-openmpi 2.2.7.openmpi3 ${MCGENPATH}/sherpa author=2.2.7 hepevt=10000 openloops=2.0.0)
......@@ -24,7 +25,7 @@ LCG_external_package(rivet 2.7.2b ${MCGENPATH}/rivet yoda=1.
LCG_external_package(heputils 1.3.2 ${MCGENPATH}/heputils )
LCG_external_package(mcutils 1.3.2 ${MCGENPATH}/mcutils heputils=1.3.2)
LCG_external_package(mcutils 1.3.3 ${MCGENPATH}/mcutils heputils=1.3.2)
LCG_external_package(collier 1.1 ${MCGENPATH}/collier)
LCG_external_package(syscalc 1.1.7 ${MCGENPATH}/syscalc)
......@@ -32,6 +33,7 @@ LCG_external_package(syscalc 1.1.7 ${MCGENPATH}/syscalc)
LCG_external_package(madgraph5amc 3.0.0.beta ${MCGENPATH}/madgraph5amc author=3.0.0.beta)
LCG_external_package(madgraph5amc 2.6.2 ${MCGENPATH}/madgraph5amc author=2.6.2)
LCG_external_package(madgraph5amc 2.6.5 ${MCGENPATH}/madgraph5amc author=2.6.5)
LCG_external_package(madgraph5amc 2.6.6 ${MCGENPATH}/madgraph5amc author=2.6.6)
LCG_external_package(lhapdf 6.1.6.cxxstd ${MCGENPATH}/lhapdf author=6.1.6 usecxxstd=1 )
......@@ -57,7 +59,7 @@ LCG_external_package(pythia8 243 ${MCGENPATH}/pythia8 )
LCG_external_package(dire4pythia8 2.001 ${MCGENPATH}/dire4pythia8 pythia8=235)
LCG_external_package(dire4pythia8 2.003 ${MCGENPATH}/dire4pythia8 pythia8=240)
LCG_external_package(looptools 2.8 ${MCGENPATH}/looptools)
LCG_external_package(looptools 2.15 ${MCGENPATH}/looptools)
LCG_external_package(vbfnlo 3.0.0beta5 ${MCGENPATH}/vbfnlo feynhiggs=2.10.2)
LCG_external_package(FORM 4.1 ${MCGENPATH}/FORM)
......
This diff is collapsed.
......@@ -668,9 +668,9 @@ LCGPackage_Add(
LCGPackage_Add(
pcre
URL ${GenURL}/pcre-<VERSION>.tar.gz
CONFIGURE_COMMAND ./configure --enable-utf --enable-unicode-properties --prefix=<INSTALL_DIR>
CONFIGURE_COMMAND ./configure --enable-utf --enable-jit --enable-unicode-properties --prefix=<INSTALL_DIR>
BUILD_IN_SOURCE 1
REVISION 1
REVISION 2
)
#---Swig--------------------------------------------------------------------------------------------
......@@ -1178,6 +1178,7 @@ LCGPackage_Add(
-DBUILD_SHARED_LIBS=ON
IF ${blas_native_version} MATCHES openblas THEN -DUSE_OPTIMIZED_BLAS=ON ENDIF
DEPENDS blas
REVISION 1
)
#---Qt--------------------------------------------------------------------------------------------------------
......@@ -1653,12 +1654,21 @@ LCGPackage_Add(
DEPENDS Python
)
#---libsodium----------------------------------------------------------------------
LCGPackage_Add(
libsodium
URL ${GenURL}/libsodium-${libsodium_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
BUILD_IN_SOURCE 1
)
#---zeromq----------------------------------------------------------------------
LCGPackage_Add(
zeromq
URL ${GenURL}/zeromq-${zeromq_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-libsodium=no
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-libsodium=yes
BUILD_IN_SOURCE 1
DEPENDS libsodium pkg_config
)
#----autoconf-------------------------------------------------------------------
......
......@@ -208,35 +208,6 @@ LCG_add_test(lhapdf6sets.download
# ENVIRONMENT ${library_path}=${yamlcpp-${v}_home}/lib:$ENV{${library_path}}
# DEPENDS yamlcpp-${v}.build)
#endforeach()
#---Yoda-------------------------------------------------------------------------------------------
set(cython_pythonpath ${cython_home}/lib/python${Python_config_version_twodigit}/site-packages)
set(cython_v_pythonpath <cython-<yoda_<VERSION>_cython>_home>/lib/python${Python_config_version_twodigit}/site-packages)
set(cython_v_home <cython-<yoda_<VERSION>_cython>_home>)
LCGPackage_Add(
yoda
URL ${gen_url}/YODA-<NATIVE_VERSION>.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
--with-boost=${Boost_home}
IF EXISTS "${ROOT_home}/" THEN
--enable-root
ROOTCONFIG=${ROOT_home}/bin/root-config
ENDIF
PYTHON=${Python_home}/bin/${PYTHON}
BUILD_COMMAND ${MAKE} all
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS Python future
IF <VERSION> VERSION_LESS 1.6.0 THEN
Boost
ENDIF
cython
IF NOT <VERSION> VERSION_LESS 1.3.0 THEN
matplotlib
ENDIF
)
#---Rivet-----------------------------------------------------------------------------------------
......@@ -360,8 +331,6 @@ LCG_add_test(rivet-${v}.genser-scripts-rivet-mkhtml
endif()
endforeach()
#---heputils-------------------------------------------------------------------------------------------
#---heputils-------------------------------------------------------------------------------------------
......
This diff is collapsed.
--- input/.mg5_configuration_default.txt.orig 2017-06-01 12:38:04.067508362 +0200
+++ input/.mg5_configuration_default.txt 2017-06-01 12:39:32.585514296 +0200
@@ -93,7 +93,7 @@
#! Allow/Forbid the automatic opening of the web browser (on the status page)
#! when launching MadEvent [True/False]
-# automatic_html_opening = True
+automatic_html_opening = False
#! allow notification of finished job in the notification center (Mac Only)
# notification_center = True
@@ -209,12 +209,12 @@
#! > external : ML5 places a link to the MG5_aMC-wide libraries
#! > internal : ML5 copies all dependencies in the output so that it is independent
#! > environment_paths : ML5 searches for the dependencies in your environment path
-# output_dependencies = external
+output_dependencies = internal
#! SysCalc PATH
#! Path to the directory containing syscalc executables
#! relative path start from main directory
-# syscalc_path = ./SysCalc
+syscalc_path = @syscalc@
#! Absolute paths to config scripts in the bin directories for APPLgrid and aMCFast.
# applgrid = applgrid-config
--- input/mg5_configuration.txt.orig 2017-06-01 12:38:09.705572462 +0200
+++ input/mg5_configuration.txt 2017-06-01 12:39:52.677742498 +0200
@@ -93,7 +93,7 @@
#! Allow/Forbid the automatic opening of the web browser (on the status page)
#! when launching MadEvent [True/False]
-# automatic_html_opening = True
+automatic_html_opening = False
#! allow notification of finished job in the notification center (Mac Only)
# notification_center = True
@@ -209,12 +209,12 @@
#! > external : ML5 places a link to the MG5_aMC-wide libraries
#! > internal : ML5 copies all dependencies in the output so that it is independent
#! > environment_paths : ML5 searches for the dependencies in your environment path
-# output_dependencies = external
+output_dependencies = internal
#! SysCalc PATH
#! Path to the directory containing syscalc executables
#! relative path start from main directory
-# syscalc_path = ./SysCalc
+syscalc_path = @syscalc@
#! Absolute paths to config scripts in the bin directories for APPLgrid and aMCFast.
# applgrid = applgrid-config
--- vendor/CutTools/makefile.orig 2018-06-18 13:24:17.164637074 +0200
+++ vendor/CutTools/makefile 2018-06-18 13:24:27.756740547 +0200
@@ -9,7 +9,7 @@
ifeq ($(wildcard ../make_opts), ../make_opts)
include ../make_opts
else
- FFLAGS =
+ FFLAGS = -std=legacy
FC=gfortran
endif
--- vendor/IREGI/src/makefile_ML5_lib.orig 2018-07-09 13:33:48.546490615 +0200
+++ vendor/IREGI/src/makefile_ML5_lib 2018-07-09 13:33:57.238573607 +0200
@@ -5,7 +5,7 @@
FFDIR=$(qcdlooppath)/ff
onelooppath=$(PWD)/oneloop
#FFLAGS=-O -g -ggdb -fno-automatic -fbounds-check -I$(onelooppath) # -fbounds-check is very useful in checking mermory error,-g is for debuging,-ggdb is for debuging special in gdb
-FFLAGS=-O -g -fPIC -I$(onelooppath)
+FFLAGS=-O -g -fPIC -I$(onelooppath) -std=legacy
obj= global.o funlib.o linear_algebra.o kinematics.o matrices.o matrix_base.o cmatrix_base.o mis_warp.o special_fun.o pave_reduce.o cpave_reduce.o si_reduce.o csi_reduce.o ti_reduce.o cti_reduce.o gti_reduce.o binary_tree.o IREGI4ML5_interface.o avh_olo_foriregi.o
olomod= avh_olo_foriregi.mod avh_olo_foriregi_dp_box.mod avh_olo_foriregi_dp_olog.mod avh_olo_foriregi_units.mod \
avh_olo_foriregi_dp.mod avh_olo_foriregi_dp_boxc.mod avh_olo_foriregi_dp_prec.mod avh_olo_foriregi_version.mod \
......@@ -17,21 +17,22 @@ LCGPackage_Add(
)
#---numpy---------------------------------------------------------------------------------------------------------
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/numpy-site.cfg "
[openblas]
libraries = openblas, lapack
library_dirs = ${blas_home}/${LIBDIR_DEFAULT}:${lapack_home}/${LIBDIR_DEFAULT}
include_dirs = ${blas_home}/include
")
LCGPackage_Add(
numpy
URL ${GenURL}/numpy-${numpy_native_version}.tar.gz
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/site.cfg.example <SOURCE_DIR>/site.cfg
IF LCG_TARGET MATCHES mac THEN
COMMAND $ENV{SHELL} -c "sed -i '' 's#@blas_home#${blas_home}#g' <SOURCE_DIR>/site.cfg"
ELSE
COMMAND $ENV{SHELL} -c "sed -i 's#@blas_home#${blas_home}#g' <SOURCE_DIR>/site.cfg"
ENDIF
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/numpy-site.cfg <SOURCE_DIR>/site.cfg
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools blas
DEPENDS Python setuptools blas lapack
)
#---arrow---------------------------------------------------------------------------------------------
......@@ -538,99 +539,101 @@ LCGPackage_add(
REVISION 1
)
#---DD4hep-----------------------------------------------------------------------------------------------
#---DD4hep---------------------------------------------------------------------
LCGPackage_add(
DD4hep
URL ${GenURL}/DD4hep-${DD4hep_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DBOOST_ROOT=${Boost_home}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DDD4HEP_USE_XERCESC=ON
-DXERCESC_ROOT_DIR=${XercesC_home}
-DROOTSYS=${ROOT_home}
-DDD4HEP_USE_GEANT4=ON
-DBUILD_DOCS=OFF
${Boost_extra_configuration}
BUILD_COMMAND ${MAKE} -j4
DEPENDS ROOT XercesC Geant4 Boost Python
DD4hep
URL ${GenURL}/DD4hep-${DD4hep_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DBOOST_ROOT=${Boost_home}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DDD4HEP_USE_XERCESC=ON
-DXERCESC_ROOT_DIR=${XercesC_home}
-DROOTSYS=${ROOT_home}
-DDD4HEP_USE_GEANT4=ON
-DBUILD_DOCS=OFF
${Boost_extra_configuration}
BUILD_COMMAND ${MAKE} -j4
DEPENDS ROOT XercesC Geant4 Boost Python
)
#---delphes-----------------------------------------------------------------------------------------------
#---delphes--------------------------------------------------------------------
LCGPackage_add(
delphes
URL ${GenURL}/Delphes-${delphes_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
DEPENDS ROOT
delphes
URL ${GenURL}/Delphes-${delphes_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
DEPENDS ROOT
)
#---hepmc3----------------------------------------------------------------------------
#---hepmc3---------------------------------------------------------------------
if( hepmc3_native_version MATCHES "githead")
set(hepmc3_source_command GIT_REPOSITORY https://gitlab.cern.ch/hepmc/HepMC3.git
UPDATE_COMMAND <VOID> )
set(hepmc3_source_command GIT_REPOSITORY https://gitlab.cern.ch/hepmc/HepMC3.git
UPDATE_COMMAND <VOID> )
else()
set(hepmc3_source_command URL ${GenURL}/HepMC3-${hepmc3_native_version}.tar.gz)
set(hepmc3_source_command URL ${GenURL}/HepMC3-${hepmc3_native_version}.tar.gz)
endif()
LCGPackage_Add(
hepmc3
${hepmc3_source_command}
ENVIRONMENT ROOTSYS=${ROOT_home}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DROOT_DIR=${ROOT_home}
BUILD_COMMAND ${MAKE} -j1
DEPENDS ROOT
hepmc3
${hepmc3_source_command}
ENVIRONMENT ROOTSYS=${ROOT_home}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DROOT_DIR=${ROOT_home}
BUILD_COMMAND ${MAKE} -j1
DEPENDS ROOT
)
#---Garfield++----------------------------------------------------------------------
#---Garfield++-----------------------------------------------------------------
LCGPackage_Add(
Garfield++
IF <VERSION> MATCHES HEAD THEN
GIT_REPOSITORY https://gitlab.cern.ch/garfield/garfieldpp.git
UPDATE_COMMAND <VOID>
ELSE
URL ${GenURL}/garfieldpp-<VERSION>.tar.gz
ENDIF
ENVIRONMENT ROOTSYS=${ROOT_home}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
DEPENDS ROOT Geant4
Garfield++
IF <VERSION> MATCHES HEAD THEN
GIT_REPOSITORY https://gitlab.cern.ch/garfield/garfieldpp.git
UPDATE_COMMAND <VOID>
ELSE
URL ${GenURL}/garfieldpp-<VERSION>.tar.gz
ENDIF
ENVIRONMENT ROOTSYS=${ROOT_home}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
DEPENDS ROOT Geant4
)
#---Gaudi----------------------------------------------------------------------------
#---Gaudi----------------------------------------------------------------------
LCGPackage_Add(
Gaudi
GIT_REPOSITORY https://gitlab.cern.ch/gaudi/Gaudi.git
GIT_TAG <VERSION>
UPDATE_COMMAND <VOID>
ENVIRONMENT BINARY_TAG=${LCG_platform}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_FIND_FRAMEWORK=LAST
-DBoost_NO_BOOST_CMAKE=TRUE
${Boost_extra_configuration}
DEPENDS Boost Python GSL ROOT CLHEP AIDA HepMC XercesC rangev3 cppgsl
Gaudi
GIT_REPOSITORY https://gitlab.cern.ch/gaudi/Gaudi.git
GIT_TAG <VERSION>
UPDATE_COMMAND <VOID>
ENVIRONMENT BINARY_TAG=${LCG_platform}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_FIND_FRAMEWORK=LAST
-DBoost_NO_BOOST_CMAKE=TRUE
${Boost_extra_configuration}
DEPENDS Boost Python GSL ROOT CLHEP AIDA HepMC XercesC rangev3 cppgsl
)
#---devBE---------------------------------------------------------------------------
#---devBE----------------------------------------------------------------------
set(devBE-alldeps backports CMake cmaketools cx_oracle h5py jupyter_contrib_nbextensions
lapack lcgenv logilabcommon numexpr paramiko protobuf pylint pyqt5
pyserial requests scikitlearn seaborn sqlalchemy xrootd xz )
foreach(dep ${devBE-alldeps})
if(DEFINED ${dep}_native_version)
set(devBE-dependencies ${devBE-dependencies} ${dep})
endif()
if(DEFINED ${dep}_native_version)
set(devBE-dependencies ${devBE-dependencies} ${dep})
endif()
endforeach()
add_custom_target(devBE-externals
COMMENT "Target to build all externals packages needed by devBE"
DEPENDS ${devBE-dependencies} )
COMMENT "Target to build all externals packages needed by devBE"
DEPENDS ${devBE-dependencies}
)
......@@ -270,7 +270,6 @@ LCGPackage_Add(
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
IF LCG_PYTHON_VERSION EQUAL 3 THEN REVISION 1 ENDIF
)
#---pbr---------------------------------------------------------------------------------------------------
......@@ -775,6 +774,7 @@ LCGPackage_Add(
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
REVISION 1
DEPENDS Python setuptools dill
)
......@@ -1530,8 +1530,10 @@ LCGPackage_Add(
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E touch <INSTALL_DIR>/lib/python${Python_config_version_twodigit}/site-packages/logilab/__init__.py
BUILD_IN_SOURCE 1
DEPENDS Python setuptools six pytest
REVISION 1
)
#---pickleshare------------------------------------------------------------------------------------------------------
......@@ -2306,6 +2308,7 @@ LCGPackage_Add(
pycairo
URL ${GenURL}/pycairo-${pycairo_native_version}.tar.gz
ENVIRONMENT PKG_CONFIG_PATH=/usr/lib/pkgconfig/lib:/usr/lib64/pkgconfig/:$ENV{PKG_CONFIG_PATH}
IF APPLE THEN CPPFLAGS=-I/opt/X11/include ENDIF
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
......@@ -2325,6 +2328,9 @@ LCGPackage_Add(
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${CMAKE_COMMAND} -Durl=https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip
-Dsource_dir=<INSTALL_DIR>/lib/python${Python_config_version_twodigit}/site-packages/matplotlib/backends/web_backend
-P ${CMAKE_SOURCE_DIR}/cmake/scripts/DownloadURL.cmake
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
......@@ -2441,50 +2447,62 @@ LCGPackage_Add(
DEPENDS Python setuptools R singledispatch xz pcre tzlocal
)
#---elasticsearch------------------------------------------------------------------------------------------------------
LCGPackage_Add(
elasticsearch
URL ${GenURL}/elasticsearch-${elasticsearch_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools urllib3
)
#---hepdata_validator------------------------------------------------------------------------------------------------------
#---pydoop------------------------------------------------------------------------------------------------------
LCGPackage_Add(
hepdata_validator
URL ${GenURL}/hepdata_validator-${hepdata_validator_native_version}.tar.gz
pydoop
URL ${GenURL}/pydoop-${pydoop_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools jsonschema PyYAML
DEPENDS Python setuptools
)
#---hepdata_converter------------------------------------------------------------------------------------------------------
#---iminuit------------------------------------------------------------------------------------------------------
LCGPackage_Add(
hepdata_converter
URL ${GenURL}/hepdata-converter-${hepdata_converter_native_version}.tar.gz
iminuit
URL ${GenURL}/iminuit-${iminuit_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools matplotlib hepdata_validator
DEPENDS Python setuptools numpy scipy ipython matplotlib cython pytest pylint
)
#---elasticsearch------------------------------------------------------------------------------------------------------
#---uncertainties------------------------------------------------------------------------------------------------------
LCGPackage_Add(
elasticsearch
URL ${GenURL}/elasticsearch-${elasticsearch_native_version}.tar.gz
uncertainties
URL ${GenURL}/uncertainties-${uncertainties_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools urllib3
DEPENDS Python setuptools numpy
)
#---pydoop------------------------------------------------------------------------------------------------------
#---future------------------------------------------------------------------------------------------------------
LCGPackage_Add(
pydoop
URL ${GenURL}/pydoop-${pydoop_native_version}.tar.gz
future
URL ${GenURL}/future-${future_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
......@@ -2494,30 +2512,60 @@ LCGPackage_Add(
DEPENDS Python setuptools
)
#---iminuit------------------------------------------------------------------------------------------------------
#---Yoda-------------------------------------------------------------------------------------------
set(cython_pythonpath ${cython_home}/lib/python${Python_config_version_twodigit}/site-packages)
set(cython_v_pythonpath <cython-<yoda_<VERSION>_cython>_home>/lib/python${Python_config_version_twodigit}/site-packages)
set(cython_v_home <cython-<yoda_<VERSION>_cython>_home>)
LCGPackage_Add(
iminuit
URL ${GenURL}/iminuit-${iminuit_native_version}.tar.gz
yoda
URL ${GenURL}/MCGeneratorsTarFiles/YODA-<NATIVE_VERSION>.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
--with-boost=${Boost_home}
IF EXISTS "${ROOT_home}/" THEN
--enable-root
ROOTCONFIG=${ROOT_home}/bin/root-config
ENDIF
PYTHON=${Python_home}/bin/${PYTHON}
BUILD_COMMAND ${MAKE} all
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS Python future
IF <VERSION> VERSION_LESS 1.6.0 THEN
Boost
ENDIF
cython
IF NOT <VERSION> VERSION_LESS 1.3.0 THEN
matplotlib
ENDIF
)
#---hepdata_validator------------------------------------------------------------------------------------------------------
LCGPackage_Add(
hepdata_validator
URL ${GenURL}/hepdata_validator-${hepdata_validator_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools numpy scipy ipython matplotlib cython pytest pylint
DEPENDS Python setuptools jsonschema PyYAML
)
#---uncertainties------------------------------------------------------------------------------------------------------
#---hepdata_converter------------------------------------------------------------------------------------------------------
LCGPackage_Add(
uncertainties
URL ${GenURL}/uncertainties-${uncertainties_native_version}.tar.gz
hepdata_converter
URL ${GenURL}/hepdata-converter-${hepdata_converter_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools numpy
DEPENDS Python setuptools matplotlib hepdata_validator IF DEFINED yoda_native_version THEN yoda ENDIF
)
#---Add the dependencies now----------------------------------------------------------------------------------------
......@@ -2529,7 +2577,8 @@ LCGPackage_Add(
INSTALL_COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUNDLE_PACKAGE 1
DEPENDS matplotlib numpy pyparsing scipy sympy pytz numexpr scikitlearn rootpy root_numpy rpy2 elasticsearch
hepdata_converter hepdata_validator pytimber cmmnbuild jpype joblib uncertainties iminuit
hepdata_converter hepdata_validator
pytimber cmmnbuild jpype joblib uncertainties iminuit
REVISION 2
)
......@@ -2893,19 +2942,6 @@ LCGPackage_Add(
DEPENDS Python setuptools Django
)
#---future------------------------------------------------------------------------------------------------------
LCGPackage_Add(
future
URL ${GenURL}/future-${future_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
)
#---patsy------------------------------------------------------------------------------------------------------
LCGPackage_Add(
patsy
......@@ -3071,14 +3107,15 @@ LCGPackage_Add(
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} ${pip_home}/bin/pip install --no-deps --prefix=<INSTALL_DIR> --no-binary :all: protobuf==<tensorboard_<VERSION>_protobuf>
COMMAND touch <INSTALL_DIR>/lib/python${Python_config_version_twodigit}/site-packages/google/__init__.py # was missing
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/tensorboard/__init__.py <INSTALL_DIR>/lib/python${Python_config_version_twodigit}/site-packages/google/
COMMAND ${PYTHON} ${pip_home}/bin/pip install --no-deps --prefix=<INSTALL_DIR>
<SOURCE_DIR>/tensorboard-${tensorboard_native_version}-${py_tensorflow}-none-any.whl
BUILD_IN_SOURCE 1
DEPENDS Python setuptools pip wheel mock werkzeug markdown six numpy
REVISION 1
)
#---tensorflow_estimator------------------------------------------------------------------------------------------
#---tensorflow_estimator------------------------------------------------------------------------------------------
LCGPackage_Add(
tensorflow_estimator
DOWNLOAD_COMMAND <VOID>
......@@ -3089,8 +3126,6 @@ LCGPackage_Add(
DEPENDS absl_py six mock IF Python_native_version VERSION_LESS 3 THEN enum34 ENDIF numpy wheel Python setuptools funcsigs pip termcolor astor gast
)
#---tensorflow---------------------------------------------------------------------------------------------------
if(LCG_TARGET MATCHES "mac")
set(pyversion ${py_tensorflow})
......@@ -3119,7 +3154,7 @@ LCGPackage_Add(
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} ${pip_home}/bin/pip install --no-deps --prefix=<INSTALL_DIR>
<SOURCE_DIR>/tensorflow${packsuffix}-${tensorflow_native_version}-${pyversion}-${pylibversion}-${pyarch}.whl
<SOURCE_DIR>/tensorflow${packsuffix}-${tensorflow_native_version}-${pyversion}-${pylibversion}-${pyarch}.whl
BUILD_IN_SOURCE 1
DEPENDS Python setuptools pip numpy six wheel mock tensorboard absl_py keras_applications keras_preprocessing
IF Python_native_version VERSION_LESS 3 THEN enum34 ENDIF
......@@ -3458,8 +3493,10 @@ LCGPackage_Add(
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/google_auth/__init__.py <INSTALL_DIR>/lib/python${Python_config_version_twodigit}/site-packages/google/
BUILD_IN_SOURCE 1
DEPENDS Python setuptools cachetools pyasn1_modules rsa six
REVISION 1
)
#---oauthlib--------------------------------------------------------------------
......@@ -3648,7 +3685,7 @@ LCGPackage_Add(
torchvision
URL ${GenURL}/torchvision-${torchvision_native_version}.tar.gz
ENVIRONMENT
LD_LIBRARY_PATH=${torch_home}/lib/python${Python_config_version_twodigit}/site-packages/torch/lib:${FORTRAN_LIBRARY_DIR}:\${LD_LIBRARY_PATH}
LD_LIBRARY_PATH=${torch_home}/lib/python${Python_config_version_twodigit}/site-packages/torch/lib:${FORTRAN_LIBRARY_DIR}:\$ENV{LD_LIBRARY_PATH}
IF DEFINED cuda_native_version THEN
FORCE_CUDA=1
CUDA_HOME=${cuda_home}
......@@ -3661,3 +3698,30 @@ LCGPackage_Add(
BUILD_IN_SOURCE 1
DEPENDS torch pillow six
)
#---pyshp-----------------------------------------------------------------------------
LCGPackage_Add(
pyshp
URL ${GenURL}/pyshp-${pyshp_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS setuptools
)
#---cartopy---------------------------------------------------------------------------
LCGPackage_Add(
cartopy
URL ${GenURL}/Cartopy-${cartopy_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
ENVIRONMENT CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS setuptools numpy cython geos shapely proj six pyshp
)
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
--- ./server2/ppserver.orig 2019-08-19 15:28:53.000000000 +0200
+++ ./server2/ppserver 2019-08-19 15:29:58.000000000 +0200
@@ -55,7 +55,7 @@
copyright = """Copyright (c) 2005-2012 Vitalii Vanovschi.
Copyright (c) 2015-2016 California Institute of Technology.
Copyright (c) 2016-2019 The Uncertainty Quantification Foundation."""
-__version__ = version = "1.6.4.8"
+__version__ = version = "1.6.4.9"
LISTEN_SOCKET_TIMEOUT = 20
--- ./server3/ppserver.orig 2019-08-19 15:29:01.000000000 +0200
+++ ./server3/ppserver 2019-08-19 15:30:15.000000000 +0200
@@ -56,7 +56,7 @@
copyright = """Copyright (c) 2005-2012 Vitalii Vanovschi.
Copyright (c) 2015-2016 California Institute of Technology.
Copyright (c) 2016-2019 The Uncertainty Quantification Foundation."""
-__version__ = version = "1.6.4.8"
+__version__ = version = "1.6.4.9"
LISTEN_SOCKET_TIMEOUT = 20
--- simplejson/ordered_dict.py.orig 2019-07-09 16:40:15.483599211 +0200
+++ simplejson/ordered_dict.py 2019-07-09 16:40:45.215876713 +0200
@@ -2,8 +2,13 @@
http://code.activestate.com/recipes/576693/
+With Python3 fix from https://github.com/flask-restful/flask-restful/pull/231
+
"""
-from UserDict import DictMixin
+try:
+ from UserDict import DictMixin
+except ImportError:
+ from collections import MutableMapping as DictMixin
class OrderedDict(dict, DictMixin):
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)