From 4f96eb042e7a79b950a5edd3174d12057b4bd15b Mon Sep 17 00:00:00 2001
From: DFRJ <fujiangjie@huawei.com>
Date: Thu, 6 Nov 2025 06:15:26 +0000
Subject: [PATCH 1/2] update data.config.

Signed-off-by: DFRJ <fujiangjie@huawei.com>
---
 data.config | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/data.config b/data.config
index 6933f6cc..24ca5461 100644
--- a/data.config
+++ b/data.config
@@ -7,17 +7,39 @@ qe/6.4 $JARVIS_PROXY/QEF/q-e/archive/refs/tags/qe-6.4.1.tar.gz qe-6.4.1.tar.gz
 [DEPENDENCY]
 set -e
 set -x
-./jarvis -install hpckit/25.1.0 any
+if [ ${UseLatest} -eq 0 ];then
+    hpckit_ver=25.1.0
+elif [ ${UseLatest} -eq 1 ];then
+    hpckit_ver=latest
+else
+    echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
+    exit 1
+fi
+echo $hpckit_ver
+exit 1
+./jarvis -install hpckit/${hpckit_ver} any
 module purge
 module use ./software/modulefiles
 cd ${JARVIS_ROOT}/tmp
+rm -rf q-e-qe-6.4.1
 tar -xzvf ${JARVIS_DOWNLOAD}/qe-6.4.1.tar.gz
 
 [ENV]
+if [ ${UseLatest} -eq 0 ];then
+    hpckit_ver=25.1.0
+elif [ ${UseLatest} -eq 1 ];then
+    hpckit_ver=latest
+else
+    echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
+    exit 1
+fi
+
+BISHENG_VERSION=`ls software/utils/hpckit/${hpckit_ver}/HPCKit/${hpckit_ver}/modulefiles/bisheng|grep compiler|awk -F "compiler" '{print $2}'`
+HMPI_VERSION=`ls software/utils/hpckit/${hpckit_ver}/HPCKit/${hpckit_ver}/modulefiles/bisheng|grep hmpi|awk -F "hmpi" '{print $2}'`
 module purge
 module use ./software/modulefiles
-module load hpckit25.1.0/bisheng/compiler4.2.0.2/bishengmodule
-module load hpckit25.1.0/bisheng/hmpi25.1.0/release
+module load hpckit${HMPI_VERSION}/bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load hpckit${HMPI_VERSION}/bisheng/hmpi${HMPI_VERSION}/release
 
 [APP]
 app_name = QE
@@ -36,4 +58,4 @@ make clean
 [RUN]
 run = mpirun --allow-run-as-root -x OMP_NUM_THREADS=1 -np 64
 binary = pw.x -input test_3.in
-nodes = 1
\ No newline at end of file
+nodes = 1
-- 
Gitee


From 89654e80626bf7e6bf7352cc4a32aea81835747c Mon Sep 17 00:00:00 2001
From: DFRJ <fujiangjie@huawei.com>
Date: Thu, 6 Nov 2025 06:18:32 +0000
Subject: [PATCH 2/2] update data.config.

Signed-off-by: DFRJ <fujiangjie@huawei.com>
---
 data.config | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data.config b/data.config
index 24ca5461..a6fb1c29 100644
--- a/data.config
+++ b/data.config
@@ -7,17 +7,17 @@ qe/6.4 $JARVIS_PROXY/QEF/q-e/archive/refs/tags/qe-6.4.1.tar.gz qe-6.4.1.tar.gz
 [DEPENDENCY]
 set -e
 set -x
+
 if [ ${UseLatest} -eq 0 ];then
-    hpckit_ver=25.1.0
+    HPCKIT_VERSION=25.1.0
 elif [ ${UseLatest} -eq 1 ];then
-    hpckit_ver=latest
+    HPCKIT_VERSION=latest
 else
     echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
     exit 1
 fi
-echo $hpckit_ver
-exit 1
-./jarvis -install hpckit/${hpckit_ver} any
+
+./jarvis -install hpckit/${HPCKIT_VERSION} any
 module purge
 module use ./software/modulefiles
 cd ${JARVIS_ROOT}/tmp
@@ -26,16 +26,16 @@ tar -xzvf ${JARVIS_DOWNLOAD}/qe-6.4.1.tar.gz
 
 [ENV]
 if [ ${UseLatest} -eq 0 ];then
-    hpckit_ver=25.1.0
+    HPCKIT_VERSION=25.1.0
 elif [ ${UseLatest} -eq 1 ];then
-    hpckit_ver=latest
+    HPCKIT_VERSION=latest
 else
     echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
     exit 1
 fi
 
-BISHENG_VERSION=`ls software/utils/hpckit/${hpckit_ver}/HPCKit/${hpckit_ver}/modulefiles/bisheng|grep compiler|awk -F "compiler" '{print $2}'`
-HMPI_VERSION=`ls software/utils/hpckit/${hpckit_ver}/HPCKit/${hpckit_ver}/modulefiles/bisheng|grep hmpi|awk -F "hmpi" '{print $2}'`
+BISHENG_VERSION=`ls software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng|grep compiler|awk -F "compiler" '{print $2}'`
+HMPI_VERSION=`ls software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng|grep hmpi|awk -F "hmpi" '{print $2}'`
 module purge
 module use ./software/modulefiles
 module load hpckit${HMPI_VERSION}/bisheng/compiler${BISHENG_VERSION}/bishengmodule
-- 
Gitee