Skip to content

Fix temp benchmark directory #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 28, 2025
Merged

Fix temp benchmark directory #906

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6252ee4
Update bench.sh
sbryngelson Jun 27, 2025
e0e98c5
Update bench.sh
sbryngelson Jun 27, 2025
d80e156
fix up some syntax to be posix generic
sbryngelson Jun 27, 2025
a69dba3
Apply suggestions from code review
sbryngelson Jun 27, 2025
aedd2d7
Merge branch 'master' into tmp_dir
sbryngelson Jun 27, 2025
40484e9
Merge branch 'master' into tmp_dir
sbryngelson Jun 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontier/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

build_opts=""
if [ "$1" == "gpu" ]; then
if [ "$1" = "gpu" ]; then
build_opts="--gpu"
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontier/submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ else
exit 1
fi

if [ "$2" == "cpu" ]; then
if [ "$2" = "cpu" ]; then
sbatch_device_opts="\
#SBATCH -n 32 # Number of cores required"
elif [ "$2" == "gpu" ]; then
elif [ "$2" = "gpu" ]; then
sbatch_device_opts="\
#SBATCH -n 8 # Number of cores required"
else
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontier/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
gpus=`rocm-smi --showid | awk '{print $1}' | grep -Eo '[0-9]+' | uniq | tr '\n' ' '`
ngpus=`echo "$gpus" | tr -d '[:space:]' | wc -c`

if [ "$job_device" == "gpu" ]; then
if [ "$job_device" = "gpu" ]; then
./mfc.sh test --max-attempts 3 -j $ngpus -- -c frontier
else
./mfc.sh test --max-attempts 3 -j 32 -- -c frontier
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/phoenix/bench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@

n_ranks=12

if [ "$job_device" == "gpu" ]; then
if [ "$job_device" = "gpu" ]; then
n_ranks=$(nvidia-smi -L | wc -l) # number of GPUs on node
gpu_ids=$(seq -s ' ' 0 $(($n_ranks-1))) # 0,1,2,...,gpu_count-1
device_opts="--gpu -g $gpu_ids"
fi

mkdir -p /storage/scratch1/6/sbryngelson3/mytmp_build
export TMPDIR=/storage/scratch1/6/sbryngelson3/mytmp_build
tmpbuild=/storage/scratch1/6/sbryngelson3/mytmp_build
currentdir=$tmpbuild/run-$(( RANDOM % 900 ))
mkdir -p $tmpbuild
mkdir -p $currentdir

if ["$job_device" == "gpu"]; then
export TMPDIR=$currentdir

if [[ "$job_device" == "gpu" ]]; then
./mfc.sh bench --mem 12 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix-bench $device_opts -n $n_ranks
else
./mfc.sh bench --mem 1 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix-bench $device_opts -n $n_ranks
fi

sleep 10
rm -rf $currentdir || true

unset TMPDIR
4 changes: 2 additions & 2 deletions .github/workflows/phoenix/submit-bench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ sbatch_gpu_opts="\
#SBATCH -G2\
"

if [ "$2" == "cpu" ]; then
if [ "$2" = "cpu" ]; then
sbatch_device_opts="$sbatch_cpu_opts"
elif [ "$2" == "gpu" ]; then
elif [ "$2" = "gpu" ]; then
sbatch_device_opts="$sbatch_gpu_opts"
else
usage
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phoenix/submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ sbatch_gpu_opts="\
#SBATCH -G2\
"

if [ "$2" == "cpu" ]; then
if [ "$2" = "cpu" ]; then
sbatch_device_opts="$sbatch_cpu_opts"
elif [ "$2" == "gpu" ]; then
elif [ "$2" = "gpu" ]; then
sbatch_device_opts="$sbatch_gpu_opts"
else
usage
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phoenix/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash

build_opts=""
if [ "$job_device" == "gpu" ]; then
if [ "$job_device" = "gpu" ]; then
build_opts="--gpu"
fi

./mfc.sh test --dry-run -j 8 $build_opts

n_test_threads=8

if [ "$job_device" == "gpu" ]; then
if [ "$job_device" = "gpu" ]; then
gpu_count=$(nvidia-smi -L | wc -l) # number of GPUs on node
gpu_ids=$(seq -s ' ' 0 $(($gpu_count-1))) # 0,1,2,...,gpu_count-1
device_opts="-g $gpu_ids"
Expand Down
Loading