cleanup and documented

This commit is contained in:
Guillaume Raffy 2022-06-09 09:09:32 +02:00
parent 733fda5517
commit 43ae0a3068
2 changed files with 7 additions and 6 deletions

View File

@ -187,9 +187,9 @@ function launch_job_for_host_group()
;;
esac
# cat $SCRIPT_DIR/hibench.job | sed "s~<include:starbench.py>~$(cat $SCRIPT_DIR/starbench.py)~" > /tmp/hibench.job
cat $SCRIPT_DIR/hibench.job | substitute_TAG_with_FILEcontents '<include:starbench.py>' "$SCRIPT_DIR/starbench.py" > /tmp/hibench.job
chmod a+x /tmp/hibench.job
local starbench_job_path='/tmp/starbench.job'
cat $SCRIPT_DIR/starbench-template.job | substitute_TAG_with_FILEcontents '<include:starbench.py>' "$SCRIPT_DIR/starbench.py" > "${starbench_job_path}"
chmod a+x "${starbench_job_path}"
local hibench_root_dir="$GLOBAL_WORK_DIR/graffy/hibridon/benchmarks/starbench"
mkdir -p "${hibench_root_dir}"
@ -197,7 +197,7 @@ function launch_job_for_host_group()
local this_bench_dir="${hibench_root_dir}/${hibridon_version}/${benchmark_test}/${host_group_id}/${compiler_id}"
mkdir -p "${this_bench_dir}"
command="/tmp/hibench.job \"${git_repos_url}\" \"${git_user}\" \"${git_pass_file}\" \"${hibridon_version}\" \"${cmake_options}\" \"${benchmark_command}\" \"${env_vars_bash_commands}\""
command="${starbench_job_path} \"${git_repos_url}\" \"${git_user}\" \"${git_pass_file}\" \"${hibridon_version}\" \"${cmake_options}\" \"${benchmark_command}\" \"${env_vars_bash_commands}\""
echo "command = $command"
# eval $command

View File

@ -1,6 +1,5 @@
#!/usr/bin/env bash
# this job file is a template file used by launch-perf-jobs.sh
# this job file is a template file for starbench jobs
git_repos_url="$1" # eg "https://github.com/hibridon/hibridon"
git_user="$2" # eg 'g-raffy'
git_pass_file="$3" # eg "$HOME/.github/personal_access_tokens/bench.hibridon.cluster.ipr.univ-rennes1.fr.pat"
@ -34,11 +33,13 @@ then
fi
mkdir -p "${temp_dir}"
# extract starbench.py from this job script
starbench_path="${temp_dir}/starbench.py"
output_dir="${temp_dir}"
num_cores=${NSLOTS}
# the starbench.py code is expected to be included in the job script as a replacement of the tag <include:starbench.py>
cat <<-'EOF' > "${starbench_path}"
<include:starbench.py>
EOF