Skip to content

Commit

Permalink
Merge pull request #128 from PrincetonUniversity/devel
Browse files Browse the repository at this point in the history
SPECFEM++ 0.2.0 release - RC
  • Loading branch information
Rohit-Kakodkar authored Nov 4, 2024
2 parents d199e41 + fc8d4b5 commit 3c9fffb
Show file tree
Hide file tree
Showing 1,411 changed files with 256,601 additions and 20,735 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
run: git submodule init
&& git submodule update
- name: Configure
run: cmake -S . -B build -DBUILD_TESTS=ON
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Release -D BUILD_TESTS=ON
- name: Build
run: cmake --build build
- name: Run all tests
run: cd build/tests/unit-tests
&& ctest
&& ctest --verbose
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ examples/*/Par_File
*.sqlite
*.nsys-rep
*.ncu-rep
.snakemake/
autotuning/
profiles
.cache/
133 changes: 0 additions & 133 deletions .jenkins/compiler_checks.gvy

This file was deleted.

101 changes: 101 additions & 0 deletions .jenkins/gnu_compiler_checks.gvy
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
pipeline{
agent {
node {
label 'della_rk9481'
}
}
stages{
stage( ' Load git modules ' ){
steps {
echo ' Getting git submodules '
sh 'git submodule init'
sh 'git submodule update'
}
}
stage(' GNU Host Compiler Check '){
matrix {
axes {
axis{
name 'GNUCompiler'
values 'GCC8;gcc/8', 'GCC13;gcc-toolset/13'
}
axis{
name 'SIMD'
values 'SIMD_NONE;-DENABLE_SIMD=OFF', 'SIMD_NATIVE;-DENABLE_SIMD=ON -DKokkos_ARCH_NATIVE=ON -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON'
}
axis{
name 'HostSpace'
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
}
}
stages {
stage ('Build and Clean '){
environment {
// CMAKE build flags
GNU_COMPILER_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${GNUCompiler}"'
).trim()}"""
GNU_COMPILER_MODULE = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${GNUCompiler}"'
).trim()}"""
CMAKE_HOST_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${HostSpace}"'
).trim()}"""
CMAKE_HOST_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${HostSpace}"'
).trim()}"""
HOST_RUN_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f3 <<<"${HostSpace}"'
).trim()}"""
SIMD_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${SIMD}"'
).trim()}"""
SIMD_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${SIMD}"'
).trim()}"""
}
stages {
stage (' Build '){
steps {
echo "Building ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} with ${GNU_COMPILER_NAME}"
sh """
module load boost/1.73.0
module load ${GNU_COMPILER_MODULE}
cmake3 -S . -B build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} -DBUILD_TESTS=ON
cmake3 --build build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}
"""
echo ' Build completed '
}
}
stage (' Test '){
steps {
echo ' Testing '
sh """
module load boost/1.73.0
module load ${GNU_COMPILER_MODULE}
cd build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}/tests/unit-tests
srun -N 1 -t 00:20:00 ${HOST_RUN_FLAGS} --constraint=skylake bash -c 'export OMP_PROC_BIND=spread; export OMP_THREADS=places; ctest --verbose;'
"""
echo ' Testing completed '
}
}
}
post {
always {
echo ' Cleaning '
sh "rm -rf build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}"
}
}
}
}
}
}
}
}
102 changes: 102 additions & 0 deletions .jenkins/intel_compiler_checks.gvy
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
pipeline{
agent {
node {
label 'della_rk9481'
}
}
stages{
stage( ' Load git modules ' ){
steps {
echo ' Getting git submodules '
sh 'git submodule init'
sh 'git submodule update'
}
}
stage(' Intel Host Compiler Check '){
matrix {
axes {
axis{
name 'IntelCompiler'
values 'ICC2022;intel/2022.2.0', 'ICC2024;intel/2024.0.2'
}
axis{
name 'HostSpace'
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
}
axis{
name 'SIMD'
values 'SIMD_NONE;-DENABLE_SIMD=OFF', 'SIMD_NATIVE;-DENABLE_SIMD=ON -DKokkos_ARCH_NATIVE=ON -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON'
}
}
stages {
stage ('Build and Clean '){
environment {
INTEL_COMPILER_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${IntelCompiler}"'
).trim()}"""
INTEL_MODULE = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${IntelCompiler}"'
).trim()}"""
CMAKE_HOST_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${HostSpace}"'
).trim()}"""
CMAKE_HOST_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${HostSpace}"'
).trim()}"""
HOST_RUN_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f3 <<<"${HostSpace}"'
).trim()}"""
SIMD_NAME = """${sh(
returnStdout: true,
script: 'cut -d";" -f1 <<<"${SIMD}"'
).trim()}"""
SIMD_FLAGS = """${sh(
returnStdout: true,
script: 'cut -d";" -f2 <<<"${SIMD}"'
).trim()}"""
}
stages {
stage (' Build '){
steps {
echo "Building ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} with ${INTEL_COMPILER_NAME}"
sh """
module load boost/1.73.0
module load ${INTEL_MODULE}
export CC=icx
export CXX=icpx
cmake3 -S . -B build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} -D BUILD_TESTS=ON
cmake3 --build build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}
"""
echo ' Build completed '
}
}
stage (' Test '){
steps {
echo ' Testing '
sh """
module load boost/1.73.0
module load ${INTEL_MODULE}
cd build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}/tests/unit-tests
srun -N 1 -t 00:20:00 ${HOST_RUN_FLAGS} --constraint=skylake bash -c 'export OMP_PROC_BIND=spread; export OMP_THREADS=places; ctest --verbose;'
"""
echo ' Testing completed '
}
}
}
post {
always {
echo ' Cleaning '
sh "rm -rf build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}"
}
}
}
}
}
}
}
}
Loading

0 comments on commit 3c9fffb

Please sign in to comment.