From c426f809b22071094ce6b45f3dd491f9d625438b Mon Sep 17 00:00:00 2001 From: wang_songsong1 <1693764552@qq.com> Date: Sun, 14 Aug 2022 00:50:26 +0800 Subject: [PATCH] fix some shell problems --- benchmark/gemm/run.sh | 4 ++-- benchmark/omp/run.sh | 4 ++-- benchmark/p2p/run.sh | 4 ++-- init.sh | 4 ++-- jarvis | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/benchmark/gemm/run.sh b/benchmark/gemm/run.sh index 4452ca47..0c9649b6 100644 --- a/benchmark/gemm/run.sh +++ b/benchmark/gemm/run.sh @@ -23,8 +23,8 @@ x86Run(){ ${mpi_cmd} ./gemm 4024 4024 4024 0 } # check Arch -if [ x$(arch) = xaarch64 ];then +if [ x"$(arch)" = xaarch64 ];then armRun else x86Run -fi \ No newline at end of file +fi diff --git a/benchmark/omp/run.sh b/benchmark/omp/run.sh index 3784d96d..440cdb73 100644 --- a/benchmark/omp/run.sh +++ b/benchmark/omp/run.sh @@ -11,8 +11,8 @@ x86Run(){ armRun } # check Arch -if [ x$(arch) = xaarch64 ];then +if [ x"$(arch)" = xaarch64 ];then armRun else x86Run -fi \ No newline at end of file +fi diff --git a/benchmark/p2p/run.sh b/benchmark/p2p/run.sh index 71843dae..d7c966f2 100644 --- a/benchmark/p2p/run.sh +++ b/benchmark/p2p/run.sh @@ -9,8 +9,8 @@ x86Run(){ armRun } # check Arch -if [ x$(arch) = xaarch64 ];then +if [ x"$(arch)" = xaarch64 ];then armRun else x86Run -fi \ No newline at end of file +fi diff --git a/init.sh b/init.sh index 0ab26130..6062a6ea 100644 --- a/init.sh +++ b/init.sh @@ -2,7 +2,7 @@ CUR_PATH=$(pwd) chmod -R +x ./benchmark chmod -R +x ./package chmod -R +x ./test -chmod +x *.sh +chmod +x ./*.sh chmod +x jarvis mkdir -p tmp export JARVIS_ROOT=${CUR_PATH} @@ -16,5 +16,5 @@ export DOWNLOAD_TOOL=${CUR_PATH}/package/common/download.sh #Install modules if ! type module >/dev/null 2>&1;then echo "Install environment-modules" - yum install -y environment-modules + yum install -y environment-modules || apt install -y environment-modules fi diff --git a/jarvis b/jarvis index b6443c5e..c2f35a4b 100644 --- a/jarvis +++ b/jarvis @@ -1,2 +1,4 @@ #!/bin/bash -python3 ./src/jarvis.py $* \ No newline at end of file +#python3 ./src/jarvis.py $* +#prevent whitespace problems +python3 ./src/jarvis.py "$@" -- Gitee