Commit b1614263 authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Merge branch 'arm' into 'master'

Arm (Aarch64)

See merge request !249
parents 5ff8e7ca 2604414e
Pipeline #1255519 passed with stage
in 4 minutes and 51 seconds
#---List of externals----------------------------------------------
set(LCG_PYTHON_VERSION 2)
include(${CMAKE_CURRENT_LIST_DIR}/heptools-dev-base.cmake)
include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(${CMAKE_CURRENT_LIST_DIR}/heptools-dev-generators.cmake)
include(heptools-dev-generators)
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
......
#---List of externals----------------------------------------------
set(LCG_PYTHON_VERSION 2)
include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT 6.18.04)
LCG_external_package(hepmc3 3.1.1 )
LCG_external_package(VecGeom master GIT=https://gitlab.cern.ch/VecGeom/VecGeom.git )
#---There are a number of packages not supported with ARM64--------
LCG_remove_package(arrow)
LCG_remove_package(catboost)
LCG_remove_package(cpymad)
LCG_remove_package(llvmlite)
LCG_remove_package(numba)
LCG_remove_package(pyarrow)
LCG_remove_package(pystan)
LCG_remove_package(tensorflow)
LCG_remove_package(dcap)
LCG_remove_package(gfal)
LCG_remove_package(srm_ifce)
LCG_remove_package(hydjet)
#---Removed to avoid to run their tests----------------------------
LCG_remove_package(COOL)
LCG_remove_package(CORAL)
#---Overwrites of versions
LCG_external_package(blas 3.8.0.netlib)
LCG_external_package(libtool 2.4.6 )
#---Define the top level packages for this stack-------------------
LCG_top_packages(Geant4 ROOT CMake evtgen pythia8 lcgenv rangev3 cppgsl CppUnit QMtest nose gperftools six networkx ninja xenv
RELAX eigen vectorclass lxml rivet fastjet)
......@@ -796,7 +796,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
else()
set(tbb_build_options CPLUS=${CMAKE_CXX_COMPILER} CONLY=${CMAKE_C_COMPILER})
endif()
set(tbb_build_options ${tbb_build_options} CXXFLAGS=-mno-rtm)
if(NOT LCG_ARCH MATCHES "aarch64")
set(tbb_build_options ${tbb_build_options} CXXFLAGS=-mno-rtm)
endif()
LCGPackage_Add(
tbb
......@@ -1097,9 +1099,11 @@ if(blas_native_version)
LCGPackage_Add(
blas
URL ${GenURL}/blas-${blas_version}.tgz
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
INSTALL_COMMAND ${MAKE} install
IF NOT APPLE THEN COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/lib ${CMAKE_COMMAND} -E create_symlink libblas.so.3 libblas.so ENDIF
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND ${MAKE} all
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/blas_LINUX.a <INSTALL_DIR>/lib/libBLAS.a
BUILD_IN_SOURCE 1
REVISION 1
)
set(BLASLIB "${blas_home}/lib/libBLAS.a")
......@@ -1295,7 +1299,7 @@ endif()
LCGPackage_Add(
gnuplot
URL ${GenURL}/gnuplot-${gnuplot_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> ${with_qt_flag}
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> ${with_qt_flag} --with-texdir=<INSTALL_DIR>/tex/latex/gnuplot
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
......@@ -1920,7 +1924,7 @@ LCGPackage_Add(
)
#----protobuf-------------------------------------------------------------------
#----protobuf-------------------------------------------------------------------
LCGPackage_Add(
protobuf
URL ${GenURL}/protobuf-${protobuf_native_version}.tar.gz
......@@ -2167,7 +2171,7 @@ LCGPackage_Add(
LCGPackage_Add(
go
URL ${GenURL}/go${go_native_version}.tar.gz
ENVIRONMENT GOROOT_BOOTSTRAP=/cvmfs/sft.cern.ch/lcg/contrib/go/latest/x86_64-${LCG_OS}${LCG_OSVERS}
ENVIRONMENT GOROOT_BOOTSTRAP=/cvmfs/sft.cern.ch/lcg/contrib/go/latest/${LCG_ARCH}-${LCG_OS}${LCG_OSVERS}
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR>/src bash ./make.bash
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR> <INSTALL_DIR>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
--- hadoop-common-project/hadoop-common/src/JNIFlags.cmake.orig 2019-08-20 17:45:24.070529269 +0200
+++ hadoop-common-project/hadoop-common/src/JNIFlags.cmake 2019-08-20 17:45:46.444138559 +0200
@@ -91,6 +91,7 @@
"${_JAVA_HOME}/jre/lib/${_java_libarch}"
"${_JAVA_HOME}/jre/lib/*"
"${_JAVA_HOME}/jre/lib"
+ "${_JAVA_HOME}/lib/${_java_libarch}/*"
"${_JAVA_HOME}/lib/*"
"${_JAVA_HOME}/lib"
"${_JAVA_HOME}/include/*"
--- hadoop-common-project/hadoop-annotations/pom.xml.orig 2019-08-21 12:25:21.159115254 +0200
+++ hadoop-common-project/hadoop-annotations/pom.xml 2019-08-21 12:26:06.259322854 +0200
@@ -50,7 +50,7 @@
<artifactId>jdk.tools</artifactId>
<version>1.7</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
@@ -65,7 +65,7 @@
<artifactId>jdk.tools</artifactId>
<version>1.8</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
--- pom.xml.orig 2019-06-21 14:48:09.000000000 +0200
+++ pom.xml 2019-08-22 11:21:40.357333005 +0200
@@ -33,6 +33,40 @@
</exclusions>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk1.7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ <version>1.7</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jdk1.8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ <version>1.8</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -60,6 +94,7 @@
<name>XrdUtils</name>
</sysLib>
</sysLibs>
+ <name>g++</name>
</linker>
<libraries>
<library>
......@@ -20,3 +20,14 @@
}
unw_init_local2_flags_t;
--- include/libunwind-aarch64.h.orig 2019-07-11 16:03:35.771977638 +0200
+++ include/libunwind-aarch64.h 2019-07-11 16:05:20.124812141 +0200
@@ -154,7 +154,7 @@
UNW_TDEP_IP = UNW_AARCH64_X30,
UNW_TDEP_SP = UNW_AARCH64_SP,
- UNW_TDEP_EH = UNW_AARCH64_X0,
+ UNW_TDEP_EH = UNW_AARCH64_X0
}
aarch64_regnum_t;
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -1405,6 +1405,7 @@ endforeach()
LCGPackage_Add(
rapidsim
URL ${gen_url}/RapidSim-<NATIVE_VERSION>.tar.gz
IF LCG_ARCH STREQUAL "aarch64" THEN PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/rapidsim-1.4.4-arm.patch ENDIF
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DROOTSYS=${ROOT_home}
IF (${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 8) THEN
......@@ -1449,9 +1450,11 @@ endif()
#---QD------------------------------------------------------------------------------------------
LCGPackage_Add(
qd
URL ${gen_url}/qd-${qd_native_version}.tar.gz
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/qd-<NATIVE_VERSION> <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/<NATIVE_VERSION>
URL ${gen_url}/qd-${qd_native_version}.tar.gz
IF NOT LCG_ARCH MATCHES "aarch64" THEN
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/qd-<NATIVE_VERSION> <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/<NATIVE_VERSION>
ENDIF
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-shared
......@@ -1522,7 +1525,12 @@ LCGPackage_Add(
IF <VERSION> VERSION_LESS 2.0.0 THEN
BUILD_COMMAND ./openloops libinstall ppll ppllj pplljj ppln pplnj pplnjj pptt ppttj ppttjj pptj pptjj ppjj ppjjj ppjjjj ppaa ppaaj ppaajj ppw ppwj ppwjj ppz ppzj ppzjj
ELSE
BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj ppaaj2 pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh ppllnnjj_ew ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew
IF NOT LCG_ARCH MATCHES "aarch64" THEN
BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj ppaaj2 pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh ppllnnjj_ew ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew
ELSE
#ppaaj2 and ppllnnjj_ew commented out for now; causes error - process: ppllnnjj_ew ... ERROR: not available;
BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj #[[ppaaj2]] pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh #[[ppllnnjj_ew]] ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew
ENDIF
ENDIF
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/process_obj
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/process_src
......@@ -2880,6 +2888,7 @@ LCGPackage_Add(
LCGPackage_Add(
hto4l
URL ${gen_url}/Hto4l-v<NATIVE_VERSION>.tar.bz2
IF LCG_ARCH STREQUAL "aarch64" THEN PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/hto4l-<NATIVE_VERSION>-aarch64.patch ENDIF
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND ${MAKE} GSL_HOME=${GSL_home}
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/bin
......
......@@ -66,6 +66,7 @@ set(gosam_v_home <gosam-<herwig3_<VERSION>_gosam>_home>)
LCGPackage_Add(
herwig3
URL ${gen_url}/Herwig-<NATIVE_VERSION>.tar.bz2
IF LCG_ARCH STREQUAL "aarch64" THEN PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/herwig3-<NATIVE_VERSION>-aarch64.patch ENDIF
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/tmppdfsets
COMMAND ${lhapdf_v_home}/bin/lhapdf --pdfdir=<INSTALL_DIR>/tmppdfsets --source=/cvmfs/sft.cern.ch/lcg/external/lhapdfsets/current --listdir=/cvmfs/sft.cern.ch/lcg/external/lhapdfsets/current install MMHT2014lo68cl MMHT2014nlo68cl
COMMAND autoreconf --force --install
......
This diff is collapsed.
This diff is collapsed.
......@@ -27,3 +27,22 @@
## find packages
SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" CACHE PATH "Module Path" FORCE)
--- src/CRMCtrapfpe.c.orig 2019-08-07 16:24:29.088860303 +0200
+++ src/CRMCtrapfpe.c 2019-08-07 16:25:23.293306947 +0200
@@ -3,6 +3,8 @@
// skip compilation on MacOSX platform
#ifndef __APPLE__
+// skip compilation on ARM platform
+#ifndef __aarch64__
//
// from: http://www.fortran-2000.com/ArnaudRecipes/CompilerTricks.html
@@ -37,4 +39,6 @@
#endif
+#endif
+
#endif
......@@ -27,3 +27,23 @@
## find packages
SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" CACHE PATH "Module Path" FORCE)
--- src/CRMCtrapfpe.c.orig 2019-08-07 15:46:08.433534723 +0200
+++ src/CRMCtrapfpe.c 2019-08-07 15:47:21.012475280 +0200
@@ -3,6 +3,8 @@
// skip compilation on MacOSX platform
#ifndef __APPLE__
+// skip compilation on ARM platform
+#ifndef __aarch64__
//
// from: http://www.fortran-2000.com/ArnaudRecipes/CompilerTricks.html
@@ -37,4 +39,6 @@
#endif
+#endif
+
#endif
......@@ -27,3 +27,23 @@
## find packages
SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" CACHE PATH "Module Path" FORCE)
--- src/CRMCtrapfpe.c.orig 2019-08-07 15:28:46.364745824 +0200
+++ src/CRMCtrapfpe.c 2019-08-07 15:24:27.137816174 +0200
@@ -3,6 +3,7 @@
// skip compilation on MacOSX platform
#ifndef __APPLE__
+#ifndef __aarch64__
//
// from: http://www.fortran-2000.com/ArnaudRecipes/CompilerTricks.html
@@ -37,4 +38,6 @@
#endif
+#endif
+
#endif
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment