From 00b46796fc24abdb836fbd4a7344790b5f887354 Mon Sep 17 00:00:00 2001
From: jsfhd <2162443403@qq.com>
Date: Fri, 11 Apr 2025 14:54:53 +0800
Subject: [PATCH] add fds-6.7.4 templates

---
 .../fds/6.7.4/data.fds.arm.sve.cpu.config     | 68 ++++++++++++++++---
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
index 4434fff..20b0233 100644
--- a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
+++ b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
@@ -5,23 +5,34 @@
 FDS/6.7.4 https://github.com/firemodels/fds/archive/refs/tags/FDS6.7.4.tar.gz
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
+
+./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
 
 
 [ENV]
+
+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
+
 export CC=mpicc CXX=mpicxx FC=mpifort
-export PATH=/hpcrunner/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
+export PATH=${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
 
 [APP]
-app_name = amg
+app_name = fds
 build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds/6.7.4/bin
-case_dir =
+binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64
+case_dir = ${JARVIS_ROOT}/case
 
 [BUILD]
-cd /hpcrunner/
-tar -xvf  ${JARVIS_DOWNLOAD}/FDS6.7.4.tar.gz
-cd fds-FDS6.7.4/Build
+mkdir -p ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4
+tar -xvf  ${JARVIS_DOWNLOAD}/FDS6.7.4.tar.gz --strip-components 1 -C ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4
+cd ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build
 sed -i "s/-ffpe-summary=none//g" ./makefile
 sed -i '58c\GNU_COMPINFO=-DCOMPVER_PP=\\"$(OPENMPI_COMPVERSION)\\"' ./makefile
 export CFLAGS="-Wno-implicit-function-declaration -Wno-implicit-int -mcpu=linxicore9100 -mllvm -force-customized-pipeline=true  "
@@ -39,3 +50,44 @@ cd mpi_gnu_linux_64
 run =
 binary =
 nodes = 1
+
+[BATCH]
+#定义日志文件
+LOG_FILE="fds-proformance.log"
+
+#清空日志文件
+>"$LOG_FILE"
+
+
+export OMP_NUM_THREADS=1
+#执行每个命令并统计性能
+#$RUN_TOOL "mpirun " "mpirun -np 128 --mca btl ^openib --allow-run-as-root fds_mpi_gnu_linux_64 ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Validation/MPI_Scaling_Tests/FDS_Input_Files/weak_scaling_test_128.fds" $LOG_FILE
+ 
+{ time -p mpirun -np 128 --mca btl ^openib --allow-run-as-root fds_mpi_gnu_linux_64 ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Validation/MPI_Scaling_Tests/FDS_Input_Files/weak_scaling_test_128.fds ;} 2>&1 | tee fds_128.log
+
+echo "All commands executed. Performance log saved to $LOG_FILE"
+
+
+
+
+[JOB]
+#!/bin/bash
+#DSUB -n fds_test
+#DSUB --mpi hmpi
+#DSUB -N 1
+#DSUB -R cpu=128
+#DSUB -o fds.%J.out
+#DSUB -e fds.%J.err
+
+
+#定义日志文件
+LOG_FILE="fds-proformance.log"
+
+#清空日志文件
+>"$LOG_FILE"
+
+
+export OMP_NUM_THREADS=1
+#执行每个命令并统计性能
+$RUN_TOOL "mpirun " "mpirun -np 128 --mca btl ^openib --allow-run-as-root fds_mpi_gnu_linux_64 ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Validation/MPI_Scaling_Tests/FDS_Input_Files/weak_scaling_test_128.fds" $LOG_FILE
+echo "All commands executed. Performance log saved to $LOG_FILE"
-- 
Gitee