diff --git a/doc/sphinx/09_Microbenchmarks/M1_STREAM/STREAM.rst b/doc/sphinx/09_Microbenchmarks/M1_STREAM/STREAM.rst index 4a44ee8d..438dbfd2 100644 --- a/doc/sphinx/09_Microbenchmarks/M1_STREAM/STREAM.rst +++ b/doc/sphinx/09_Microbenchmarks/M1_STREAM/STREAM.rst @@ -10,11 +10,14 @@ The `STREAM `_ benchmark is a widely used Characteristics =============== -STREAM is available from several sources. +STREAM is available in the benchmarks repository. -* Github: `STREAM_github `_ -* Official site: `STREAM_official `_ -* LANL Crossroads site: `STREAM_LANL `_ +* LANL Benchmarks: `Benchmarks `_ + +.. * Github: `STREAM_github `_ +.. * Github: `STREAM_github `_ +.. * Official site: `STREAM_official `_ +.. * LANL Crossroads site: `STREAM_LANL `_ Problem ------- diff --git a/doc/sphinx/09_Microbenchmarks/M3_OSUMB/OSUMB.rst b/doc/sphinx/09_Microbenchmarks/M3_OSUMB/OSUMB.rst index 313aad9b..fbc8294d 100644 --- a/doc/sphinx/09_Microbenchmarks/M3_OSUMB/OSUMB.rst +++ b/doc/sphinx/09_Microbenchmarks/M3_OSUMB/OSUMB.rst @@ -10,7 +10,8 @@ The OSU Microbenchmarks (OMB) are widely used to measure and evaluate the perfor Characteristics =============== -- Official site: `OSUMB `_ +* Official site: `OSUMB `_ +* LANL Benchmarks: `Benchmarks Repository `_ Problem ------- diff --git a/doc/sphinx/09_Microbenchmarks/M5_DGEMM/DGEMM.rst b/doc/sphinx/09_Microbenchmarks/M5_DGEMM/DGEMM.rst index dcfbb6fe..8bd0d2a6 100644 --- a/doc/sphinx/09_Microbenchmarks/M5_DGEMM/DGEMM.rst +++ b/doc/sphinx/09_Microbenchmarks/M5_DGEMM/DGEMM.rst @@ -7,10 +7,16 @@ Purpose The DGEMM benchmark measures the sustained floating-point rate of a single node. +* `Benchmarks https://github.com/lanl/benchmarks/tree/main/microbenchmarks/dgemm` + Characteristics =============== -- LANL Crossroads Site: `DGEMM `_ +DGEMM is available in the benchmarks repository: + +* LANL Benchmarks: `Benchmarks `_ + +.. - LANL Crossroads Site: `DGEMM `_ Problem ------- diff --git a/doc/sphinx/09_Microbenchmarks/M6_IOR/IOR.rst b/doc/sphinx/09_Microbenchmarks/M6_IOR/IOR.rst index e09d3719..8eb4c5e7 100644 --- a/doc/sphinx/09_Microbenchmarks/M6_IOR/IOR.rst +++ b/doc/sphinx/09_Microbenchmarks/M6_IOR/IOR.rst @@ -10,10 +10,12 @@ IOR is used for testing performance of parallel file systems using various inter Characteristics =============== -IOR is available: +IOR is available in the benchmarks repository. -- Github: `IOR Public `_ -- LANL Crossroads Site: `IOR `_ +* LANL Benchmarks: `Benchmarks `_ +* Github: `IOR Public `_ + +.. - LANL Crossroads Site: `IOR `_ The github repo also contains mdtest. diff --git a/doc/sphinx/09_Microbenchmarks/M7_MDTEST/MDTEST.rst b/doc/sphinx/09_Microbenchmarks/M7_MDTEST/MDTEST.rst index 7302f857..b469a867 100644 --- a/doc/sphinx/09_Microbenchmarks/M7_MDTEST/MDTEST.rst +++ b/doc/sphinx/09_Microbenchmarks/M7_MDTEST/MDTEST.rst @@ -12,7 +12,11 @@ It can be run on any type of POSIX-compliant file system but has been designed t Characteristics =============== -LANL Crossroads Site: `MDTEST `_ +MDTEST is available in the benchmarks repository. + +* LANL Benchmarks: `Benchmarks `_ + +.. LANL Crossroads Site: `MDTEST `_ Problem ------- diff --git a/microbenchmarks/ior/Xrds_acceptance_script.sh b/microbenchmarks/ior/Xrds_acceptance_script.sh deleted file mode 100644 index 2fc9dfa5..00000000 --- a/microbenchmarks/ior/Xrds_acceptance_script.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash - -############## -# IOR -############## -set -e - -## SET VARS FROM CL INPUT KEY=VALUE -setvar() { - while [[ $# -gt 0 ]]; do - export $1 - shift - done -} - -realpath() { - tpth=${1:-$(pwd)} - echo $(/usr/bin/realpath $tpth) -} - -if [[ -f ${BASH_SOURCE[0]} ]]; then - thisfile=${BASH_SOURCE[0]} -elif [[ -f $0 ]]; then - thisfile=$0 -else - echo "THIS SCRIPT CAN'T FIND ITSELF." - exit 1 -fi - -# XRDS AND ROCI -runpath=$(pwd) -export SCRATCH_HOME=$(find /lustre -maxdepth 5 -name $USER -type d 2> /dev/null | grep -v -m1 givedir) -export THISDIR=$(dirname $thisfile) -export IORLOG=${HOME}/logs/ior -export PREFIX=${HOME}/ior -export TPN=110 -export SEGMENTS=16 -export SIZE=2G -export NNODES=${SLURM_NNODES} -export BUILD_DIR=/tmp/${USER}/ior -export BUILD=true -export IORSRC=$THISDIR -export STONEWALL_LIMIT=4000 -separator="\t ------------------------------------------------- \t" - -################################################################### -## ANY VARIABLES SET THAT APPEAR BEFORE THIS CAN BE -## SET ON THE COMMAND LINE WITH KEY=VALUE. -################################################################### -setvar $@ - -mkdir -p $IORLOG - -export WORKING_DIR=${SCRATCH_HOME}/ior -mkdir -p ${WORKING_DIR} -find ${WORKING_DIR} -type f -delete - -### IF CRAY -export MPICC=cc -export MPICXX=CC -export MPIFC=ftn -export CC=cc -export CXX=CC -export FC=ftn -export CFLAGS='-O3 -w' -prearg='' -postarg='' - -runior() { - # 1 is working dir output file - # 2 is POSIX or MPIIO - # 3 is PRE 2 args - # 4 is POST 2 args - outdir="${NNODES}_${2}_${1}" - if [[ $1 == 'per_node' ]]; then - mkdir -p $outdir - outfile="${outdir}/a" - else - outfile="${outdir}" - fi - - echo -e "${separator}\n" &>> ior_results - echo srun --drop-caches="" -N ${NNODES} --ntasks-per-node=${TPN} ${PREFIX}/bin/ior ${prearg} $2 ${postarg} -o ${outfile} &>> ior_results - srun --drop-caches="" -N ${NNODES} --ntasks-per-node=${TPN} ${PREFIX}/bin/ior ${prearg} $2 ${postarg} -o ${outfile} &>> ior_results - sleep 3 -} - -################################################################### -# BUILD IOR -if [[ $BUILD != "false" ]]; then - rm -rf $PREFIX - mkdir -p $PREFIX - mkdir -p $BUILD_DIR - cd $BUILD_DIR - $IORSRC/configure --prefix=$PREFIX - make - make install - cd $runpath -fi -if [[ $BUILD == "only" ]]; then - echo BUILT HERE: $BUILD_DIR - echo INSTALLED HERE: $PREFIX - exit 0 -fi - -################################################################### -# PRE -# -k -e -a -# -C -Q $TPN -k -E -a -# -k -e -E -a -# -C -Q $TPN -k -E -a - -# lfs setstripe -c 4 /lustre/xrscratch1/aparga/ior/${numNodes}_nto1_posix -# lfs setstripe -c 4 /lustre/xrscratch1/aparga/ior/${numNodes}_nto1_MPIIO - -################################################################### -# POST -# -F -v $SIZE -s $SEGMENTS -t 1M -D 30 -r -# -F -v $SIZE -s $SEGMENTS -t 1M -D 180 -w #WRITE -# -v -b $SIZE -s $SEGMENTS -t 1M -D 180 -w -# -v -b $SIZE -s $SEGMENTS -t 1M -D 45 -r - -cd $PREFIX -cd $WORKING_DIR - -title="per_node" - -echo -e "START $separator" -echo -e "$separator" -echo "WRITE: ${title}" -echo " ${PWD}/ior_results" -echo POSIX - -################################################################### -# PER NODE READ WRITE -################################################################### -prearg="-k -e -a" -postarg="-F -vv -b $SIZE -s $SEGMENTS -t 1M -D $STONEWALL_LIMIT -w" -runior $title "POSIX" -echo -e "$separator" -runior $title "MPIIO" -echo MPIIO - -echo -e "$separator" -echo "READ: $title" -prearg="-C -Q ${TPN} -k -E -a" -postarg="-F -vv -b $SIZE -s $SEGMENTS -t 1M -D $STONEWALL_LIMIT -r" -echo POSIX -runior $title "POSIX" -echo -e "$separator" -runior $title "MPIIO" -echo MPIIO - -################################################################### -# SHARED READ WRITE -################################################################### - -title="shared" - -echo -e "$separator" -echo -e "$separator" -echo "WRITE: $title" - -prearg="-k -e -E -a" -postarg="-vv -b ${SIZE} -s ${SEGMENTS} -t 1M -D $STONEWALL_LIMIT -w" -lfs setstripe -c 4 ${WORKING_DIR}/${NNODES}_POSIX_${title} -runior $title "POSIX" $prearg $postarg -echo -e "$separator" -lfs setstripe -c 4 ${WORKING_DIR}/${NNODES}_MPIIO_${title} -runior $title "MPIIO" $prearg $postarg -echo MPIIO - -echo -e "$separator" -echo "READ: $title" -prearg="-C -Q ${TPN} -k -E -a" -postarg="-vv -b $SIZE -s $SEGMENTS -t 1M -D $STONEWALL_LIMIT -r" -runior $title "POSIX" -echo -e "$separator" -runior $title "MPIIO" -echo MPIIO - -mkdir -p $HOME/ior_current - -cp $WORKING_DIR/ior_results ${HOME}/ior_current - -echo "Results preserved:" -echo " ${HOME}/ior_current" -echo $(date) >> ${HOME}/ior_current/run_summary -env >> ${HOME}/ior_current/run_summary - -echo -e "END $separator" -cd $THISDIR diff --git a/microbenchmarks/mdtest/Xrds_acceptance_script.sh b/microbenchmarks/mdtest/Xrds_acceptance_script.sh deleted file mode 100644 index c186a80f..00000000 --- a/microbenchmarks/mdtest/Xrds_acceptance_script.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -############## -# MDTEST -############## - -## SET VARS FROM CL INPUT KEY=VALUE -setvar () { - while [[ $# -gt 0 ]]; do - export $1 - shift - done -} - -export SCRATCH=/lustre/xrscratch1 # CROSSROADS SCRATCH -export MDTESTLOC=${HOME}/.local/bin # PATH TO MDTEST BINARY -export TPN=10 -export NFILES=104857 -export NNODES=$SLURM_NNODES -separator="\t ------------------------------------------------- \t" - -################################################################### -## ANY VARIABLES SET THAT APPEAR BEFORE THIS CAN BE -## SET ON THE COMMAND LINE WITH KEY=VALUE. -################################################################### -setvar $@ - -export SCRATCH_HOME=${SCRATCH}/${USER} -export WORKING_DIR=${SCRATCH_HOME}/mdtest -taaskspn="--ntasks-per-node=${TPN}" - -find ${WORKING_DIR} -type f -delete - -runmdtest() { - - # Command line used: /users/aparga/xr/bin/mdtest '-F' '-I' '104857' '-d=/lustre/xrscratch1/aparga/mdtest' - srun -N ${NNODES} $taskspn ${MDTESTLOC}/mdtest -F -I $1 -d=${WORKING_DIR} - sleep 3 -} - -################################################################### -# PER NODE READ WRITE -################################################################### - -title="per_node" -echo -e "START $separator" -echo -e "$separator" -echo "WRITE: $title" - -runmdtest $title "POSIX" $prearg $postarg -echo -e "$separator" -runmdtest $title "MPIIO" $prearg $postarg - -echo -e "$separator" -echo "READ: $title" -prearg="-C -Q ${TPN} -k -E -a" -postarg="-F -v -b 4G -s 16 -t 1M -D 30 -r" -runmdtest $title "POSIX" $prearg $postarg -echo -e "$separator" -runmdtest $title "MPIIO" $prearg $postarg - -################################################################### -# SHARED READ WRITE -################################################################### - -title="shared" - -echo -e "$separator" -echo -e "$separator" -echo "WRITE: $title" - -lfs setstripe -c 4 ${WORKING_DIR}/${NNODES}_POSIX_${title} -runmdtest $title "POSIX" $prearg $postarg -echo -e "$separator" -lfs setstripe -c 4 ${WORKING_DIR}/${NNODES}_MPIIO_${title} -runmdtest $title "MPIIO" $prearg $postarg - -echo -e "$separator" -echo "READ: $title" -prearg="-C -Q ${TPN} -k -E -a" -postarg="-v -b $size -s $segments -t 1M -D 45 -r" -runmdtest $title "POSIX" $prearg $postarg -echo -e "$separator" -runmdtest $title "MPIIO" $prearg $postarg - -mv $WORKING_DIR ${HOME}/mdtest_current - -echo "Results preserved:" -echo " ${HOME}/mdtest_current" -echo $(date) >> ${HOME}/mdtest_current/run_summary -env >> ${HOME}/mdtest_current/run_summary -echo -e "END $separator" - diff --git a/microbenchmarks/spatter b/microbenchmarks/spatter index 09f370a0..41ea6dc1 160000 --- a/microbenchmarks/spatter +++ b/microbenchmarks/spatter @@ -1 +1 @@ -Subproject commit 09f370a04f760ee6d2397eb3c53bdf839afdaaba +Subproject commit 41ea6dc12f3e4373eadbff4e3a2a5b0419548d07