From 7294bc3bdde23bf1ed6f0cedd292e83263bfcbec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?= <2794580162@qq.com>
Date: Thu, 25 Sep 2025 17:15:50 +0800
Subject: [PATCH 1/3] berkeleygw

---
 .../berkeleygw.arm.bisheng.hpckit.config      | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
index aad1f23..c559452 100644
--- a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
+++ b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
@@ -19,8 +19,18 @@ export CXX=mpicxx
 export FC=mpifort
 export F77=mpifort
 export F90=mpifort
-./jarvis -install fftw/3.3.8 bisheng+mpi
-module load bisheng4.1.0-hmpi2.4.3/fftw/3.3.8
+sed -i '$a\
+./configure --prefix=$1 --enable-single --enable-float --enable-neon --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
+make -j \&\& make install\
+make clean\
+./configure --prefix=$1 --enable-long-double --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
+make -j \&\& make install\
+make clean\
+./configure --prefix=$1 --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
+make -j \&\& make install\
+' package/fftw/3.3.10/sve/install.sh
+./jarvis -install fftw/3.3.10/sve clang+mpi
+module load bisheng4.1.0-hmpi2.4.3/fftw-sve/3.3.10
 module load bisheng/kml2.5.0/kml
 
 tar -zxvf ${JARVIS_DOWNLOAD}/BerkeleyGW-3.0.1.tar.gz -C ${JARVIS_TMP_DOWNLOAD}
@@ -32,8 +42,13 @@ module use ./software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles
 module use ./software/moduledeps
 module load bisheng/compiler4.1.0/bishengmodule
 module load bisheng/hmpi2.4.3/hmpi
+export CC=mpicc
+export CXX=mpicxx
+export FC=mpifort
+export F77=mpifort
+export F90=mpifort
+module load bisheng4.1.0-hmpi2.4.3/fftw-sve/3.3.10
 module load bisheng/kml2.5.0/kml
-module load bisheng4.1.0-hmpi2.4.3/fftw/3.3.8
 
 [APP]
 app_name = BerkeleyGW
@@ -62,8 +77,8 @@ C_LINK       = mpicxx
 C_OPTS       = -O3
 C_DEBUGFLAG  =
 REMOVE       = /bin/rm -f
-FFTWLIB      = \${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.3/fftw/3.3.8/lib/libfftw3.a
-FFTWINCLUDE  = \${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.3/fftw/3.3.8/include
+FFTWLIB      = \${JARVIS_LIBS}/bisheng4.1.0/fftw-sve/3.3.10/lib/libfftw3.a
+FFTWINCLUDE  = \${JARVIS_LIBS}/bisheng4.1.0/fftw-sve/3.3.10/include
 LAPACKLIB    = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp} -lklapack_full -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp}/kblas/pthread -lkblas
 SCALAPACKLIB = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp} -lkscalapack_full \$(LAPACKLIB)
 TESTSCRIPT   = make check-parallel
-- 
Gitee


From e147579403d847b81147ee1f7d5f648d3be1b4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?= <2794580162@qq.com>
Date: Sun, 28 Sep 2025 14:39:59 +0800
Subject: [PATCH 2/3] hpcrunner

---
 package/fftw/meta.sh                          |  2 +-
 .../berkeleygw.arm.bisheng.hpckit.config      | 21 +++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/package/fftw/meta.sh b/package/fftw/meta.sh
index 1efa02e..fc8d398 100644
--- a/package/fftw/meta.sh
+++ b/package/fftw/meta.sh
@@ -2,7 +2,7 @@
 set -x
 set -e
 
-
+export UseGitee=0
 if [[ $UseGitee -eq 1 ]]; then
 #. ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/fftw3/archive/refs/tags/fftw-${fftw_ver}.tar.gz -f fftw-${fftw_ver}.tar.gz
 cd ${JARVIS_TMP}
diff --git a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
index c559452..6cc7d65 100644
--- a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
+++ b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
@@ -19,18 +19,8 @@ export CXX=mpicxx
 export FC=mpifort
 export F77=mpifort
 export F90=mpifort
-sed -i '$a\
-./configure --prefix=$1 --enable-single --enable-float --enable-neon --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
-make -j \&\& make install\
-make clean\
-./configure --prefix=$1 --enable-long-double --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
-make -j \&\& make install\
-make clean\
-./configure --prefix=$1 --enable-shared --enable-threads --enable-openmp --enable-mpi CFLAGS="-O3 -fomit-frame-pointer -fstrict-aliasing"\
-make -j \&\& make install\
-' package/fftw/3.3.10/sve/install.sh
-./jarvis -install fftw/3.3.10/sve clang+mpi
-module load bisheng4.1.0-hmpi2.4.3/fftw-sve/3.3.10
+./jarvis -install fftw/3.3.8 bisheng+mpi
+module load bisheng4.1.0-hmpi2.4.3/fftw/3.3.8
 module load bisheng/kml2.5.0/kml
 
 tar -zxvf ${JARVIS_DOWNLOAD}/BerkeleyGW-3.0.1.tar.gz -C ${JARVIS_TMP_DOWNLOAD}
@@ -42,13 +32,8 @@ module use ./software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles
 module use ./software/moduledeps
 module load bisheng/compiler4.1.0/bishengmodule
 module load bisheng/hmpi2.4.3/hmpi
-export CC=mpicc
-export CXX=mpicxx
-export FC=mpifort
-export F77=mpifort
-export F90=mpifort
-module load bisheng4.1.0-hmpi2.4.3/fftw-sve/3.3.10
 module load bisheng/kml2.5.0/kml
+module load bisheng4.1.0-hmpi2.4.3/fftw/3.3.8
 
 [APP]
 app_name = BerkeleyGW
-- 
Gitee


From 992f7ae2011efa6782493cdcc556de8d23b837ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?= <2794580162@qq.com>
Date: Sun, 28 Sep 2025 15:25:46 +0800
Subject: [PATCH 3/3] berkeleygw

---
 .../berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
index 6cc7d65..a3cbf4b 100644
--- a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
+++ b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config
@@ -62,8 +62,8 @@ C_LINK       = mpicxx
 C_OPTS       = -O3
 C_DEBUGFLAG  =
 REMOVE       = /bin/rm -f
-FFTWLIB      = \${JARVIS_LIBS}/bisheng4.1.0/fftw-sve/3.3.10/lib/libfftw3.a
-FFTWINCLUDE  = \${JARVIS_LIBS}/bisheng4.1.0/fftw-sve/3.3.10/include
+FFTWLIB      = \${JARVIS_LIBS}/bisheng4.1.0/fftw/3.3.8/lib/libfftw3.a
+FFTWINCLUDE  = \${JARVIS_LIBS}/bisheng4.1.0/fftw/3.3.8/include
 LAPACKLIB    = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp} -lklapack_full -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp}/kblas/pthread -lkblas
 SCALAPACKLIB = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/${kp} -lkscalapack_full \$(LAPACKLIB)
 TESTSCRIPT   = make check-parallel
-- 
Gitee