已合并
init.sh #1148
helloworld664创建于 2月6日
init.sh #1148
已合并
helloworld664创建于 2月6日
共 1 个文件变更+22-21
Minit.sh+22-21
@@ -9,25 +9,25 @@ mkdir -p tmp
9 9 
10#设置hpcrunner相关环境变量10#设置hpcrunner相关环境变量
11 11 
12-export JARVIS_ROOT=${CUR_PATH} #hpcrunner所在路径12+export JARVIS_ROOT=$(dirname "$(realpath "$0")") #hpcrunner所在路径
13-export JARVIS_COMPILER=${CUR_PATH}/software/compiler13+export JARVIS_COMPILER=${JARVIS_ROOT}/software/compiler
14-export JARVIS_MPI=${CUR_PATH}/software/mpi14+export JARVIS_MPI=${JARVIS_ROOT}/software/mpi
15-export JARVIS_LIBS=${CUR_PATH}/software/libs15+export JARVIS_LIBS=${JARVIS_ROOT}/software/libs
16-export JARVIS_UTILS=${CUR_PATH}/software/utils16+export JARVIS_UTILS=${JARVIS_ROOT}/software/utils
17-export JARVIS_DOWNLOAD=${CUR_PATH}/downloads #应用包下载存放路径17+export JARVIS_DOWNLOAD=${JARVIS_ROOT}/downloads #应用包下载存放路径
18-export JARVIS_MODULES=${CUR_PATH}/software/modulefiles18+export JARVIS_MODULES=${JARVIS_ROOT}/software/modulefiles
19-export JARVIS_MODULEDEPS=${CUR_PATH}/software/moduledeps19+export JARVIS_MODULEDEPS=${JARVIS_ROOT}/software/moduledeps
20-export JARVIS_TMP=/tmp #应用安装路径20+export JARVIS_TMP=${JARVIS_ROOT}/tmp #应用安装路径
21-export JARVIS_TMP_DOWNLOAD=${CUR_PATH}/tmp21+export JARVIS_TMP_DOWNLOAD=${JARVIS_ROOT}/tmp
22-export JARVIS_EXE=${CUR_PATH}/exe22+export JARVIS_EXE=${JARVIS_ROOT}/exe
23export JARVIS_PROXY=https://github.com #github网络代理,默认使用官方源23export JARVIS_PROXY=https://github.com #github网络代理,默认使用官方源
24export UseGitee=1 #下载源是否优先使用gitee,1代表优先使用24export UseGitee=1 #下载源是否优先使用gitee,1代表优先使用
25export UseDev=0 #确定是否使用开发者模式,1代表使用25export UseDev=0 #确定是否使用开发者模式,1代表使用
26export UseLatest=0 #依赖是否优先安装最新版,1代表优先使用26export UseLatest=0 #依赖是否优先安装最新版,1代表优先使用
27export JARVIS_ENV=${JARVIS_ROOT}/bashrc #jarvis环境变量文件27export JARVIS_ENV=${JARVIS_ROOT}/bashrc #jarvis环境变量文件
28-export DOWNLOAD_TOOL=${CUR_PATH}/package/common/download.sh28+export DOWNLOAD_TOOL=${JARVIS_ROOT}/package/common/download.sh
29-export CHECK_DEPS=${CUR_PATH}/package/common/check_deps.sh29+export CHECK_DEPS=${JARVIS_ROOT}/package/common/check_deps.sh
30-export CHECK_ROOT=${CUR_PATH}/package/common/check_root.sh30+export CHECK_ROOT=${JARVIS_ROOT}/package/common/check_root.sh
31export kp=neon31export kp=neon
32ifsme=`lscpu|grep sme`32ifsme=`lscpu|grep sme`
33ifsve=`lscpu|grep sve`33ifsve=`lscpu|grep sve`
@@ -67,13 +67,14 @@ function check_deps() {
67 if [ -n "$ifdep" ]; then67 if [ -n "$ifdep" ]; then
68 echo "[INFO] 环境已完成基础依赖安装"68 echo "[INFO] 环境已完成基础依赖安装"
69 else69 else
70- yum -y install git time zlib zlib-devel gcc gcc-c++ environment-modules python python3 python3-devel python3-libs python3-pip 70+ yum -y install git time zlib zlib-devel gcc gcc-c++ environment-modules python python3 python3-devel \
71- yum -y install cmake make numactl numactl-devel numactl-libs rpmdevtools wget libtirpc libtirpc-devel unzip flex 71+ python3-libs python3-pip cmake make numactl numactl-devel numactl-libs rpmdevtools wget libtirpc \
72- yum -y install tar patch glibc-devel rpcbind csh perl-XML-LibXML xorg-x11-xauth curl curl-devel libcurl-devel72+ libtirpc-devel unzip flex tar patch glibc-devel rpcbind csh perl-XML-LibXML xorg-x11-xauth curl \
73- if [ $? -ne 0 ]; then73+ curl-devel libcurl-devel
74- echo "[ERROR] 基础依赖安装失败" 74+ if [ $? -ne 0 ]; then
75- exit 175+ echo "[ERROR] 基础依赖安装失败"
76- fi76+ exit 1
77+ fi
77 fi78 fi
78}79}
79 80