diff --git a/package/kml/1.4.0/gcc/install.sh b/package/kml/1.4.0/gcc/install.sh index 5e0b92d2ef15bd975100bf079ba51d6500799cab..5368499ef8391b73b6b3e38ec92fd9977c651518 100644 --- a/package/kml/1.4.0/gcc/install.sh +++ b/package/kml/1.4.0/gcc/install.sh @@ -2,6 +2,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.1/BoostKit-kml_1.4.0.zip -f BoostKit-kml_1.4.0-gcc.zip +. ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz cd ${JARVIS_TMP} if [ -d /usr/local/kml ];then rpm -e boostkit-kml diff --git a/package/singularity/3.8.4/.keep b/package/singularity/3.8.4/.keep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/package/singularity/3.8.4/install.sh b/package/singularity/3.8.4/install.sh index ec625aff0caf6bba5c99985658885c97eba5106b..3382f0c052aecb630b4eab4c973172e1f14c7f3c 100644 --- a/package/singularity/3.8.4/install.sh +++ b/package/singularity/3.8.4/install.sh @@ -1,15 +1,15 @@ -#!/bin/bash -set -x -set -e -cd ${JARVIS_TMP} -export PATH=/usr/local/go/bin:$PATH -#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup -file_noext='singularity-ce-3.8.4' -file_name="${file_noext}.tar.gz" -. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name} -rm -rf ${file_noext} -tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} -cd ${file_noext} -./mconfig -make -C builddir +#!/bin/bash +set -x +set -e +cd ${JARVIS_TMP} +export PATH=/usr/local/go/bin:$PATH +#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup +file_noext='singularity-ce-3.8.4' +file_name="${file_noext}.tar.gz" +. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name} +rm -rf ${file_noext} +tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} +cd ${file_noext} +./mconfig +make -C builddir sudo make -C builddir install \ No newline at end of file diff --git a/package/singularity/3.9.6/install.sh b/package/singularity/3.9.6/install.sh index bdaa6193bb34affc939e3f8648c5e70c62474bd7..d7bd2760b1ef68bcea0a5df686171004715d4c7d 100755 --- a/package/singularity/3.9.6/install.sh +++ b/package/singularity/3.9.6/install.sh @@ -6,9 +6,7 @@ export PATH=/usr/local/go/bin:$PATH #sudo yum install -y libseccomp-devel squashfs-tools cryptsetup file_noext='singularity-ce-3.9.6' file_name="${file_noext}.tar.gz" -if [ ! -f "${JARVIS_DOWNLOAD}/${file_name}" ]; then - wget --no-check-certificate -P ${JARVIS_DOWNLOAD} https://github.com/sylabs/singularity/releases/download/v3.9.6/${file_name} -fi +. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.9.6/${file_name} rm -rf ${file_noext} tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} cd ${file_noext} diff --git a/package/singularity/3.9.9/install.sh b/package/singularity/3.9.9/install.sh index 562d90ce4f08d62f4588129324be924828938708..87079272675a498b29219fb347e53fc10a8c18d7 100644 --- a/package/singularity/3.9.9/install.sh +++ b/package/singularity/3.9.9/install.sh @@ -1,22 +1,16 @@ #!/bin/bash set -x set -e -. ${DOWNLOAD_TOOL} -u https://codeload.github.com/sylabs/singularity/tar.gz/refs/tags/v3.9.9 -f singularity-3.9.9.tar.gz -. ${DOWNLOAD_TOOL} -u https://dl.google.com/go/go1.18.1.linux-arm64.tar.gz cd ${JARVIS_TMP} -tar -xvf ${JARVIS_DOWNLOAD}/singularity-3.9.9.tar.gz -cd singularity-3.9.9 -tar -xvf ${JARVIS_DOWNLOAD}/go1.18.1.linux-arm64.tar.gz -export PATH=${JARVIS_TMP}/singularity-3.9.9/go/bin:$PATH -mkdir build_clang -sed -i '14c\hstcc=clang' mconfig -sed -i '16c\hstcxx=clang++' mconfig -sed -i '26c\tgtcc=clang' mconfig -sed -i '28c\tgtcxx=clang++' mconfig -./mconfig -b ./build_clang -p ./bin -cd ./build_clang -cp config.h ../cmd/starter/ -sed -i '111c\GOPROXY := https://goproxy.cn' Makefile -make -make install +export PATH=/usr/local/go/bin:$PATH +#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup +file_noext='singularity-ce-3.9.9' +file_name="${file_noext}.tar.gz" +. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.9.9/${file_name} +rm -rf ${file_noext} +tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} +cd ${file_noext} +./mconfig +make -C builddir +sudo make -C builddir install diff --git a/src/dataService.py b/src/dataService.py index 5af435936e3e817db268ca12b208d13d4d16dbb1..7f8b46c0dd87a9bfb460aee640a05d41c2e9c65b 100644 --- a/src/dataService.py +++ b/src/dataService.py @@ -155,8 +155,7 @@ cd {DataService.build_dir} {DataService.clean_cmd} ''' def get_env(self): - return f'''set -e -source ./init.sh + return f'''source ./init.sh ./jarvis -e source ./{DataService.env_file}''' diff --git a/src/installService.py b/src/installService.py index 8ce23b7becb639b5f158fe33fdce36f7676a6bd4..8ddc78177d361da695f6283e580372ca1a0e2d04 100644 --- a/src/installService.py +++ b/src/installService.py @@ -273,6 +273,10 @@ set version {sversion} module_file_content = self.get_module_file_content(install_path, sversion) if not self.is_installed(install_path): return + # if install_path is empty, The module file should not generated. + if len(os.listdir(install_path)) == 1: + print('module file did not generated because no file generated under install path') + return if stype == SType.MPI: compiler_str = cname + cmversion module_path = os.path.join(self.MODULE_DEPS_PATH, compiler_str ,software_str)