From 565eae6034ca45eaa6e0218d9b9f11c2d7b9fe41 Mon Sep 17 00:00:00 2001 From: Matthew Whitlock Date: Wed, 14 May 2025 14:57:24 -0500 Subject: [PATCH 1/4] Clean up slurm scripts --- examples/01_hello_world/fenix/run.batch | 9 --------- examples/01_hello_world/mpi/run.batch | 8 -------- examples/02_send_recv/fenix/run.batch | 8 -------- examples/02_send_recv/mpi/run.batch | 8 -------- examples/03_reduce/fenix/run.batch | 8 -------- examples/03_reduce/mpi/run.batch | 8 -------- examples/05_subset_create/run.batch | 8 -------- 7 files changed, 57 deletions(-) delete mode 100755 examples/01_hello_world/fenix/run.batch delete mode 100755 examples/01_hello_world/mpi/run.batch delete mode 100644 examples/02_send_recv/fenix/run.batch delete mode 100755 examples/02_send_recv/mpi/run.batch delete mode 100755 examples/03_reduce/fenix/run.batch delete mode 100755 examples/03_reduce/mpi/run.batch delete mode 100644 examples/05_subset_create/run.batch diff --git a/examples/01_hello_world/fenix/run.batch b/examples/01_hello_world/fenix/run.batch deleted file mode 100755 index a8a55ff..0000000 --- a/examples/01_hello_world/fenix/run.batch +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=fenix_hello_world -#SBATCH --output=fenix_hello_world.out -#SBATCH --error=fenix_hello_world.err -#SBATCH --nodes=2 -#SBATCH --ntasks-per-node=4 -#SBATCH --time=00:20:00 - -/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./fenix_hello_world 2 diff --git a/examples/01_hello_world/mpi/run.batch b/examples/01_hello_world/mpi/run.batch deleted file mode 100755 index dc390cf..0000000 --- a/examples/01_hello_world/mpi/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=mpi_hello_world -#SBATCH --output=mpi_hello_world.out -#SBATCH --error=mpi_hello_world.err -#SBATCH --nodes=8 -#SBATCH --time=00:15:00 - -/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_hello_world 7 diff --git a/examples/02_send_recv/fenix/run.batch b/examples/02_send_recv/fenix/run.batch deleted file mode 100644 index a50fd7a..0000000 --- a/examples/02_send_recv/fenix/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=fenix_ring -#SBATCH --output=fenix_ring.out -#SBATCH --error=fenix_ring.err -#SBATCH --nodes=2 -#SBATCH --time=00:02:00 - -/home/knteran/mpi-ulfm-0416/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./fenix_ring 2 --verbose 73 diff --git a/examples/02_send_recv/mpi/run.batch b/examples/02_send_recv/mpi/run.batch deleted file mode 100755 index 734f2d5..0000000 --- a/examples/02_send_recv/mpi/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=mpi_ring -#SBATCH --output=mpi_ring.out -#SBATCH --error=mpi_ring.err -#SBATCH --nodes=8 -#SBATCH --time=00:15:00 - -/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_ring 7 diff --git a/examples/03_reduce/fenix/run.batch b/examples/03_reduce/fenix/run.batch deleted file mode 100755 index 2b7b710..0000000 --- a/examples/03_reduce/fenix/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=fenix_reduce -#SBATCH --output=fenix_reduce.out -#SBATCH --error=fenix_reduce.err -#SBATCH --nodes=8 -#SBATCH --time=00:15:00 - -/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../fenix_reduce 7 diff --git a/examples/03_reduce/mpi/run.batch b/examples/03_reduce/mpi/run.batch deleted file mode 100755 index bec8b25..0000000 --- a/examples/03_reduce/mpi/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=mpi -#SBATCH --output=mpi.out -#SBATCH --error=mpi.err -#SBATCH --nodes=8 -#SBATCH --time=00:15:00 - -/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_reduce 7 diff --git a/examples/05_subset_create/run.batch b/examples/05_subset_create/run.batch deleted file mode 100644 index da3952c..0000000 --- a/examples/05_subset_create/run.batch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=fenix_subset_create -#SBATCH --output=fenix_subset_create.out -#SBATCH --error=fenix_subet_create.err -#SBATCH --nodes=2 -#SBATCH --time=00:02:00 - -/home/knteran/mpi-ulfm-0416/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./subset_create 2 From c5ae81d4c56f02c20d1958c33ef6c3966716331a Mon Sep 17 00:00:00 2001 From: Matthew Whitlock Date: Wed, 14 May 2025 16:06:44 -0500 Subject: [PATCH 2/4] Allow tests that time out to rerun a couple times --- .github/workflows/ci_checks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_checks.yaml b/.github/workflows/ci_checks.yaml index c6adc31..f777646 100644 --- a/.github/workflows/ci_checks.yaml +++ b/.github/workflows/ci_checks.yaml @@ -37,4 +37,4 @@ jobs: *.args.OMPI_VERSION=${{ matrix.ompi_version }} - name: Test Fenix - run: docker run fenix + run: docker run fenix ctest --output-on-failure --timeout 20 --repeat after-timeout:3 From b6b0953ad027560c5744dac6f5a4191cfbeeef46 Mon Sep 17 00:00:00 2001 From: Matthew Whitlock Date: Thu, 15 May 2025 15:58:57 -0600 Subject: [PATCH 3/4] Add more versions of MPI to CI tests --- .github/docker-compose.yml | 3 ++- .github/workflows/ci_checks.yaml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index c8c9024..b4015fa 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -3,11 +3,12 @@ services: image: "bootstrap" build: dockerfile_inline: | - FROM spack/ubuntu-jammy:0.22.2 + FROM spack/ubuntu-jammy:0.23 VOLUME /configs ARG OMPI_VERSION ENV OMPI_VERSION=$${OMPI_VERSION} CMD cp /configs/spack.yaml . && \ + export OMPI_VERSION=$( [[ "$${OMPI_VERSION}" == git.* ]] && echo "$${OMPI_VERSION}=main" || echo "$${OMPI_VERSION}" ) && \ spack -e . add openmpi@$${OMPI_VERSION} && \ spack -e . containerize >/configs/spack.Dockerfile args: diff --git a/.github/workflows/ci_checks.yaml b/.github/workflows/ci_checks.yaml index f777646..a11ed54 100644 --- a/.github/workflows/ci_checks.yaml +++ b/.github/workflows/ci_checks.yaml @@ -12,6 +12,9 @@ jobs: ompi_version: - main - 5.0.3 + - git.v5.0.5 + - git.v5.0.7 + - git.v5.0.x steps: - name: Checkout From dfb187876e9ca4774bd8942ac038a638deb064c4 Mon Sep 17 00:00:00 2001 From: Matthew Whitlock Date: Fri, 16 May 2025 08:33:21 -0600 Subject: [PATCH 4/4] Update to latest CMake variable names --- .github/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index b4015fa..2212b0c 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -37,8 +37,8 @@ services: cmake /fenix \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=mpicc \ - -DFENIX_EXAMPLES=ON \ - -DFENIX_TESTS=ON \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_TESTING=ON \ -DMPIEXEC_PREFLAGS="--allow-run-as-root;--map-by;:oversubscribe" && \ make -j