From 831836652f7de131884aeb75efeb42be01ca8d68 Mon Sep 17 00:00:00 2001
From: xiaolinjunhao <981755938@qq.com>
Date: Mon, 12 May 2025 03:57:42 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E9=87=8Fconfig?=
 =?UTF-8?q?=E8=84=9A=E6=9C=ACamg1.2=E5=BA=94=E7=94=A8=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9A=201.=20amg1.2=E7=9A=84sve?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B7=B2=E7=BB=8F=E4=BD=9C=E4=B8=BA=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=AD=98=E5=9C=A8=E4=BA=8Epackage=EF=BC=8Cconfig?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5install=EF=BC=9B?=
 =?UTF-8?q?=202.=20amg1.2=E7=9A=84=E6=99=AE=E9=80=9A=E7=89=88=E6=9C=ACconf?=
 =?UTF-8?q?ig=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/amg/1.2/data.amg-sve.arm.cpu.config | 43 +++++++------------
 templates/amg/1.2/data.amg.arm.cpu.config     | 35 ++++++++-------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/templates/amg/1.2/data.amg-sve.arm.cpu.config b/templates/amg/1.2/data.amg-sve.arm.cpu.config
index 47d216d..db70110 100644
--- a/templates/amg/1.2/data.amg-sve.arm.cpu.config
+++ b/templates/amg/1.2/data.amg-sve.arm.cpu.config
@@ -2,47 +2,34 @@
 11.11.11.11
 
 [DOWNLOAD]
-amg/1.2 https://github.com/LLNL/AMG/archive/refs/tags/1.2.zip 1.2.zip
 
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
-
+set -e
+set -x
+./jarvis -install bisheng/4.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng/4.1.0
+./jarvis -install hmpi/2.4.1 bisheng
+module load hmpi/2.4.1
 
 [ENV]
-export CC=mpicc CXX=mpicxx FC=mpifort
-module use /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module add amg/1.2
-
+module use ./software/modulefiles
+module load bisheng/4.1.0
+module load hmpi/2.4.1
 
 [APP]
 app_name = amg
 build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+binary_dir =
 case_dir =
 
 [BUILD]
-ls ${JARVIS_DOWNLOAD}/
-unzip ${JARVIS_DOWNLOAD}/1.2.zip
-cd AMG-1.2
-sed -i "46c INCLUDE_CFLAGS =  -O2 -Wno-implicit-function-declaration -Wno-implicit-int -DTIMER_USE_MPI -DHYPRE_USING_OPENMP -fopenmp -DHYPRE_HOPSCOTCH -DHYPRE_USING_PERSISTENT_COMM -DHYPRE_BIGINT -mcpu=linxicore9100  -mllvm -force-customized-pipeline=true" Makefile.include
-make -j
-
-mkdir /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin -p
-cp ./test/* /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
- 
-mkdir /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg -p
-cat >> /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg/1.2 << EOF
-#%Module1.0
-set prefix /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2
-set version 1.2
-setenv AMG_PATH \$prefix
-prepend-path PATH \$prefix/bin
-EOF
-
+./jarvis -install amg/1.2 bisheng+mpi
 
 
 [RUN]
-run =  
-binary =
+run = module load amg/1.2 &&
+binary = amg
 nodes = 1
diff --git a/templates/amg/1.2/data.amg.arm.cpu.config b/templates/amg/1.2/data.amg.arm.cpu.config
index 4b95f7d..49fadab 100644
--- a/templates/amg/1.2/data.amg.arm.cpu.config
+++ b/templates/amg/1.2/data.amg.arm.cpu.config
@@ -6,35 +6,40 @@ amg/1.2 https://github.com/LLNL/AMG/archive/refs/tags/1.2.zip 1.2.zip
 
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
-
+set -e
+set -x
+./jarvis -install bisheng/4.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng/4.1.0
+./jarvis -install hmpi/2.4.1 bisheng
+module load hmpi/2.4.1
 
 [ENV]
-export CC=mpicc CXX=mpicxx FC=mpifort
-module use /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module add amg/1.2
-
+module use ./software/modulefiles
+module load bisheng/4.1.0
+module load hmpi/2.4.1
 
 [APP]
 app_name = amg
 build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+binary_dir =
 case_dir =
 
 [BUILD]
-ls ${JARVIS_DOWNLOAD}/
+rm -rf AMG-1.2
 unzip ${JARVIS_DOWNLOAD}/1.2.zip
 cd AMG-1.2
 sed -i "46c INCLUDE_CFLAGS = -O2 -Wno-implicit-function-declaration -Wno-implicit-int -DTIMER_USE_MPI -DHYPRE_USING_OPENMP -fopenmp -DHYPRE_HOPSCOTCH -DHYPRE_USING_PERSISTENT_COMM -DHYPRE_BIGINT" Makefile.include
 make -j
 
-mkdir /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin -p
-cp ./test/* /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+mkdir ${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.1/amg/1.2/bin -p
+cp ./test/* ${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.1/amg/1.2/bin
  
-mkdir /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg -p
-cat >> /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg/1.2 << EOF
+mkdir ${JARVIS_MODULEDEPS}/bisheng4.1.0-hmpi2.4.1/amg -p
+cat > ${JARVIS_MODULEDEPS}/bisheng4.1.0-hmpi2.4.1/amg/1.2 << EOF
 #%Module1.0
-set prefix /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2
+set prefix ${JARVIS_ROOT}/software/libs/bisheng4.1.0/hmpi2.4.1/amg/1.2
 set version 1.2
 setenv AMG_PATH \$prefix
 prepend-path PATH \$prefix/bin
@@ -43,6 +48,6 @@ EOF
 
 
 [RUN]
-run =  
-binary =
+run = module load amg/1.2 &&
+binary = amg
 nodes = 1
-- 
Gitee