Skip to content

Add qws configs for Octopus and SQUID #43

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
yoshifuminakamura merged 1 commit into from
Jun 2, 2026
+93 −18
Merged

Add qws configs for Octopus and SQUID #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions config/queue.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ SLURM_CAMPHOR3,sbatch,"-p ${queue_group} -t ${elapse} --rsc p=${proc}:t=${nthrea
NQSV_OSAKA_CPU,qsub,"-q ${queue_group} -b ${nodes} -l elapstim_req=${elapse},cpunum_job=${nthreads}"
NQSV_OSAKA_GPU,qsub,"-q ${queue_group} -b ${nodes} -l elapstim_req=${elapse},cpunum_job=${nthreads},gpunum_job=${gpu_per_node}"
NQSV_OSAKA_VE,qsub,"-q ${queue_group} --venode ${proc} -l elapstim_req=${elapse}"
NQSV_SQUID_CPU,qsub,"-q ${queue_group} --group=jh260034 -T intmpi -b ${nodes} -l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads}"
NQSV_SQUID_GPU,qsub,"-q ${queue_group} --group=jh260034 -T openmpi -l elapstim_req=${elapse},gpunum_job=${nodes} -v OMP_NUM_THREADS=${nthreads}"
NQSV_SQUID_VECTOR,qsub,"-q ${queue_group} --group=jh260034 -T necmpi --venode=${proc} -l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads}"
NQSV_OCTOPUS,qsub,"-q ${queue_group} --group=jh260034 -l elapstim_req=${elapse} -b ${nodes} -v OMP_NUM_THREADS=${nthreads},http_proxy,https_proxy,HTTP_PROXY,HTTPS_PROXY"
none,none,none
8 changes: 4 additions & 4 deletions config/system.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Pegasus,cross,pegasus_login,pegasus_jacamar,PBS_PEGASUS,gpu
Sirius,cross,sirius_login,sirius_jacamar,PBS_SIRIUS,mcrp
TSUBAME4,cross,tsubame4_login,tsubame4_jacamar,AGE_TSUBAME4,cpu_4
Camphor3,cross,camphor3_login,camphor3_jacamar,SLURM_CAMPHOR3,jha
SQUID_CPU,cross,squid_login,squid_jacamar,NQSV_OSAKA_CPU,SQUID
SQUID_GPU,cross,squid_login,squid_jacamar,NQSV_OSAKA_GPU,SQUID
SQUID_VECTOR,cross,squid_login,squid_jacamar,NQSV_OSAKA_VE,SQUID
OCTOPUS,cross,octopus_login,octopus_jacamar,NQSV_OSAKA_CPU,OCT
SQUID_CPU,cross,squid_login,squid_jacamar,NQSV_SQUID_CPU,DBG
SQUID_GPU,cross,squid_login,squid_jacamar,NQSV_SQUID_GPU,DBG
SQUID_VECTOR,cross,squid_login,squid_jacamar,NQSV_SQUID_VECTOR,SQUID
OCTOPUS,cross,octopus_login,octopus_jacamar,NQSV_OCTOPUS,DBG
FNCX,native,,fncx-curl-jq,none,small
16 changes: 16 additions & 0 deletions programs/qws/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@ case "$system" in
AOBA_B)
make -j 8 fugaku_benchmark= omp=1 compiler=openmpi-gnu arch=skylake rdma= mpi=1 powerapi= CC=mpicc CXX=mpic++
;;
SQUID_CPU)
module load BaseCPU
make compiler=intel arch=skylake mpi=1 rdma= omp=1 -j8
;;
SQUID_GPU)
module load BaseGPU
make compiler=nvhpc-hpcx arch=skylake mpi=1 rdma= omp=1 -j8
;;
SQUID_VECTOR)
module load BaseVEC
make compiler=nec arch=sx mpi=1 rdma= omp=1 -j8
;;
Odyssey)
module load odyssey
make compiler=fujitsu_cross arch=postk -j 8
Expand All @@ -104,6 +116,10 @@ case "$system" in
make -j4 compiler=aocc arch=zen4 rdma= mpi=1 omp=1 profiler=timing \
AMD_MARCH=-march=znver4 cppflags="-DARCH_AVX512" main
;;
OCTOPUS)
module load BaseCPU inteloneAPI
make -j8 compiler=intel arch=skylake mpi=1 omp=1 rdma=
;;
Camphor3)
camphor3_modulepath="${MODULEPATH:-}"
if [[ -r /etc/profile.d/modules.sh ]]; then
Expand Down
4 changes: 4 additions & 0 deletions programs/qws/list.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,9 @@ Aquarius,yes,1,1,8,0:10:00
Pegasus,yes,1,1,96,00:10:00
Sirius,yes,1,1,24,0:10:00
TSUBAME4,yes,1,1,4,0:10:00
SQUID_CPU,yes,1,1,8,00:10:00
SQUID_GPU,yes,1,1,38,00:10:00
SQUID_VECTOR,yes,1,1,8,00:30:00
OCTOPUS,yes,1,1,24,00:10:00
Camphor3,yes,1,1,112,0:10:00
FNCX,yes,1,1,1,0:10:00
42 changes: 42 additions & 0 deletions programs/qws/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,39 @@ case "$system" in
mpirun -np ${qws_numproc} ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
SQUID_CPU)
qws_numproc=$((nodes * numproc_node))
qws_mpi_opts=()
if [[ -n "${NQSII_MPIOPTS:-}" ]]; then
read -r -a qws_mpi_opts <<< "${NQSII_MPIOPTS}"
fi
module load BaseCPU
export OMP_NUM_THREADS="${nthreads}"
mpirun "${qws_mpi_opts[@]}" -np ${qws_numproc} ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
SQUID_GPU)
qws_numproc=$((nodes * numproc_node))
qws_mpi_opts=()
if [[ -n "${NQSII_MPIOPTS:-}" ]]; then
read -r -a qws_mpi_opts <<< "${NQSII_MPIOPTS}"
fi
module load BaseGPU
export OMP_NUM_THREADS="${nthreads}"
mpirun "${qws_mpi_opts[@]}" -np ${qws_numproc} --bind-to none ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
SQUID_VECTOR)
qws_numproc=$((nodes * numproc_node))
qws_mpi_opts=()
if [[ -n "${NQSII_MPIOPTS:-}" ]]; then
read -r -a qws_mpi_opts <<< "${NQSII_MPIOPTS}"
fi
module load BaseVEC
export OMP_NUM_THREADS="${nthreads}"
mpirun "${qws_mpi_opts[@]}" -np ${qws_numproc} ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
Odyssey)
if [[ -r /etc/profile.d/modules.sh ]]; then
source /etc/profile.d/modules.sh
Expand Down Expand Up @@ -190,6 +223,15 @@ case "$system" in
mpirun -n ${qws_numproc} ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
OCTOPUS)
qws_numproc=$((nodes * numproc_node))
module load BaseCPU inteloneAPI
export OMP_NUM_THREADS="${nthreads}"
export OMP_PROC_BIND=close
export OMP_PLACES=cores
mpirun -n ${qws_numproc} ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0
print_results CASE0 CASE0 ${numproc_node} >> ../results/result
;;
Camphor3)
camphor3_modulepath="${MODULEPATH:-}"
if [[ -r /etc/profile.d/modules.sh ]]; then
Expand Down
37 changes: 23 additions & 14 deletions scripts/test_submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,25 +195,34 @@ case "$system" in
qsub -Z -v http_proxy,https_proxy,HTTP_PROXY,HTTPS_PROXY -q $queue_group -T intmpi -b $nodes \
-l elapstim_req=$elapse script.sh
;;
SQUID_CPU|OCTOPUS)
echo qsub -q $queue_group -b $nodes \
-l elapstim_req=${elapse},cpunum_job=${nthreads} script.sh
qsub -q $queue_group -b $nodes \
-l elapstim_req=${elapse},cpunum_job=${nthreads} script.sh
SQUID_CPU)
echo qsub -q $queue_group --group=jh260034 -T intmpi -b $nodes \
-l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads} script.sh
qsub -q $queue_group --group=jh260034 -T intmpi -b $nodes \
-l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads} script.sh
;;
OCTOPUS)
echo qsub -q $queue_group --group=jh260034 \
-l elapstim_req=${elapse} -b $nodes \
-v OMP_NUM_THREADS=${nthreads},http_proxy,https_proxy,HTTP_PROXY,HTTPS_PROXY script.sh
qsub -q $queue_group --group=jh260034 \
-l elapstim_req=${elapse} -b $nodes \
-v OMP_NUM_THREADS=${nthreads},http_proxy,https_proxy,HTTP_PROXY,HTTPS_PROXY script.sh
;;
SQUID_GPU)
gpu_per_node=$(get_system_gpu_per_node "$system")
echo qsub -q $queue_group -b $nodes \
-l elapstim_req=${elapse},cpunum_job=${nthreads},gpunum_job=${gpu_per_node} script.sh
qsub -q $queue_group -b $nodes \
-l elapstim_req=${elapse},cpunum_job=${nthreads},gpunum_job=${gpu_per_node} script.sh
echo qsub -q $queue_group --group=jh260034 -T openmpi \
-l elapstim_req=${elapse},gpunum_job=${nodes} \
-v OMP_NUM_THREADS=${nthreads} script.sh
qsub -q $queue_group --group=jh260034 -T openmpi \
-l elapstim_req=${elapse},gpunum_job=${nodes} \
-v OMP_NUM_THREADS=${nthreads} script.sh
;;
SQUID_VECTOR)
proc=$((nodes * numproc_node))
echo qsub -q $queue_group --venode $proc \
-l elapstim_req=${elapse} script.sh
qsub -q $queue_group --venode $proc \
-l elapstim_req=${elapse} script.sh
echo qsub -q $queue_group --group=jh260034 -T necmpi --venode=$proc \
-l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads} script.sh
qsub -q $queue_group --group=jh260034 -T necmpi --venode=$proc \
-l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads} script.sh
;;
AI4SS)
echo sbatch -p $queue_group -N $nodes -t $elapse --ntasks-per-node=${numproc_node} --cpus-per-task=$nthreads --gpus-per-node=${numproc_node} \
Expand Down
Loading