From 4b8da92b7d00de03c55a90e47a5d3bccae9e5fe3 Mon Sep 17 00:00:00 2001 From: Alexander Van Craen Date: Fri, 17 Jan 2025 14:06:06 +0100 Subject: [PATCH 1/3] add functionality to install some header files --- src/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 713ddd4c..90780a0e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -245,10 +245,16 @@ endif() # target_compile_options(discotec PUBLIC $<$,$>:-mmic>) #endif() +file(GLOB_RECURSE DISCOTEC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) #TODO: @freifrauvonbleifrei: which files should be included? Do we keep the same structure as in the sources? + +message(STATUS "DisCoTec headers: ${DISCOTEC_HEADERS}") + +set_target_properties(discotec PROPERTIES PUBLIC_HEADER "${DISCOTEC_HEADERS}") + install(TARGETS discotec EXPORT discotecTargets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin - INCLUDES DESTINATION include + PUBLIC_HEADER DESTINATION include ) From 41e67bc9cae9471d65e612bb7e1bdf614c3b3640 Mon Sep 17 00:00:00 2001 From: Freifrau von Bleifrei Date: Tue, 21 Jan 2025 09:15:00 +0900 Subject: [PATCH 2/3] Jenkinsfile: higher timeout to compensate increase in spack time --- .jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 300c38e2..137c5190 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { artifactNumToKeepStr: "100" ) ) - timeout(time: 3, unit: 'HOURS') + timeout(time: 5, unit: 'HOURS') disableConcurrentBuilds() } environment { From 46514ddfb4b0371faf25f6924ed5d98c5aef2653 Mon Sep 17 00:00:00 2001 From: Freifrau von Bleifrei Date: Tue, 28 Jan 2025 10:26:09 +0900 Subject: [PATCH 3/3] Jenkins: steal changes from other branch (#147) make CI run again by fixing spack version Co-authored-by: Theresa Pollinger --- .jenkins/Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 137c5190..d84c08ce 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -30,8 +30,11 @@ pipeline { retry(count: 2) { dir('discotec-spack') { sh ''' - git -C spack pull || git clone git@github.com:spack/spack.git + echo "SPACK_USER_CACHE_PATH: ${SPACK_USER_CACHE_PATH}" + git clone git@github.com:spack/spack.git || true cd spack + # use old spack release version + git checkout v0.21.3 # reset compilers and external packages due to possible different systems rm -f ~/.spack/bootstrap/config/packages.yaml rm -f ~/.spack/linux/compilers.yaml @@ -71,7 +74,6 @@ pipeline { stage('build dependencies w/ spack') { steps { withEnv(['SPACK_USER_CACHE_PATH=$TMP/spack/','SPACK_DISABLE_LOCAL_CONFIG=true']) { - retry(count: 2) { dir('discotec-spack/spack') { sh ''' @@ -85,7 +87,7 @@ pipeline { # spack install zlib # spack load zlib spack spec -y discotec@main -lto %${compiler} ^${mpiimpl} # +selalib # --only dependencies # actually build discotec, such that load command will work - spack install -y discotec@main -lto %${compiler} ^${mpiimpl} # +selalib # --only dependencies # actually build discotec, such that load command will work + spack --debug install -y discotec@main -lto %${compiler} ^${mpiimpl} # +selalib # --only dependencies # actually build discotec, such that load command will work spack install -y lz4 %${compiler} ''' }