Skip to content

Commit 4fc63c1

Browse files
authored
Merge pull request #468 from PrincetonUniversity/devel
v0.3.0
2 parents 78365e2 + c5d4792 commit 4fc63c1

1,725 files changed

Lines changed: 216224 additions & 16873 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,32 @@ about: Create a report to help us improve
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

10-
**Describe the bug**
11-
A clear and concise description of what the bug is.
9+
## Expected behavior
10+
A clear and concise description of what you expected to happen.
11+
12+
## Actual (buggy) behavior
13+
A clear and concise description of what is happening instead.
1214

13-
**To Reproduce**
15+
## Screenshots
16+
17+
If applicable, add screenshots to help explain your problem.
18+
19+
## Setup information:
1420

1521
- Installation instructions:
1622
```
17-
Please paste the cmake configuration command here
23+
Please paste the cmake configuration command here
1824
```
1925

20-
**Expected behavior**
21-
A clear and concise description of what you expected to happen.
26+
## Machine information:
2227

23-
**Screenshots**
24-
If applicable, add screenshots to help explain your problem.
28+
[please complete the following information:]
2529

26-
**Machine information (please complete the following information):**
2730
- OS: [e.g. Redhat]
2831
- GPU available: [e.g. Yes (NVIDIA A100)]
2932

30-
**Additional context**
33+
## Additional context
34+
3135
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@ assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
10+
## Is your feature request related to a problem?
1111
A clear and concise description of what the problem is.
1212

13-
**Describe the solution you'd like**
13+
## Describe the solution you'd like
14+
1415
A clear and concise description of what you want to happen.
1516

16-
**Additional context**
17+
## Additional context
18+
1719
Add any other context or screenshots about the feature request here.
20+
21+
If this feature request helps with an existing issue, please link the issue here.
22+
E.g. #<issue number>

.github/pull_request_template.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Description
1+
## Description
22

3-
Please describe the changes/features in this pull request.
3+
Please describe the changes/features in this pull request.
44

5-
# Issue Number
5+
## Issue Number
66

77
If there is an issue created for these changes, link it here
88

9-
# Checklist
9+
## Checklist
1010

11-
Please make sure to check developer documentation on specfem docs.
11+
Please make sure to check developer documentation on specfem docs.
1212

