From 7674fb512469949de54f753220b9b8b8a7211941 Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Fri, 12 Dec 2025 13:53:35 +0800
Subject: [PATCH 1/7] =?UTF-8?q?1.=20=E6=8A=BD=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dopenblas=E4=B8=8B=E8=BD=BD=E8=BF=9E=E6=8E=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/openblas/meta.sh                      |  2 +-
 templates/basic_env/data.hpckit.config        | 27 +++++++++++++++++++
 .../vasp/6.5.1/data.vasp.arm_clang.cpu.config |  8 ++++--
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 templates/basic_env/data.hpckit.config

diff --git a/package/openblas/meta.sh b/package/openblas/meta.sh
index 0ca62310..5bac5f1a 100644
--- a/package/openblas/meta.sh
+++ b/package/openblas/meta.sh
@@ -11,7 +11,7 @@ mv OpenBLAS OpenBLAS-${openblas_ver}
 cd OpenBLAS-${openblas_ver}
 git checkout v${openblas_ver}
 else
-. ${DOWNLOAD_TOOL} -u $JARVIS_PROXY/OpenMathLib/OpenBLAS/releases/download/v${openblas_ver}/OpenBLAS-v${openblas_ver}.tar.gz -f OpenBLAS-${openblas_ver}.tar.gz
+. ${DOWNLOAD_TOOL} -u $JARVIS_PROXY/OpenMathLib/OpenBLAS/releases/download/v${openblas_ver}/OpenBLAS-${openblas_ver}.tar.gz -f OpenBLAS-${openblas_ver}.tar.gz
 cd ${JARVIS_TMP}
 rm -rf OpenBLAS-${openblas_ver}
 tar -xzvf ${JARVIS_DOWNLOAD}/OpenBLAS-${openblas_ver}.tar.gz
diff --git a/templates/basic_env/data.hpckit.config b/templates/basic_env/data.hpckit.config
new file mode 100644
index 00000000..8fea0a5f
--- /dev/null
+++ b/templates/basic_env/data.hpckit.config
@@ -0,0 +1,27 @@
+[SERVER]
+11.11.11.11
+
+[DOWNLOAD]
+
+[DEPENDENCY]
+set -e
+set -x
+./jarvis -install hpckit/${HPCKIT_VERSION} any
+
+[ENV]
+
+[APP]
+app_name =
+build_dir =
+binary_dir =
+case_dir =
+
+[BUILD]
+
+[CLEAN]
+./jarvis -remove hpckit
+
+[RUN]
+run =
+binary =
+nodes = 1
diff --git a/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config b/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
index 5b556ca6..27dd6259 100644
--- a/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
+++ b/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
@@ -1,20 +1,20 @@
 [SERVER]
 11.11.11.11
 
+
 [DOWNLOAD]
 
+
 [DEPENDENCY]
 set -e
 set -x
 module purge
 
-./jarvis -install hpckit/${HPCKIT_VERSION}/ any
 cd ${JARVIS_TMP}
 rm -rf ${JARVIS_TMP}/vasp.6.5.1
 tar xf ${JARVIS_DOWNLOAD}/vasp.6.5.1.tgz
 
 
-
 [ENV]
 module purge
 module use software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
@@ -33,12 +33,14 @@ blas_path="-L${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib/${kp}/kblas/m
 fftw_path="-L${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib/${kp} -lkfft -L/usr/lib64 -lfftw3"
 scalapack_path="-L${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib/${kp}/ -lkscalapack_full -lklapack_full -lkservice"
 
+
 [APP]
 app_name = VASP
 build_dir = ${JARVIS_TMP}/vasp.6.5.1
 binary_dir = ${JARVIS_TMP}/vasp.6.5.1/bin
 case_dir =
 
