Skip to content

Commit

Permalink
updates from main
Browse files Browse the repository at this point in the history
  • Loading branch information
aaroncblack committed Jan 26, 2024
2 parents 8178c9f + 37d094d commit 4cb1c06
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 32 deletions.
2 changes: 1 addition & 1 deletion branson
4 changes: 2 additions & 2 deletions doc/sphinx/01_branson/gpu.gp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions doc/sphinx/02_amg/amg.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.`.
Expand Down Expand Up @@ -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/

Expand Down
8 changes: 3 additions & 5 deletions doc/sphinx/03_vibe/cpu_20.csv
Original file line number Diff line number Diff line change
@@ -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
8, 2.00e+06, 2.0e+06
32, 7.40e+06, 8.0e+06
56, 1.29e+07, 1.4e+07
10 changes: 5 additions & 5 deletions doc/sphinx/03_vibe/cpu_40.csv
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions doc/sphinx/03_vibe/cpu_60.csv
Original file line number Diff line number Diff line change
@@ -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
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
2 changes: 1 addition & 1 deletion doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
12 changes: 6 additions & 6 deletions doc/sphinx/03_vibe/gpu.csv
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion doc/sphinx/05_mlmd/gpu.gp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion microbenchmarks/spatter
2 changes: 1 addition & 1 deletion parthenon
Submodule parthenon updated 116 files
2 changes: 1 addition & 1 deletion sparta
Submodule sparta updated 169 files

0 comments on commit 4cb1c06

Please sign in to comment.