diff --git a/package/hpckit/24.0.RC1/install.sh b/package/hpckit/24.0.RC1/install.sh index 89610c7a2747fd1c8f3fc1fb8e732679771aee12..e1ba6cbb0413f5cae398da83a65a17c2063a9c2c 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 368d740c80be9854a74f2c59f7ecc85484febc34..776f800b21cff5ce294144bb3d2ee4800389857c 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 0000000000000000000000000000000000000000..443dc61bb2c7f008a24b8cb57dcbdc81d1df6afd --- /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 caa76afaada2b362d1eb11cd6d39259fa75793ed..359717ccdc57a086bee78b6e14397be0464bd314 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 cf613e92b7b29b0da9409a9f23bcaca0fcd3f7df..2b7d74bed3e3d9ffbab9e258757ed752036b3ed1 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