+
 [BUILD]
 sed -i '
   s@^[[:space:]]*FORALL (N=1:SIZE(BSE_INDEX%INDEX,1)) W1(N)%WDES1 => WDESK1@                 !FORALL (N=1:SIZE(BSE_INDEX%INDEX,1)) W1(N)%WDES1 => WDESK1\n                 DO N=1,SIZE(BSE_INDEX%INDEX,1)\n                   W1(N)%WDES1 => WDESK1\n                 ENDDO@
@@ -120,9 +122,11 @@ EOF
 echo `pwd`
 make DEPS=1 -j all
 
+
 [CLEAN]
 make veryclean
 
+
 [RUN]
 run = mpirun --allow-run-as-root -np 32 -x OMP_NUM_THREADS=1
 binary = vasp_std 2>&1 | tee -a vasp.out
-- 
Gitee


From 8d940de5a6172283594f1dbde2b457d90a47d7cd Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Fri, 12 Dec 2025 14:59:31 +0800
Subject: [PATCH 2/7] =?UTF-8?q?1.=20=E6=8A=BD=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dopenblas=E4=B8=8B=E8=BD=BD=E8=BF=9E=E6=8E=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/init.sh b/init.sh
index 44f303f3..7588d5f8 100644
--- a/init.sh
+++ b/init.sh
@@ -59,7 +59,15 @@ if [ -e "$file_path" ]; then
     export BISHENG_VERSION=`ls $file_path|grep compiler|awk -F "compiler" '{print $2}'`
     export HMPI_VERSION=`ls $file_path|grep hmpi|awk -F "hmpi" '{print $2}'`
 else
-    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 未进行安装，请继续执行\n"
+    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 尚未安装，正在安装...\n"
+    ./jarvis -use templates/basic_env/data.hpckit.config
+    ./jarvis -dp
+    install_ret=$?
+    if [ $install_ret -eq 0 ]; then
+        echo -e "INFO: $HPCKIT_VERSION 版本的 HPCKit 安装成功\n"
+    else
+        echo -e "[ERROR]: $HPCKIT_VERSION 版本的 HPCKit 安装失败，请重新安装\n"
+    fi
 fi
 
 
-- 
Gitee


From 2391bb614a600a4fff98434eb5b16e452f45ccad Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Fri, 12 Dec 2025 16:30:31 +0800
Subject: [PATCH 3/7] =?UTF-8?q?1.=20=E6=8A=BD=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dopenblas=E4=B8=8B=E8=BD=BD=E8=BF=9E=E6=8E=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/init.sh b/init.sh
index 7588d5f8..44f303f3 100644
--- a/init.sh
+++ b/init.sh
@@ -59,15 +59,7 @@ if [ -e "$file_path" ]; then
     export BISHENG_VERSION=`ls $file_path|grep compiler|awk -F "compiler" '{print $2}'`
     export HMPI_VERSION=`ls $file_path|grep hmpi|awk -F "hmpi" '{print $2}'`
 else
-    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 尚未安装，正在安装...\n"
-    ./jarvis -use templates/basic_env/data.hpckit.config
-    ./jarvis -dp
-    install_ret=$?
-    if [ $install_ret -eq 0 ]; then
-        echo -e "INFO: $HPCKIT_VERSION 版本的 HPCKit 安装成功\n"
-    else
-        echo -e "[ERROR]: $HPCKIT_VERSION 版本的 HPCKit 安装失败，请重新安装\n"
-    fi
+    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 未进行安装，请继续执行\n"
 fi
 
 
-- 
Gitee


From 469755981629b0be8b6562ca9a8c51a70ad1a9d9 Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Fri, 12 Dec 2025 16:46:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?1.=20=E6=8A=BD=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dopenblas=E4=B8=8B=E8=BD=BD=E8=BF=9E=E6=8E=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 85355c7c..f2b89c6d 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,16 @@ source init.sh
 ```
 
 
-步骤2：生效应用模板
+步骤2：部署基础环境（目前仅支持HPCKit）
+```
+#生效HPCKit安装模板
+./jarvis -use templates/basic_env/data.hpckit.config
+#执行以下命令，完成基础环境部署
+./jarvis -dp
+```
+
+
+步骤3：生效应用模板
 进入hpcrunner根目录执行如下命令：
 ```
 ./jarvis -use templates/xapp.config