13-
[] I ran the code through pre-commit to check style
14-
[] My code passes all the integration tests
15-
[] I have added sufficient unittests to test my changes
16-
[] I have added/updated documentation for the changes I am proposing
17-
[] I have updated CMakeLists to ensure my code builds
18-
[] My code builds across all platforms
13+
- [ ] I ran the code through pre-commit to check style
14+
- [ ] My code passes all the integration tests
15+
- [ ] I have added sufficient unittests to test my changes
16+
- [ ] I have added/updated documentation for the changes I am proposing
17+
- [ ] I have updated CMakeLists to ensure my code builds
18+
- [ ] My code builds across all platforms

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ firebase*.yml
88
*.out
99
debug.sh
1010
output.log
11+
output.txt
1112
results/
1213
timing.sh
1314
examples/*/*_config.yaml

.jenkins/gnu_compiler_checks.gvy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pipeline{
2525
}
2626
axis{
2727
name 'HostSpace'
28-
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
28+
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 1 -c 10'
2929
}
3030
}
3131
stages {
@@ -66,10 +66,10 @@ pipeline{
6666
steps {
6767
echo "Building ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} with ${GNU_COMPILER_NAME}"
6868
sh """
69-
module load boost/1.73.0
69+
module load boost/1.85.0
7070
module load ${GNU_COMPILER_MODULE}
71-
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
72-
cmake3 --build build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}
71+
cmake3 -S . -B build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} -DBUILD_TESTS=ON -D BUILD_EXAMPLES=OFF
72+
cmake3 --build build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}
7373
"""
7474
echo ' Build completed '
7575
}
@@ -78,9 +78,9 @@ pipeline{
7878
steps {
7979
echo ' Testing '
8080
sh """
81-
module load boost/1.73.0
81+
module load boost/1.85.0
8282
module load ${GNU_COMPILER_MODULE}
83-
cd build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}/tests/unit-tests
83+
cd build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}/tests/unit-tests
8484
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;'
8585
"""
8686
echo ' Testing completed '
@@ -90,7 +90,7 @@ pipeline{
9090
post {
9191
always {
9292
echo ' Cleaning '
93-
sh "rm -rf build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}"
93+
sh "rm -rf build_cpu_${GNU_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}"
9494
}
9595
}
9696
}

.jenkins/intel_compiler_checks.gvy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline{
2121
}
2222
axis{
2323
name 'HostSpace'
24-
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
24+
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 1 -c 10'
2525
}
2626
axis{
2727
name 'SIMD'
@@ -65,12 +65,12 @@ pipeline{
6565
steps {
6666
echo "Building ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} with ${INTEL_COMPILER_NAME}"
6767
sh """
68-
module load boost/1.73.0
68+
module load boost/1.85.0
6969
module load ${INTEL_MODULE}
7070
export CC=icx
7171
export CXX=icpx
72-
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
73-
cmake3 --build build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}
72+
cmake3 -S . -B build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${SIMD_FLAGS} -D BUILD_TESTS=ON -D BUILD_EXAMPLES=OFF
73+
cmake3 --build build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}
7474
"""
7575
echo ' Build completed '
7676
}
@@ -79,9 +79,9 @@ pipeline{
7979
steps {
8080
echo ' Testing '
8181
sh """
82-
module load boost/1.73.0
82+
module load boost/1.85.0
8383
module load ${INTEL_MODULE}
84-
cd build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}/tests/unit-tests
84+
cd build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}/tests/unit-tests
8585
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;'
8686
"""
8787
echo ' Testing completed '
@@ -91,7 +91,7 @@ pipeline{
9191
post {
9292
always {
9393
echo ' Cleaning '
94-
sh "rm -rf build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}"
94+
sh "rm -rf build_cpu_${INTEL_COMPILER_NAME}_${CMAKE_HOST_NAME}_${SIMD_NAME}_${env.BUILD_TAG}"
9595
}
9696
}
9797
}

.jenkins/nvidia_compiler_checks.gvy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline{
2121
}
2222
axis{
2323
name 'HostSpace'
24-
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
24+
values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON; -n 1 -c 10'
2525
}
2626
axis{
2727
name 'DeviceSpace'
@@ -81,10 +81,10 @@ pipeline{
8181
steps {
8282
echo "Building ${CMAKE_HOST_FLAGS} ${CMAKE_DEVICE_FLAGS} ${SIMD_FLAGS} with ${CUDA_COMPILER_NAME}"
8383
sh """
84-
module load boost/1.73.0
84+
module load boost/1.85.0
8585
module load ${CUDA_MODULE}
86-
cmake3 -S . -B build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.GIT_COMMIT} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${CMAKE_DEVICE_FLAGS} ${SIMD_FLAGS} -D BUILD_TESTS=ON
87-
cmake3 --build build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}
86+
cmake3 -S . -B build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.BUILD_TAG} -DCMAKE_BUILD_TYPE=Release ${CMAKE_HOST_FLAGS} ${CMAKE_DEVICE_FLAGS} ${SIMD_FLAGS} -D BUILD_TESTS=ON -D BUILD_EXAMPLES=OFF
87+
cmake3 --build build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.BUILD_TAG}
8888
"""
8989
echo ' Build completed '
9090
}
@@ -93,9 +93,9 @@ pipeline{
9393
steps {
9494
echo ' Testing '
9595
sh """
96-
module load boost/1.73.0
96+
module load boost/1.85.0
9797
module load ${CUDA_MODULE}
98-
cd build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}/tests/unit-tests
98+
cd build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.BUILD_TAG}/tests/unit-tests
9999
srun -N 1 -t 00:20:00 ${HOST_RUN_FLAGS} ${DEVICE_RUN_FLAGS} bash -c 'export OMP_PROC_BIND=spread; export OMP_THREADS=places; ctest --verbose;'
100100
"""
101101
echo ' Testing completed '
@@ -105,7 +105,7 @@ pipeline{
105105
post {
106106
always {
107107
echo ' Cleaning '
108-
sh "rm -rf build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.GIT_COMMIT}"
108+
sh "rm -rf build_cuda_${CUDA_COMPILER_NAME}_${CMAKE_HOST_NAME}_${CMAKE_DEVICE_NAME}_${SIMD_NAME}_${env.BUILD_TAG}"
109109
}
110110
}
111111
}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ repos:
1111
- id: requirements-txt-fixer
1212
- id: trailing-whitespace
1313
- repo: https://github.com/pre-commit/mirrors-clang-format
14-
rev: "v14.0.5"
14+
rev: "v15.0.6"
1515
hooks:
1616
- id: clang-format
1717
types_or: [c++]
1818
- repo: https://github.com/astral-sh/ruff-pre-commit
1919
# Ruff version.
20-
rev: v0.6.7
20+
rev: v0.9.1
2121
hooks:
2222
# Run the linter.
2323
- id: ruff

0 commit comments

Comments
 (0)