From 4b8e58962f7c410d27a917118bec707cc545ef67 Mon Sep 17 00:00:00 2001 From: Dmitri Date: Tue, 3 Jul 2018 13:08:22 +0200 Subject: [PATCH] dropping blackhat as sherpa dependency, toolchains updated --- cmake/toolchain/heptools-dev-generators.cmake | 1 - .../heptools-dev-generatorspython3.cmake | 1 - .../heptools-experimentalpython3.cmake | 1 - cmake/toolchain/heptools-genserrelease.cmake | 1 - generators/CMakeLists.txt | 18 ++++++------------ 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake index 9fff046be..18b60be18 100644 --- a/cmake/toolchain/heptools-dev-generators.cmake +++ b/cmake/toolchain/heptools-dev-generators.cmake @@ -123,7 +123,6 @@ LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/cmake/toolchain/heptools-dev-generatorspython3.cmake b/cmake/toolchain/heptools-dev-generatorspython3.cmake index a92cee433..e8958ac91 100644 --- a/cmake/toolchain/heptools-dev-generatorspython3.cmake +++ b/cmake/toolchain/heptools-dev-generatorspython3.cmake @@ -82,7 +82,6 @@ LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/cmake/toolchain/heptools-experimentalpython3.cmake b/cmake/toolchain/heptools-experimentalpython3.cmake index 8d73e12c3..88050f8dd 100644 --- a/cmake/toolchain/heptools-experimentalpython3.cmake +++ b/cmake/toolchain/heptools-experimentalpython3.cmake @@ -356,7 +356,6 @@ LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc61")) LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.0 ${MCGENPATH}/sherpa-mpich2 author=2.2.0 hepevt=10000 lhapdf=6.1.6) -LCG_external_package(sherpa 2.2.0.blackhat ${MCGENPATH}/sherpa author=2.2.0 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(sherpa 2.2.0 ${MCGENPATH}/sherpa author=2.2.0 hepevt=10000) diff --git a/cmake/toolchain/heptools-genserrelease.cmake b/cmake/toolchain/heptools-genserrelease.cmake index 659884072..4640d8029 100644 --- a/cmake/toolchain/heptools-genserrelease.cmake +++ b/cmake/toolchain/heptools-genserrelease.cmake @@ -266,7 +266,6 @@ LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT ${LCG_HOST_ARCH} STREQUAL i686) LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.1.1 ${MCGENPATH}/sherpa-mpich2 author=2.1.1 hepevt=10000) -LCG_external_package(sherpa 2.2.0.blackhat ${MCGENPATH}/sherpa author=2.2.0 hepevt=10000 lhapdf=6.1.4) endif() LCG_external_package(hepmcanalysis 3.4.14 ${MCGENPATH}/hepmcanalysis author=00-03-04-14 CLHEP=2.2.0.4 ) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 6a6e6eda3..d84b6ccb7 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1522,9 +1522,6 @@ LCGPackage_Add( --enable-hepmc2=${HepMC_home} --enable-openloops=. --enable-lhole - IF MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN - --enable-blackhat=${blackhat_home} - ENDIF IF NOT VERSION_LESS 2.2.1 THEN --enable-fastjet=${fastjet_home} ENDIF @@ -1552,7 +1549,6 @@ LCGPackage_Add( DEPENDS lhapdf-_lhapdf> HepMC IF NOT APPLE THEN sqlite ENDIF IF NOT VERSION_LESS 2.2.1 THEN fastjet ENDIF - IF MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN blackhat ENDIF ) #---Sherpa with MPI support------------------------------------------------------------------------------------------ @@ -1565,7 +1561,6 @@ if(${Python_native_version} VERSION_LESS 3) --enable-pythia --enable-hepevtsize=_hepevt> --enable-lhapdf=_lhapdf>_home> --enable-hepmc2=${HepMC_home} - --enable-blackhat=${blackhat_home} --enable-openloops=. --enable-lhole --enable-mpi @@ -1586,10 +1581,10 @@ if(${Python_native_version} VERSION_LESS 3) "CFLAGS=-O2 -g0" "CXXFLAGS=-O2 -g0" ENDIF "FFLAGS=-O2 -g0" PATH=${openmpi_home}/bin:$ENV{PATH} ${library_path}=${openmpi_home}/lib:$ENV{${library_path}} LIBRARY_PATH=${openmpi_home}/lib - BUILD_COMMAND ${MAKE} PATH=${openmpi_home}/bin:$ENV{PATH} LIBRARY_PATH=_lhapdf>_home>/lib ${library_path}=${openmpi_home}/lib:${blackhat_home}/lib:$ENV{${library_path}} CPPFLAGS=-I${Boost_home_include} - INSTALL_COMMAND make install LIBRARY_PATH=_lhapdf>_home>/lib PATH=${openmpi_home}/bin:$ENV{PATH} ${library_path}=${openmpi_home}/lib:${blackhat_home}/lib:$ENV{${library_path}} + BUILD_COMMAND ${MAKE} PATH=${openmpi_home}/bin:$ENV{PATH} LIBRARY_PATH=_lhapdf>_home>/lib ${library_path}=${openmpi_home}/lib:$ENV{${library_path}} CPPFLAGS=-I${Boost_home_include} + INSTALL_COMMAND make install LIBRARY_PATH=_lhapdf>_home>/lib PATH=${openmpi_home}/bin:$ENV{PATH} ${library_path}=${openmpi_home}/lib:$ENV{${library_path}} BUILD_IN_SOURCE 1 - DEPENDS lhapdf-_lhapdf> HepMC openmpi blackhat + DEPENDS lhapdf-_lhapdf> HepMC openmpi IF NOT APPLE THEN sqlite ENDIF ) endif() @@ -1603,7 +1598,6 @@ if(${Python_native_version} VERSION_LESS 3) --enable-pythia --enable-hepevtsize=_hepevt> --enable-lhapdf=_lhapdf>_home> --enable-hepmc2=${HepMC_home} - --enable-blackhat=${blackhat_home} --enable-openloops=. --enable-lhole --enable-mpi @@ -1624,10 +1618,10 @@ if(${Python_native_version} VERSION_LESS 3) "CFLAGS=-O2 -g0" "CXXFLAGS=-O2 -g0" ENDIF "FFLAGS=-O2 -g0 -fPIC" CC=mpicc CXX=mpic++ PATH=${mpich2_home}/bin:$ENV{PATH} ${library_path}=${mpich2_home}/lib:$ENV{${library_path}} LIBRARY_PATH=${mpich2_home}/lib - BUILD_COMMAND ${MAKE} PATH=${mpich2_home}/bin:$ENV{PATH} LIBRARY_PATH=_lhapdf>_home>/lib ${library_path}=${mpich2_home}/lib:${blackhat_home}/lib:$ENV{${library_path}} CPPFLAGS=-I${Boost_home_include} - INSTALL_COMMAND make install LIBRARY_PATH=_lhapdf>_home>/lib PATH=${mpich2_home}/bin:$ENV{PATH} ${library_path}=${mpich2_home}/lib:${blackhat_home}/lib:$ENV{${library_path}} + BUILD_COMMAND ${MAKE} PATH=${mpich2_home}/bin:$ENV{PATH} LIBRARY_PATH=_lhapdf>_home>/lib ${library_path}=${mpich2_home}/lib:$ENV{${library_path}} CPPFLAGS=-I${Boost_home_include} + INSTALL_COMMAND make install LIBRARY_PATH=_lhapdf>_home>/lib PATH=${mpich2_home}/bin:$ENV{PATH} ${library_path}=${mpich2_home}/lib:$ENV{${library_path}} BUILD_IN_SOURCE 1 - DEPENDS lhapdf-_lhapdf> HepMC sqlite mpich2 blackhat + DEPENDS lhapdf-_lhapdf> HepMC sqlite mpich2 ) endif() -- GitLab