@@ -79,25 +88,25 @@ source init.sh
 
 
 
-步骤3：下载安装包以及相关依赖
+步骤4：下载安装包以及相关依赖
 
 ```
 ./jarvis -d
 ```
 
-步骤4：安装应用依赖
+步骤5：安装应用依赖
 
 ```
 ./jarvis -dp
 ```
 
-步骤5：编译应用
+步骤6：编译应用
 
 ```
 ./jarvis -b
 ```
 
-步骤6：运行应用
+步骤7：运行应用
 
 ```
 ./jarvis -r
-- 
Gitee


From e3be25e989cc33f720da5dec98130e49992b687c Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Mon, 15 Dec 2025 19:50:20 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=EF=BC=88HPCKit=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init.sh                                          | 16 ++++++++++++++--
 templates/basic_env/data.hpckit.config           | 11 +++++++++--
 .../vasp/6.5.1/data.vasp.arm_clang.cpu.config    | 13 ++-----------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/init.sh b/init.sh
index 44f303f3..5622d360 100644
--- a/init.sh
+++ b/init.sh
@@ -53,13 +53,25 @@ else
 fi
 
 #判断hpckit是否安装，更新配套版本
-file_path="software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng"
+file_path="${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng"
 if [ -e "$file_path" ]; then
     echo -e "你正在使用 $HPCKIT_VERSION 版本的 HPCKit"
     export BISHENG_VERSION=`ls $file_path|grep compiler|awk -F "compiler" '{print $2}'`
     export HMPI_VERSION=`ls $file_path|grep hmpi|awk -F "hmpi" '{print $2}'`
+    module purge
+    module use ${JARVIS_ROOT}/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/kml${HMPI_VERSION}/kml > /dev/null 2>&1
+    export HPCKIT_PATH=${JARVIS_UTILS}/hpckit/${HMPI_VERSION}
+    export KML_LIB_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib
+    export KML_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml
+    echo -e "已自动加载毕昇编译器、Hyper-MPI和鲲鹏数学库："
+    module li
 else
-    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 未进行安装，请继续执行\n"
+    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 未安装"
+    echo -e "INFO: 请依次执行以下命令安装 HPCKit："
+    echo -e "./jarvis -use templates/basic_env/data.hpckit.config\n./jarvis -dp"
 fi
 
 
diff --git a/templates/basic_env/data.hpckit.config b/templates/basic_env/data.hpckit.config
index 8fea0a5f..c17f48b6 100644
--- a/templates/basic_env/data.hpckit.config
+++ b/templates/basic_env/data.hpckit.config
@@ -5,14 +5,21 @@
 
 [DEPENDENCY]
 set -e
-set -x
 ./jarvis -install hpckit/${HPCKIT_VERSION} any
 
 [ENV]
+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/kml${HMPI_VERSION}/kml
+export HPCKIT_PATH=${JARVIS_UTILS}/hpckit/${HMPI_VERSION}
+export KML_LIB_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib
+export KML_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml
 
 [APP]
 app_name =
-build_dir =
+build_dir = ${JARVIS_ROOT}
 binary_dir =
 case_dir =
 
diff --git a/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config b/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
index 27dd6259..361fac9f 100644
--- a/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
+++ b/templates/vasp/6.5.1/data.vasp.arm_clang.cpu.config
@@ -16,17 +16,8 @@ tar xf ${JARVIS_DOWNLOAD}/vasp.6.5.1.tgz
 
 
 [ENV]
-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/kml${HMPI_VERSION}/kml
-module load bisheng/kml${HMPI_VERSION}/kblas/multi
-export HPCKIT_PATH=$JARVIS_UTILS/hpckit/${HMPI_VERSION}
-export KML_LIB=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib
-export KML_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml
-export LD_LIBRARY_PATH=${KML_LIB}/noarch:${KML_LIB}/${kp}:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${KML_LIB}/${kp}/kblas/multi:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${KML_LIB_PATH}/noarch:${KML_LIB_PATH}/${kp}:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${KML_LIB_PATH}/${kp}/kblas/multi:$LD_LIBRARY_PATH
 kml_path="-L${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib/noarch -lkm -lkm_l9"
 kml_inc=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/include
 blas_path="-L${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib/${kp}/kblas/multi -lkblas"
-- 
Gitee


From f7d2778efc60aa635595e548025cd4f38cc55a7d Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Mon, 15 Dec 2025 19:50:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD[DOWNLOAD]=E6=97=A0=E5=86=85=E5=AE=B9=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/downloadService.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/downloadService.py b/src/downloadService.py
index 5eee6026..3bbf79ba 100644
--- a/src/downloadService.py
+++ b/src/downloadService.py
@@ -5,6 +5,7 @@ from dataService import DataService
 from executeService import ExecuteService
 from toolService import ToolService
 
+
 class DownloadService:
     def __init__(self):
         self.hpc_data = DataService()
@@ -17,7 +18,7 @@ class DownloadService:
 
     def check_network(self):
         print(f"start network checking")
-        network_test_cmd='''
+        network_test_cmd = '''
 wget --spider -T 5 -q -t 2 www.baidu.com | echo $?
 curl -s -o /dev/null www.baidu.com | echo $?
     '''
@@ -53,8 +54,9 @@ yum makecache
             if len(url_list) == 3:
                 filename = url_list[2].strip()
             filename_url_map[filename] = url_link
-            
-        print(filename_url_map)
+
+        if filename_url_map:
+            print(filename_url_map)
         # start download
         for filename, url in filename_url_map.items():
             download_flag = True
@@ -69,4 +71,7 @@ yum makecache
                 os.remove(file_path)
 
         if not download_flag:
-            print("The download list is empty!")
+            print("The download list is empty!\n[WARNING] Due to copyright restrictions and other related "
+                  "considerations, we are unable to download the source code. Please manually upload the source code "
+                  "of the corresponding version to the downloads directory before proceeding with the installation "
+                  "steps.")
-- 
Gitee


From 7edd0b2fc0394bf139366b6c3494b6620afb77c9 Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Tue, 16 Dec 2025 11:22:24 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=EF=BC=88HPCKit=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init.sh                                | 3 +--
 templates/basic_env/data.hpckit.config | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/init.sh b/init.sh
index 5622d360..7fc0db31 100644
--- a/init.sh
+++ b/init.sh
@@ -69,8 +69,7 @@ if [ -e "$file_path" ]; then
     echo -e "已自动加载毕昇编译器、Hyper-MPI和鲲鹏数学库："
     module li
 else
-    echo -e "INFO: 检测到 $HPCKIT_VERSION 版本的 HPCKit 未安装"
-    echo -e "INFO: 请依次执行以下命令安装 HPCKit："
+    echo -e "INFO: 检测到未安装 $HPCKIT_VERSION 版本的 HPCKit，请依次执行以下命令安装："
     echo -e "./jarvis -use templates/basic_env/data.hpckit.config\n./jarvis -dp"
 fi
 
diff --git a/templates/basic_env/data.hpckit.config b/templates/basic_env/data.hpckit.config
index c17f48b6..b685f6ed 100644
--- a/templates/basic_env/data.hpckit.config
+++ b/templates/basic_env/data.hpckit.config
@@ -8,14 +8,6 @@ set -e
 ./jarvis -install hpckit/${HPCKIT_VERSION} any
 
 [ENV]
-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/kml${HMPI_VERSION}/kml
-export HPCKIT_PATH=${JARVIS_UTILS}/hpckit/${HMPI_VERSION}
-export KML_LIB_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml/bisheng/lib
-export KML_PATH=${HPCKIT_PATH}/HPCKit/${HMPI_VERSION}/kml
 
 [APP]
 app_name =
-- 
Gitee