From d00fad82fd65e2cdeaf149e5424ac1276a2982a6 Mon Sep 17 00:00:00 2001
From: wangjianming <wangjianming16@huawei.com>
Date: Fri, 12 Dec 2025 09:42:06 +0800
Subject: [PATCH] fix template for meso_grapes/6.0

---
 ...ta.meso_grapes.arm.cpu.bisheng.hmpi.config | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config
index aeb94e3c..f135828e 100644
--- a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config
+++ b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config
@@ -6,17 +6,15 @@
 [DEPENDENCY]
 set -e
 set -x
-yum install -y time zlib zlib-devel libtirpc libtirpc-devel numactl libatomic
+. $CHECK_ROOT && yum install -y time zlib zlib-devel libtirpc libtirpc-devel numactl libatomic
 module purge
 ./jarvis -install hpckit/${HPCKIT_VERSION} any
-
-
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
 module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
-module load bisheng/hmpi${HMPI_VERSION}
+module load bisheng/hmpi${HMPI_VERSION}/release
 export CC=mpicc CXX=mpicxx FC=mpifort
-module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}-hmpi2.4.3
 ./jarvis -install hdf5/1.12.1/clang bisheng+mpi
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
 module load hdf5-clang/1.12.1
 ./jarvis -install pnetcdf/1.12.3 bisheng+mpi
 module load pnetcdf/1.12.3
@@ -28,16 +26,14 @@ module load netcdf-clang/4.8.1
 module purge
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
 module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
-module load bisheng/hmpi${HMPI_VERSION}
-
+module load bisheng/hmpi${HMPI_VERSION}/release
 module use ${JARVIS_ROOT}/software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
-
 module load hdf5-clang/1.12.1
 module load pnetcdf/1.12.3
 module load netcdf-clang/4.8.1
-module load bisheng/kml2.5.0/kml
+module load bisheng/kml${HPCKIT_VERSION}/kml
 export NETCDF_LIB=${NETCDF_CLANG_PATH}/lib
-export KML_LIB=${JARVIS_ROOT}/software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng/lib/noarch
+export KML_LIB=${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/kml/bisheng/lib/noarch
 export HMG_LIB=${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/hmg
 export LD_LIBRARY_PATH=${HMG_LIB}:$LD_LIBRARY_PATH
 
@@ -56,12 +52,17 @@ if [ -d "./GRAPES_MESO_262794_6.0_gz" ]; then
 fi
 tar -zxvf $JARVIS_DOWNLOAD/GRAPES_MESO_262794_6.0_gz_20241230.tar.gz
 cd ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/hmg
-KML_PATH=${JARVIS_ROOT}/software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng
-mpicxx sharedlib.cpp -fPIC -shared -std=c++17 -stdlib=libc++ -w -march=armv8.3-a+fp16 -O3 -mcpu=hip09 -ffast-math -lm -lc++ -I/${KML_PATH}/include -L/${KML_PATH}/lib/${kp}/ -lkscasolver -lkservice -lklapack_full -L/${KML_PATH}/lib/${kp}/kblas/pthread -lkblas -o libgmg_P32D16.so
+KML_PATH=${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/kml/bisheng
+if [[ "${kp}" == "sve" ]]; then
+	mcpu="hip09"
+else
+	mcpu="tsv110"
+fi
+mpicxx sharedlib.cpp -fPIC -shared -std=c++17 -stdlib=libc++ -w -march=armv8.3-a+fp16 -O3 -mcpu=${mcpu} -ffast-math -lm -lc++ -I/${KML_PATH}/include -L/${KML_PATH}/lib/${kp}/ -lkscasolver -lkservice -lklapack_full -L/${KML_PATH}/lib/${kp}/kblas/multi -lkblas -o libgmg_P32D16.so
 cd ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model
-sed -i '19c OPTFLAGS_INTELC =  -O3 -Wno-implicit-function-declaration -Wno-implicit-int -mcpu=hip09' ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
-sed -i '21c OPTFLAGS_INTELF =  -O3 -Hx,124,0xc00000 -Hx,54,8 -Mx,53,0x80000000 -mllvm -disable-call-heuristic -mllvm -prefetch-loop-depth=3 -mllvm -prefetch-distance=1600 -mllvm -min-prefetch-stride=4 -mllvm -basicaa-fortran-io -mllvm -inline-threshold=20000 -mllvm -simplifycfg-speculatively-execute-FP-BB=false -mllvm -enable-prefetch-barrier=false -Hx,54,0x800 -mcpu=hip09 -mllvm -inline-flang-alloc=true -Hx,55,0x200 -ffast-math' ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
-sed -i '76c LIB             =    -L$(NETCDF_LIB) -lnetcdf -lnetcdff -L$(KML_LIB) -lkm -L$(HMG_LIB) -lgmg_P32D16 #-L$(SLEEF_LIB) -lsleefopt -lsleef -L$(GRIBROOT)/lib -lmsg2grib -lgrib_api_f90 -lgrib_api -ljasper' ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
+sed -i "19c OPTFLAGS_INTELC =  -O3 -Wno-implicit-function-declaration -Wno-implicit-int -mcpu=${mcpu}" ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
+sed -i "21c OPTFLAGS_INTELF =  -O3 -Hx,124,0xc00000 -Hx,54,8 -Mx,53,0x80000000 -mllvm -disable-call-heuristic -mllvm -prefetch-loop-depth=3 -mllvm -prefetch-distance=1600 -mllvm -min-prefetch-stride=4 -mllvm -basicaa-fortran-io -mllvm -inline-threshold=20000 -mllvm -simplifycfg-speculatively-execute-FP-BB=false -mllvm -enable-prefetch-barrier=false -Hx,54,0x800 -mcpu=${mcpu} -mllvm -inline-flang-alloc=true -Hx,55,0x200 -ffast-math" ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
+sed -i '76c LIB             =    -L$(NETCDF_LIB) -lnetcdf -lnetcdff -L$(KML_LIB) -lkm -L$(HMG_LIB) -lgmg_P32D16' ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG
 
 ./clean
 ./comp.sh KUNPENG
@@ -84,7 +85,7 @@ binary =
 nodes = 2
 
 [BATCH]
-HOSTLIST='node-164,node-171'
+HOSTLIST='node-xxx,node-yyy'
 nodes=2
 npx=15
 npy=16
-- 
Gitee