From 5eef84ac1d1737b6ef9f0edde955c339ef932411 Mon Sep 17 00:00:00 2001
From: DFRJ <fujiangjie@huawei.com>
Date: Thu, 14 Aug 2025 11:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0hpckit=20modulefile=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=96=B9=E5=BC=8F=E5=92=8C=E6=96=B0=E5=A2=9Ehpckit25.?=
 =?UTF-8?q?1.0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/hpckit/24.0.RC1/install.sh | 15 +--------------
 package/hpckit/25.0.0/install.sh   |  9 +--------
 package/hpckit/25.1.0/install.sh   |  4 ++++
 package/hpckit/25.1.RC1/install.sh | 15 ++++-----------
 package/hpckit/meta.sh             | 19 +++++++++++++------
 5 files changed, 23 insertions(+), 39 deletions(-)
 create mode 100644 package/hpckit/25.1.0/install.sh

diff --git a/package/hpckit/24.0.RC1/install.sh b/package/hpckit/24.0.RC1/install.sh
index 89610c7a..e1ba6cbb 100644
--- a/package/hpckit/24.0.RC1/install.sh
+++ b/package/hpckit/24.0.RC1/install.sh
@@ -2,17 +2,4 @@
 set -x
 set -e
 hpckit_ver="24.0.RC1"
-. ${DOWNLOAD_TOOL} -u https://mirrors.huaweicloud.com/kunpeng/archive/HPC/HPCKit/HPCKit_24.0.RC1_Linux-aarch64.tar.gz
-
-cd $JARVIS_TMP
-if [ ! -d HPCKit_${hpckit_ver}_Linux-aarch64 ];then
-   tar xvf $JARVIS_DOWNLOAD/HPCKit_${hpckit_ver}_Linux-aarch64.tar.gz
-fi
-cd HPCKit_${hpckit_ver}_Linux-aarch64
-sh install.sh -y --prefix=$1
-echo -e "HPCKit has installed in your environment."
-#useage:
-#1.source software/utils/hpckit/2024.3.30/HPCKit/latest/setvars.sh --use-bisheng
-#2.module purge
-#module use software/utils/hpckit/2024.3.30/HPCKit/24.3.30/modulefiles
-#module load bisheng/compiler/bishengmodule bisheng/kml/omp
+../meta.sh $1
\ No newline at end of file
diff --git a/package/hpckit/25.0.0/install.sh b/package/hpckit/25.0.0/install.sh
index 368d740c..776f800b 100644
--- a/package/hpckit/25.0.0/install.sh
+++ b/package/hpckit/25.0.0/install.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
 set -e
 export hpckit_ver="25.0.0"
-../meta.sh $1
-
-ln -s $1/HPCKit/${hpckit_ver}/modulefiles $1/../../../modulefiles/hpckit${hpckit_ver}
-
-for hmpi_file in `find -L $1/HPCKit/${hpckit_ver}/modulefiles -name hmpi`
-do
-    echo -e "\nsetenv CC mpicc \nsetenv CXX mpicxx \nsetenv FC mpifort \nsetenv F77 mpifort \nsetenv F90 mpifort " >> ${hmpi_file}
-done
\ No newline at end of file
+../meta.sh $1
\ No newline at end of file
diff --git a/package/hpckit/25.1.0/install.sh b/package/hpckit/25.1.0/install.sh
new file mode 100644
index 00000000..443dc61b
--- /dev/null
+++ b/package/hpckit/25.1.0/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+export hpckit_ver="25.1.0"
+../meta.sh $1
\ No newline at end of file
diff --git a/package/hpckit/25.1.RC1/install.sh b/package/hpckit/25.1.RC1/install.sh
index caa76afa..359717cc 100644
--- a/package/hpckit/25.1.RC1/install.sh
+++ b/package/hpckit/25.1.RC1/install.sh
@@ -1,11 +1,4 @@
-#!/bin/bash
-set -e
-export hpckit_ver="25.1.RC1"
-../meta.sh $1
-
-ln -s $1/HPCKit/${hpckit_ver}/modulefiles $1/../../../modulefiles/hpckit${hpckit_ver}
-
-for hmpi_file in `find -L $1/HPCKit/${hpckit_ver}/modulefiles -name release |grep -v kupl`
-do
-    echo -e "\nsetenv CC mpicc \nsetenv CXX mpicxx \nsetenv FC mpifort \nsetenv F77 mpifort \nsetenv F90 mpifort " >> ${hmpi_file}
-done
\ No newline at end of file
+#!/bin/bash
+set -e
+export hpckit_ver="25.1.RC1"
+../meta.sh $1
\ No newline at end of file
diff --git a/package/hpckit/meta.sh b/package/hpckit/meta.sh
index cf613e92..2b7d74be 100644
--- a/package/hpckit/meta.sh
+++ b/package/hpckit/meta.sh
@@ -10,9 +10,16 @@ if [ ! -d HPCKit_${hpckit_ver}_Linux-aarch64 ];then
 fi
 cd HPCKit_${hpckit_ver}_Linux-aarch64
 sh install.sh -y --prefix=$1
-echo -e "HPCKit has installed in your environment."
-#useage:
-#1.source software/utils/hpckit/2024.3.30/HPCKit/latest/setvars.sh --use-bisheng
-#2.module purge
-#module use software/utils/hpckit/2024.3.30/HPCKit/24.3.30/modulefiles
-#module load bisheng/compiler/bishengmodule bisheng/kml/omp
+
+software_path="$1/../../.."
+if [ ! -d ${software_path}/modulefiles/hpckit${hpckit_ver} ];then
+    ln -s $1/HPCKit/latest/modulefiles ${software_path}/modulefiles/hpckit${hpckit_ver}
+    
+    hmpi_file_list=`grep -R "\"Huawei Hyper MPI\"" $1/HPCKit/latest/modulefiles |awk -F':' '{print $1}'`
+    for hmpi_file in ${hmpi_file_list}
+    do
+            echo -e "\nsetenv CC mpicc \nsetenv CXX mpicxx \nsetenv FC mpifort \nsetenv F77 mpifort \nsetenv F90 mpifort " >> ${hmpi_file}
+    done
+fi
+
+echo -e "HPCKit has installed in your environment."
\ No newline at end of file
-- 
Gitee