diff --git a/branson b/branson index d5966955..cbad15ea 160000 --- a/branson +++ b/branson @@ -1 +1 @@ -Subproject commit d596695520074ca03b1384ead0d1fb819a6c97a7 +Subproject commit cbad15ea76acf42266c6557428d5f58c865849bc diff --git a/doc/sphinx/01_branson/gpu.gp b/doc/sphinx/01_branson/gpu.gp index bb557936..516cec99 100644 --- a/doc/sphinx/01_branson/gpu.gp +++ b/doc/sphinx/01_branson/gpu.gp @@ -9,8 +9,8 @@ set ylabel "Figure of Merit (Particles/sec)" # set xrange [1:64] set key right top -# set logscale x 2 -# set logscale y 2 +set logscale x 10 +set logscale y 2 set grid show grid diff --git a/doc/sphinx/02_amg/amg.rst b/doc/sphinx/02_amg/amg.rst index cbd3d205..c39ac024 100644 --- a/doc/sphinx/02_amg/amg.rst +++ b/doc/sphinx/02_amg/amg.rst @@ -9,7 +9,7 @@ Purpose ======= The AMG2023 benchmark consists of a driver (amg.c), a simple Makefile, and documentation. It is available at https://github.com/LLNL/AMG2023 . -It requires an installation of hypre 2.27.0 or higher. +It requires an installation of hypre 2.30.0 or higher. It uses hypre's parallel algebraic multigrid (AMG) solver BoomerAMG in combination with a Krylov solver to solve two linear systems arising from diffusion problems on a cuboid discretized by finite differences. The problems are set up through hypre's linear-algebraic IJ interface. The problem sizes can be controlled from the command line.`. @@ -51,9 +51,9 @@ Building The AMG2023 benchmark uses a simple Makefile system for building the driver. -It requires an installation of hypre 2.27.0, which can be downloaded from https://github.com/hypre-space/hypre via +It requires an installation of hypre 2.30.0 or higher, which can be downloaded from https://github.com/hypre-space/hypre via - ``git clone -b v2.27.0 https://github.com/hypre-space/hypre.git`` + ``git clone -b v2.30.0 https://github.com/hypre-space/hypre.git`` Information on how to install hypre is available here: https://hypre.readthedocs.io/en/latest/ diff --git a/doc/sphinx/03_vibe/cpu_20.csv b/doc/sphinx/03_vibe/cpu_20.csv index a36e38c6..459ecb2d 100644 --- a/doc/sphinx/03_vibe/cpu_20.csv +++ b/doc/sphinx/03_vibe/cpu_20.csv @@ -1,6 +1,4 @@ No. Cores, Actual, Ideal -8, 2.05e+06, 2.0500000e+06 -32, 7.80e+06, 8.2000000e+06 -56, 1.33e+07, 1.4350000e+07 -88, 1.77e+07, 2.2550000e+07 -112, 2.11e+07, 2.8700000e+07 \ No newline at end of file +8, 2.00e+06, 2.0e+06 +32, 7.40e+06, 8.0e+06 +56, 1.29e+07, 1.4e+07 \ No newline at end of file diff --git a/doc/sphinx/03_vibe/cpu_40.csv b/doc/sphinx/03_vibe/cpu_40.csv index 920cfbdb..ccc095c0 100644 --- a/doc/sphinx/03_vibe/cpu_40.csv +++ b/doc/sphinx/03_vibe/cpu_40.csv @@ -1,6 +1,6 @@ No. Cores, Actual, Ideal -8, 2.07e+06, 2.0700000e+06 -32, 7.61e+06, 8.2800000e+06 -56, 1.35e+07, 1.4490000e+07 -88, 1.78e+07, 2.2770000e+07 -112, 2.13e+07, 2.8980000e+07 +8, 1.82e+06, 1.82e+06 +32, 7.04e+06, 7.28e+06 +56, 1.21e+07, 1.274e+07 +88, 1.60e+07, 2.02e+07 +112, 2.00e+07, 2.548e+07 diff --git a/doc/sphinx/03_vibe/cpu_60.csv b/doc/sphinx/03_vibe/cpu_60.csv index d9fe7e17..5cb43156 100644 --- a/doc/sphinx/03_vibe/cpu_60.csv +++ b/doc/sphinx/03_vibe/cpu_60.csv @@ -1,6 +1,6 @@ No. Cores, Actual, Ideal -8, 2.01e+06, 2.0100000e+06 -32, 7.60e+06, 8.0400000e+06 -56, 1.34e+07, 1.4070000e+07 -88, 1.78e+07, 2.2110000e+07 -112, 2.13e+07, 2.8140000e+07 \ No newline at end of file +8, 1.51e+06, 1.51e+06 +32, 6.34e+06, 6.04e+06 +56, 1.09e+07, 1.057e+07 +88, 1.55e+07, 1.661e+07 +112, 1.85e+07, 2.114e+07 diff --git a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh b/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh index 90462f76..3d35df85 100755 --- a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh +++ b/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh @@ -48,7 +48,7 @@ for count in 8 32 56 88 112; do zc=$(grep 'zone-cycles/wallsecond = ' ${outfile} | cut -d '=' -f 2 | xargs) echo ${zc} if (( ${i} == 0 )); then - IDEAL1=$(echo "print(\"%.7e\" % (${zc}/4))" | python3) + IDEAL1=$(echo "print(\"%.7e\" % (${zc}/${count}))" | python3) fi IDEAL=$(echo "print(\"%.7e\" % (${count}*${IDEAL1}))" | python3) OUTSTR="${count}, ${zc}, ${IDEAL}" diff --git a/doc/sphinx/03_vibe/gpu.csv b/doc/sphinx/03_vibe/gpu.csv index 972f7368..96abcfbd 100644 --- a/doc/sphinx/03_vibe/gpu.csv +++ b/doc/sphinx/03_vibe/gpu.csv @@ -1,7 +1,7 @@ Mesh Base Size, Actual -32, 4.16e+07 -64, 5.34e+07 -96, 4.29e+07 -128, 4.52e+07 -160, 4.54e+07 -192, 4.10e+07 +32, 1.75e+07 +64, 1.15e+07 +96, 6.78e+06 +128, 0 +160, 0 +192, 0 diff --git a/doc/sphinx/05_mlmd/gpu.gp b/doc/sphinx/05_mlmd/gpu.gp index 841842e6..db00877d 100644 --- a/doc/sphinx/05_mlmd/gpu.gp +++ b/doc/sphinx/05_mlmd/gpu.gp @@ -4,7 +4,7 @@ set output "gpu.png" set title "MLMD throughput performance on Chicoma" font "serif,22" set xlabel "No. Atoms" -set ylabel "Figure of Merit (grads/sec)" +set ylabel "Figure of Merit (katoms/sec)" # set xrange [1:64] set key right top diff --git a/microbenchmarks/spatter b/microbenchmarks/spatter index f88a71aa..7513c8d8 160000 --- a/microbenchmarks/spatter +++ b/microbenchmarks/spatter @@ -1 +1 @@ -Subproject commit f88a71aa0683619803406431d26634a90c67d25f +Subproject commit 7513c8d806ac99099bdddefe03c866dca798b804 diff --git a/parthenon b/parthenon index a540d397..11c53d1c 160000 --- a/parthenon +++ b/parthenon @@ -1 +1 @@ -Subproject commit a540d39766022b9fccc2f48cc9263efc8717d663 +Subproject commit 11c53d1cd4ada0629e06d069b70b410234ed0bde diff --git a/sparta b/sparta index ca0ce28f..83d5f3a9 160000 --- a/sparta +++ b/sparta @@ -1 +1 @@ -Subproject commit ca0ce28fd76080d8b2828db77adde14fdc382c76 +Subproject commit 83d5f3a92c5fc0b59d4d973c6b1dddc4d77a7147