From cb235cc908ce4daf36dfaa6859d8df33a18e1eee Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 5 Mar 2025 09:45:45 +0800 Subject: [PATCH 1/4] add ww3-3.6 templates --- templates/ww3/3.6/ww3.arm.cpu.config | 103 +++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 templates/ww3/3.6/ww3.arm.cpu.config diff --git a/templates/ww3/3.6/ww3.arm.cpu.config b/templates/ww3/3.6/ww3.arm.cpu.config new file mode 100644 index 0000000..b4dc204 --- /dev/null +++ b/templates/ww3/3.6/ww3.arm.cpu.config @@ -0,0 +1,103 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +ww3/3.6 https://github.com/NOAA-EMC/WW3/archive/refs/tags/6.07.1.tar.gz WW3-6.07.1.tar.gz + +[DEPENDENCY] +./jarvis -install package/hpckit/2024.12.30/ any +module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module purge +module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi + +export CC=mpicc FC=mpifort CXX=mpicxx + +./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi +module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ +module load hdf5-clang/1.12.0 +./jarvis -install package/pnetcdf/1.11.2 bisheng+mpi +module load pnetcdf/1.11.2 +./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi +module load netcdf-clang/4.7.4 + +[ENV] +module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module purge +module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi +module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ +module load hdf5-clang/1.12.0 +module load pnetcdf/1.11.2 +module load netcdf-clang/4.7.4 +export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/exe:$PATH + +[APP] +app_name = ww3 +build_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/bin +binary_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/exe +case_dir = + +[BUILD] +set -x +mkdir -p ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 +cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 +rm -rf ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/* +tar -xf ${JARVIS_DOWNLOAD}/WW3-6.07.1.tar.gz --strip-components 1 -C ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 +export WWATCH3_NETCDF=NC4 +export NETCDF_CONFIG=${NETCDF_CLANG_PATH}/bin/nc-config +export NETCDF_INCDIR=${NETCDF_CLANG_PATH}/include +export NETCDF_LIBDIR=${NETCDF_CLANG_PATH}/lib +echo -e "y\n\nflang\nclang\n\n\n\ny" | ./model/bin/w3_setup model/ +cd ./model/bin +cp link.Intel link +cp comp.Intel comp +sed -i '34s/$1/"$1"/' ./link +sed -i '89s/-ip//' ./link +sed -i 's/mpiifort/mpifort/' ./link +sed -i '101,$s/ifort/flang/' ./link +sed -i 's/-openmp/-fopenmp/' ./link +sed -i 's/-assume byterecl -ip //g' comp +sed -i 's/-convert big_endian/-fconvert=big-endian/g' comp +sed -i 's/mpiifort/mpifort/' comp +sed -i '98,$s/ifort/flang/' comp +sed -i 's/-openmp/-fopenmp/' comp +cat << EOF > switch +F90 NC4 NOGRB NOPA LRB4 MPI DIST PR3 UQ FLX2 LN1 ST2 STAB2 NL1 BT1 DB1 MLIM TR0 BS0 IC0 IS0 REF0 XX0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O11 O14 +EOF +./w3_clean +./w3_new +./w3_make +[CLEAN] +./w3_clean + +[RUN] +run = +binary = +nodes = 1 + +[BATCH] +#定义日志文件 +LOG_FILE="ww3-proformance.log" + +>"$LOG_FILE" +$RUN_TOOL "WW3 ww3_multi" "mpirun --allow-run-as-root -np 64 ww3_multi" $LOG_FILE +#mpirun --allow-run-as-root -np 2 ww3_multi + +echo "All commands executed. Performance log saved to $LOG_FILE" + +[JOB] +#!/bin/sh +#DSUB -n ww3_test +#DSUB --mpi hmpi +#DSUB -q default +#DSUB -N 1 +#DSUB -R cpu=128 +#DSUB -oo ww3.%J.out +#DSUB -oe ww3.%J.err + +LOG_FILE="ww3-proformance.log" + +>"$LOG_FILE" +$RUN_TOOL "WW3 ww3_multi" "mpirun --allow-run-as-root -np 2 ww3_multi" $LOG_FILE + +echo "ALL commands executed. Performance log saved to $LOG_FILE" + -- Gitee From 66de362cb6e4625f0adec869348cdf2042bc41af Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 5 Mar 2025 10:22:55 +0800 Subject: [PATCH 2/4] add ww3-6.07.1 templates --- templates/ww3/{3.6 => 6.07.1}/ww3.arm.cpu.config | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename templates/ww3/{3.6 => 6.07.1}/ww3.arm.cpu.config (88%) diff --git a/templates/ww3/3.6/ww3.arm.cpu.config b/templates/ww3/6.07.1/ww3.arm.cpu.config similarity index 88% rename from templates/ww3/3.6/ww3.arm.cpu.config rename to templates/ww3/6.07.1/ww3.arm.cpu.config index b4dc204..5cb8959 100644 --- a/templates/ww3/3.6/ww3.arm.cpu.config +++ b/templates/ww3/6.07.1/ww3.arm.cpu.config @@ -2,7 +2,7 @@ 11.11.11.11 [DOWNLOAD] -ww3/3.6 https://github.com/NOAA-EMC/WW3/archive/refs/tags/6.07.1.tar.gz WW3-6.07.1.tar.gz +ww3/6.07.1 https://github.com/NOAA-EMC/WW3/archive/refs/tags/6.07.1.tar.gz WW3-6.07.1.tar.gz [DEPENDENCY] ./jarvis -install package/hpckit/2024.12.30/ any @@ -28,20 +28,20 @@ module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ module load hdf5-clang/1.12.0 module load pnetcdf/1.11.2 module load netcdf-clang/4.7.4 -export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/exe:$PATH +export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1/model/exe:$PATH [APP] app_name = ww3 -build_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/bin -binary_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/model/exe +build_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1/model/bin +binary_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1/model/exe case_dir = [BUILD] set -x -mkdir -p ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 -cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 -rm -rf ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3/* -tar -xf ${JARVIS_DOWNLOAD}/WW3-6.07.1.tar.gz --strip-components 1 -C ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3 +mkdir -p ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1 +cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1 +rm -rf ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1/* +tar -xf ${JARVIS_DOWNLOAD}/WW3-6.07.1.tar.gz --strip-components 1 -C ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ww3-6.07.1 export WWATCH3_NETCDF=NC4 export NETCDF_CONFIG=${NETCDF_CLANG_PATH}/bin/nc-config export NETCDF_INCDIR=${NETCDF_CLANG_PATH}/include -- Gitee From c7aaa7798a7699dee125b3873c06981149f87895 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 5 Mar 2025 11:34:51 +0800 Subject: [PATCH 3/4] add roms-3.6 templates --- templates/roms/3.6/roms.arm.cpu.config | 115 +++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 templates/roms/3.6/roms.arm.cpu.config diff --git a/templates/roms/3.6/roms.arm.cpu.config b/templates/roms/3.6/roms.arm.cpu.config new file mode 100644 index 0000000..46e56f4 --- /dev/null +++ b/templates/roms/3.6/roms.arm.cpu.config @@ -0,0 +1,115 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +roms/3.6 https://github.com/myroms/roms/archive/refs/tags/roms-3.6.tar.gz + +[DEPENDENCY] +./jarvis -install package/hpckit/2024.12.30/ any +module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module purge +module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi + +export CC=mpicc FC=mpifort CXX=mpicxx + +./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi +module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ +module load hdf5-clang/1.12.0 +./jarvis -install package/pnetcdf/1.11.2 bisheng+mpi +module load pnetcdf/1.11.2 +./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi +module load netcdf-clang/4.7.4 +module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread + +[ENV] +module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module purge +module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi +module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ +module load hdf5-clang/1.12.0 +module load pnetcdf/1.11.2 +module load netcdf-clang/4.7.4 +module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread +export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin:$PATH + +[APP] +app_name = roms +build_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin +binary_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin +case_dir = ${JARVIS_TMP}/roms-roms-3.6/ROMS/External + +[BUILD] +set -x +cd ${JARVIS_TMP} +tar -xf ${JARVIS_DOWNLOAD}/roms-3.6.tar.gz +mkdir -p ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin +export installdir=${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin +export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib +cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin +cp ${JARVIS_TMP}/roms-roms-3.6/ROMS/Bin/build.sh ./ +cp ${JARVIS_TMP}/roms-roms-3.6/ROMS/Include/upwelling.h ./ +sed -i '87s/^/#/' build.sh +sed -i "88s%.*% setenv MY_PROJECT_DIR ${installdir}%" build.sh +sed -i "101s%.*% setenv MY_ROMS_SRC ${JARVIS_TMP}/roms-roms-3.6%" build.sh +sed -i "142s/ifort/flang/" build.sh +sed -i '148s/^#/ /' build.sh +sed -i '149s/^#/ /' build.sh +sed -i '151s/^#/ /' build.sh +sed -i '188s/gfortran/flang/' build.sh +sed -i '192s/PATH .*/PATH $OPAL_PREFIX\/bin:$PATH/' build.sh +sed -i "330s/gfortran/flang/" build.sh +sed -i "332s/gfortran/flang/" build.sh +sed -i "334s/mpich/openmpi/" build.sh +sed -i '359s/NC_CONFIG .*/NC_CONFIG ${NETCDF_CLANG_PATH}\/bin\/nc-config/' build.sh +sed -i '360s/NETCDF_INCDIR .*/NETCDF_INCDIR ${NETCDF_CLANG_PATH}\/include/' build.sh +export CC=mpicc CXX=mpicxx FC=mpifort +cd ${JARVIS_TMP}/roms-roms-3.6/Compilers +cp Linux-gfortran.mk Linux-flang.mk +sed -i "25s/gfortran/flang/" Linux-flang.mk +sed -i "26s%-frepack-arrays%-frepack-arrays -L$KML_LIB_PATH/sve/kblas/pthread -lkblas -L$KML_LIB_PATH/sve -lklapack_full -L$KML_LIB_PATH/noarch -lkm%" Linux-flang.mk +sed -i "66s/mpif90/mpifort/" Linux-flang.mk +cd ../ +sed -i "31s/3.82/3.82 4.3/" makefile +cd ${installdir} +./build.sh +rm -rf Build build.sh upwelling.h + +[CLEAN] +rm -rf $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin/* + +[RUN] +run = +binary = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin/oceanM +nodes = 1 + +[BATCH] +#定义日志文件 +LOG_FILE="roms-proformance.log" + +>"$LOG_FILE" +sed -i "77s%ROMS\/External%.%" ocean_benchmark3.in +sed -i "101,102s/2/8/" ocean_benchmark3.in +$RUN_TOOL "roms oceanM" "mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in" $LOG_FILE +#mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in + +echo "All commands executed. Performance log saved to $LOG_FILE" + +[JOB] +#!/bin/sh +#DSUB -n roms_test +#DSUB --mpi hmpi +#DSUB -q default +#DSUB -N 1 +#DSUB -R cpu=128 +#DSUB -oo roms.%J.out +#DSUB -oe roms.%J.err + +LOG_FILE="roms-proformance.log" + +>"$LOG_FILE" +sed -i "77s%ROMS\/External%.%" ocean_benchmark3.in +sed -i "101,102s/2/8/" ocean_benchmark3.in +$RUN_TOOL "roms oceanM" "mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in" $LOG_FILE + +echo "ALL commands executed. Performance log saved to $LOG_FILE" + -- Gitee From 5c316d841fbe3426e04dff0cf2a753010848268c Mon Sep 17 00:00:00 2001 From: HH <2162443403@qq.com> Date: Wed, 5 Mar 2025 03:52:37 +0000 Subject: [PATCH 4/4] Revert "add roms-3.6 templates" This reverts commit c7aaa7798a7699dee125b3873c06981149f87895. --- templates/roms/3.6/roms.arm.cpu.config | 115 ------------------------- 1 file changed, 115 deletions(-) delete mode 100644 templates/roms/3.6/roms.arm.cpu.config diff --git a/templates/roms/3.6/roms.arm.cpu.config b/templates/roms/3.6/roms.arm.cpu.config deleted file mode 100644 index 46e56f4..0000000 --- a/templates/roms/3.6/roms.arm.cpu.config +++ /dev/null @@ -1,115 +0,0 @@ -[SERVER] -11.11.11.11 - -[DOWNLOAD] -roms/3.6 https://github.com/myroms/roms/archive/refs/tags/roms-3.6.tar.gz - -[DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles -module purge -module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi - -export CC=mpicc FC=mpifort CXX=mpicxx - -./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi -module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ -module load hdf5-clang/1.12.0 -./jarvis -install package/pnetcdf/1.11.2 bisheng+mpi -module load pnetcdf/1.11.2 -./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi -module load netcdf-clang/4.7.4 -module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread - -[ENV] -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles -module purge -module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi -module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ -module load hdf5-clang/1.12.0 -module load pnetcdf/1.11.2 -module load netcdf-clang/4.7.4 -module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread -export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin:$PATH - -[APP] -app_name = roms -build_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin -binary_dir = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin -case_dir = ${JARVIS_TMP}/roms-roms-3.6/ROMS/External - -[BUILD] -set -x -cd ${JARVIS_TMP} -tar -xf ${JARVIS_DOWNLOAD}/roms-3.6.tar.gz -mkdir -p ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin -export installdir=${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin -export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib -cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin -cp ${JARVIS_TMP}/roms-roms-3.6/ROMS/Bin/build.sh ./ -cp ${JARVIS_TMP}/roms-roms-3.6/ROMS/Include/upwelling.h ./ -sed -i '87s/^/#/' build.sh -sed -i "88s%.*% setenv MY_PROJECT_DIR ${installdir}%" build.sh -sed -i "101s%.*% setenv MY_ROMS_SRC ${JARVIS_TMP}/roms-roms-3.6%" build.sh -sed -i "142s/ifort/flang/" build.sh -sed -i '148s/^#/ /' build.sh -sed -i '149s/^#/ /' build.sh -sed -i '151s/^#/ /' build.sh -sed -i '188s/gfortran/flang/' build.sh -sed -i '192s/PATH .*/PATH $OPAL_PREFIX\/bin:$PATH/' build.sh -sed -i "330s/gfortran/flang/" build.sh -sed -i "332s/gfortran/flang/" build.sh -sed -i "334s/mpich/openmpi/" build.sh -sed -i '359s/NC_CONFIG .*/NC_CONFIG ${NETCDF_CLANG_PATH}\/bin\/nc-config/' build.sh -sed -i '360s/NETCDF_INCDIR .*/NETCDF_INCDIR ${NETCDF_CLANG_PATH}\/include/' build.sh -export CC=mpicc CXX=mpicxx FC=mpifort -cd ${JARVIS_TMP}/roms-roms-3.6/Compilers -cp Linux-gfortran.mk Linux-flang.mk -sed -i "25s/gfortran/flang/" Linux-flang.mk -sed -i "26s%-frepack-arrays%-frepack-arrays -L$KML_LIB_PATH/sve/kblas/pthread -lkblas -L$KML_LIB_PATH/sve -lklapack_full -L$KML_LIB_PATH/noarch -lkm%" Linux-flang.mk -sed -i "66s/mpif90/mpifort/" Linux-flang.mk -cd ../ -sed -i "31s/3.82/3.82 4.3/" makefile -cd ${installdir} -./build.sh -rm -rf Build build.sh upwelling.h - -[CLEAN] -rm -rf $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin/* - -[RUN] -run = -binary = $JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/roms-3.6/bin/oceanM -nodes = 1 - -[BATCH] -#定义日志文件 -LOG_FILE="roms-proformance.log" - ->"$LOG_FILE" -sed -i "77s%ROMS\/External%.%" ocean_benchmark3.in -sed -i "101,102s/2/8/" ocean_benchmark3.in -$RUN_TOOL "roms oceanM" "mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in" $LOG_FILE -#mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in - -echo "All commands executed. Performance log saved to $LOG_FILE" - -[JOB] -#!/bin/sh -#DSUB -n roms_test -#DSUB --mpi hmpi -#DSUB -q default -#DSUB -N 1 -#DSUB -R cpu=128 -#DSUB -oo roms.%J.out -#DSUB -oe roms.%J.err - -LOG_FILE="roms-proformance.log" - ->"$LOG_FILE" -sed -i "77s%ROMS\/External%.%" ocean_benchmark3.in -sed -i "101,102s/2/8/" ocean_benchmark3.in -$RUN_TOOL "roms oceanM" "mpirun --allow-run-as-root -np 64 oceanM ocean_benchmark3.in" $LOG_FILE - -echo "ALL commands executed. Performance log saved to $LOG_FILE" - -- Gitee