diff --git a/README.md b/README.md index 9fde4c28ea179293dc467aaa392d57d787887b9f..5fe960c3b44e9cc19040d08e0e9e32af88b8e790 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ HPC被喻为是IT行业“金字塔上的明珠”,其部署、编译、运行 ## 下载贾维斯 执行如下命令安装相关依赖并下载贾维斯 ``` -yum -y install git environment-modules python python3 python3-devel python3-libs python3-pip cmake make numactl-libs rpmbuild rpmdevtools wget unzip flex tar patch +yum -y install git time zlib zlib-devel gcc gcc-c++ environment-modules python python3 python3-devel python3-libs python3-pip cmake make numactl-libs rpmbuild rpmdevtools wget unzip flex tar patch git clone https://gitee.com/openeuler/hpcrunner.git ``` diff --git "a/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 545dcb5f5f4e669d44ae58c09ed562fc9858a66d..3ec2ad5b0cebf86dd6166608d93a7d388f34f39a 100644 --- "a/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -140,7 +140,7 @@ ar rv libblas.a ./*.o cp libblas.a /usr/local/lib # 下载并编译Python3 -yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel +yum -y install bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel wget https://repo.huaweicloud.com/python/3.7.10/Python-3.7.10.tgz -O $DEP_DOWNLOAD_DIR/Python-3.7.10.tgz tar -zxvf $DEP_DOWNLOAD_DIR/Python-3.7.10.tgz -C $DEP_BUILD_DIR cd $DEP_BUILD_DIR/Python-3.7.10 diff --git a/package/darshan/1.1.0/install.sh b/package/darshan/1.1.0/install.sh index 1d062616c7fdc461d704cddb1c7b39d1b0a7d94c..1bfff5e9a055e12388d80f5eaee64e997151700f 100644 --- a/package/darshan/1.1.0/install.sh +++ b/package/darshan/1.1.0/install.sh @@ -5,7 +5,7 @@ set -x set -e version='1.1.0' -. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser zlib-devel ghostscript +. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser ghostscript . ${DOWNLOAD_TOOL} -u https://ftp.mcs.anl.gov/pub/darshan/releases/darshan-${version}.tar.gz cd ${JARVIS_TMP} tar xvf ${JARVIS_DOWNLOAD}/darshan-${version}.tar.gz diff --git a/package/darshan/2.3.0/install.sh b/package/darshan/2.3.0/install.sh index 1c0cc1a9bca65b4d144dac851cfec67ac928ecd9..2f9f2e578047a56698140064a020f384a25cb8e3 100644 --- a/package/darshan/2.3.0/install.sh +++ b/package/darshan/2.3.0/install.sh @@ -5,7 +5,7 @@ set -x set -e version='2.3.0' -. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser zlib-devel ghostscript +. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser ghostscript . ${DOWNLOAD_TOOL} -u https://ftp.mcs.anl.gov/pub/darshan/releases/darshan-${version}.tar.gz cd ${JARVIS_TMP} tar xvf ${JARVIS_DOWNLOAD}/darshan-${version}.tar.gz diff --git a/package/darshan/3.4.6/install.sh b/package/darshan/3.4.6/install.sh index 0be079b645a5a329ba81303040a04d34404ce43b..07da2adb613f71732910ae9d3c2f3c0bd93d8843 100644 --- a/package/darshan/3.4.6/install.sh +++ b/package/darshan/3.4.6/install.sh @@ -5,7 +5,7 @@ set -x set -e version='3.4.6' -. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser zlib-devel ghostscript +. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser ghostscript . ${DOWNLOAD_TOOL} -u https://ftp.mcs.anl.gov/pub/darshan/releases/darshan-${version}.tar.gz cd ${JARVIS_TMP} tar xvf ${JARVIS_DOWNLOAD}/darshan-${version}.tar.gz diff --git a/package/darshan/3.4/install.sh b/package/darshan/3.4/install.sh index 01c54c17b7e0a6cac81ec5084e2d31c5995a1bef..8def3e61dee37fc99f7984cc938c495c7c1c7d93 100755 --- a/package/darshan/3.4/install.sh +++ b/package/darshan/3.4/install.sh @@ -5,7 +5,7 @@ set -x set -e version='3.4.0' -. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser zlib-devel ghostscript +. $CHECK_ROOT && yum install -y texlive* gnuplot perl-Pod-LaTeX perl-HTML-Parser ghostscript . ${DOWNLOAD_TOOL} -u https://ftp.mcs.anl.gov/pub/darshan/releases/darshan-${version}.tar.gz cd ${JARVIS_TMP} tar xvf ${JARVIS_DOWNLOAD}/darshan-${version}.tar.gz diff --git a/package/hdf5/1.12.0/clang/install.sh b/package/hdf5/1.12.0/clang/install.sh index aa117ec8fade0ef72c6e35ce7c6b0d474008d6eb..8f1167b0450451f2dea36c12bd5955d8befb935a 100755 --- a/package/hdf5/1.12.0/clang/install.sh +++ b/package/hdf5/1.12.0/clang/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -x set -e -. $CHECK_ROOT && yum -y install zlib zlib-devel +. $CHECK_ROOT hdf5_big_version='1.12' hdf5_version="${hdf5_big_version}.0" . ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${hdf5_big_version}/hdf5-${hdf5_version}/src/hdf5-${hdf5_version}.tar.gz diff --git a/package/hdf5/1.12.1/clang/install.sh b/package/hdf5/1.12.1/clang/install.sh index 7b06a78bab5dab2136ce0ce38dff85fefd0d470d..50c470740e07407a9eac9263ca5eb7cf9cbe8a62 100644 --- a/package/hdf5/1.12.1/clang/install.sh +++ b/package/hdf5/1.12.1/clang/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -x set -e -. $CHECK_ROOT && yum -y install zlib zlib-devel +. $CHECK_ROOT hdf5_big_version='1.12' hdf5_version="${hdf5_big_version}.1" . ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${hdf5_big_version}/hdf5-${hdf5_version}/src/hdf5-${hdf5_version}.tar.gz diff --git a/package/hdf5/1.13.0/clang/install.sh b/package/hdf5/1.13.0/clang/install.sh index 02fb45ee69f03427210c76c0d8c335a8ef653d5d..ade768fc10c2f58183f6021a1f090bcdfe4fba24 100644 --- a/package/hdf5/1.13.0/clang/install.sh +++ b/package/hdf5/1.13.0/clang/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -x set -e -. $CHECK_ROOT && yum -y install zlib zlib-devel +. $CHECK_ROOT hdf5_big_version='1.13' hdf5_version="${hdf5_big_version}.0" . ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${hdf5_big_version}/hdf5-${hdf5_version}/src/hdf5-${hdf5_version}.tar.gz @@ -12,5 +12,5 @@ cd hdf5-${hdf5_version} export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 ./configure --prefix=$1 --enable-fortran --enable-static=yes --with-zlib=/usr/lib --enable-parallel --enable-shared CFLAGS="-O3 -fPIC -Wno-incompatible-pointer-types-discards-qualifiers -Wno-non-literal-null-conversion" FCFLAGS="-O3 -fPIC" LDFLAGS="-Wl,--build-id" sed -i '11835c wl="-Wl,"' libtool -make -j16 +make -j make install diff --git a/package/ncl/6.6.2/install.sh b/package/ncl/6.6.2/install.sh index 4d6309fdce6d6aae9b2ab7bd760dc1edc91d99a6..7a1f5a472697a1ad1bfaba9957ce604a3b37124b 100755 --- a/package/ncl/6.6.2/install.sh +++ b/package/ncl/6.6.2/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # download from $JARVIS_PROXY/NCAR/ncl/archive/refs/tags/6.6.2.tar.gz -. $CHECK_ROOT && yum install zlib zlib-devel expat-devel freetype freetype-devel freetype-demos python-freetype ftgl ftgl-devel udunits2 udunits2-devel +. $CHECK_ROOT && yum install expat-devel freetype freetype-devel freetype-demos python-freetype ftgl ftgl-devel udunits2 udunits2-devel set -x set -e . ${DOWNLOAD_TOOL} -u $JARVIS_PROXY/NCAR/ncl/archive/refs/tags/6.6.2.tar.gz diff --git a/package/python2/2.7.16/install.sh b/package/python2/2.7.16/install.sh index 74a0b676c245bb24e8e3b00c750d421d450f60d1..96c774ce691352b8fa4e560b97dd11756a347407 100755 --- a/package/python2/2.7.16/install.sh +++ b/package/python2/2.7.16/install.sh @@ -3,7 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tgz cd ${JARVIS_TMP} -. $CHECK_ROOT && yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel +. $CHECK_ROOT && yum -y install bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel rm Python-2.7.16 -rf tar -zxvf ${JARVIS_DOWNLOAD}/Python-2.7.16.tgz cd Python-2.7.16 diff --git a/package/python3/3.6.8/install.sh b/package/python3/3.6.8/install.sh index 17e35e528d925901af1a34189d683376b3dd89b2..5ec899e54b40eca17d5e62115f4fd286d985df9b 100755 --- a/package/python3/3.6.8/install.sh +++ b/package/python3/3.6.8/install.sh @@ -3,7 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://repo.huaweicloud.com/python/3.6.8/Python-3.6.8.tgz cd ${JARVIS_TMP} -. $CHECK_ROOT && yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel +. $CHECK_ROOT && yum -y install bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel tar -zxvf ${JARVIS_DOWNLOAD}/Python-3.6.8.tgz cd Python-3.6.8 ./configure --prefix=$1 --with-ensurepip=yes CFLAGS="-O3 -Wno-implicit-function-declaration" diff --git a/package/python3/3.7.10/install.sh b/package/python3/3.7.10/install.sh index eb7affe570fd701beb4050672bd4459acd5eeeb4..f6d6767827f3da3c48fc5928891da79134ff0530 100755 --- a/package/python3/3.7.10/install.sh +++ b/package/python3/3.7.10/install.sh @@ -3,7 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://repo.huaweicloud.com/python/3.7.10/Python-3.7.10.tgz cd ${JARVIS_TMP} -. $CHECK_ROOT && yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel +. $CHECK_ROOT && yum -y install bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel tar -zxvf ${JARVIS_DOWNLOAD}/Python-3.7.10.tgz cd Python-3.7.10 ./configure --prefix=$1 diff --git a/package/python3/3.9.9/install.sh b/package/python3/3.9.9/install.sh index 812dde2f81927655f48688d8efdfb28a0a088502..890ed6211955414ad1722fc2a259d805ee674db2 100755 --- a/package/python3/3.9.9/install.sh +++ b/package/python3/3.9.9/install.sh @@ -3,7 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://repo.huaweicloud.com/python/3.9.9/Python-3.9.9.tgz cd ${JARVIS_TMP} -. $CHECK_ROOT && yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel +. $CHECK_ROOT && yum -y install bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel tar -zxvf ${JARVIS_DOWNLOAD}/Python-3.9.9.tgz cd Python-3.9.9 ./configure --prefix=$1 --with-ensurepip=yes CFLAGS="-O3 -Wno-implicit-function-declaration" diff --git a/src/installService.py b/src/installService.py index 8fb1a8b584ed5850f9b5637dcc9f96a4d5c6546f..59b6587365fe4b5f4b02c981e4cd6e9caa1e00ac 100644 --- a/src/installService.py +++ b/src/installService.py @@ -120,11 +120,12 @@ class InstallService: ucg_path = os.path.dirname(ucg_path) libr_path = os.path.join(ucg_path, "../../../") - print(libr_path) version = None for version in os.listdir(libr_path): print(version) - return self.get_version_info(version) + if version != latest + return self.get_version_info(version) + return self.get_version_info(version) def get_hmpi_info(self): diff --git a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.config b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.config index efb60ebe96524f3a3215852e0cec6d2b3f475b0c..c50ea98f51bf6831597df238f19c613c15564016 100644 --- a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.config +++ b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.config @@ -11,7 +11,7 @@ set -e set -x module purge -yum install zlib-devel bzip2 bzip2-devel xz-devel libcurl-devel -y +yum install bzip2 bzip2-devel xz-devel libcurl-devel -y ./jarvis -install bisheng/4.1.0 com module use ./software/modulefiles diff --git a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config index d216ba9ca59d735dc20f33bf9a8c80452c9b73f1..9ff6baf87f870eec6c8b45bd8f8c3a555ae05edc 100644 --- a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config +++ b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config @@ -11,7 +11,7 @@ set -e set -x module purge -yum install zlib-devel bzip2 bzip2-devel xz-devel libcurl-devel -y +yum install bzip2 bzip2-devel xz-devel libcurl-devel -y ./jarvis -install hpckit/24.0.0 any source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force diff --git a/templates/duns/4.7.1/data.duns.arm.cpu.config b/templates/duns/4.7.1/data.duns.arm.cpu.config new file mode 100644 index 0000000000000000000000000000000000000000..0928c2fb5ffd48097123faea3501874df2867aef --- /dev/null +++ b/templates/duns/4.7.1/data.duns.arm.cpu.config @@ -0,0 +1,79 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +duns/2.7.1 https://sourceforge.net/projects/duns/files/duns/duns-2.7.1/duns-2.7.1-src.tar.bz2 +duns_test/2.7.1 https://sourceforge.net/projects/duns/files/duns/duns-2.7.1/duns-2.7.1-test.tar.bz2 + +[DEPENDENCY] + + +[ENV] +export CC=mpicc CXX=mpicxx FC=mpifort +module use /hpcrunner/software/moduledeps +module use /hpcrunner/software/modulefiles +cd /hpcrunner +git pull +module use /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1 +./jarvis -install bisheng/4.0.0-mini com +export CC=clang CXX=clang++ FC=flang +./jarvis -install package/hmpi/2.4.1 bisheng +#export CC=mpicc CXX=mpicxx FC=mpifort +module load bisheng/4.0.0-mini +module load bisheng4.0.0/hmpi/2.4.1 + +[APP] +app_name = duns +build_dir = ${JARVIS_DOWNLOAD}/duns-2.7.1 +binary_dir = +case_dir = ${JARVIS_DOWNLOAD}/duns-2.7.1/test/serial/cduct + +[BUILD] +cd ${JARVIS_DOWNLOAD}/ +tar -xf ${JARVIS_DOWNLOAD}/duns-2.7.1-src.tar.bz2 +tar -xf ${JARVIS_DOWNLOAD}/duns-2.7.1-test.tar.bz2 +cd duns-2.7.1 +export COPTIONS="-mcpu=linxicore9100 -mllvm -force-customized-pipeline=true" +export FOPTIONS="-mcpu=linxicore9100 -mllvm -force-customized-pipeline=true" +sed -i '10s/g77/flang/' makesystem/Makesystem_linux +sed -i '11s/gcc/clang/' makesystem/Makesystem_linux +sed -i '12s/g++/clang++/' makesystem/Makesystem_linux +sed -i '13s/gcc/clang -std=c90/' makesystem/Makesystem_linux +sed -i '14s/gcc/clang/' makesystem/Makesystem_linux +sed -i "28s#.*#SYSLIBS = -L${JARVIS_COMPILER}/bisheng/4.0.0-mini/lib -Wl,-Bdynamic -lgcc_s -lm -lflang -lpgmath#" makesystem/Makesystem_linux +sed -i '29s#.*#GRAFLIBS = -lmbgrafic -lgrafic -L/lib64 -Wl,-Bdynamic -lX11 -lflang#' makesystem/Makesystem_linux +sed -i '339s/help()/help(0)/' src/main.cpp +sed -i '345s/help()/help(0)/' src/main.cpp +sed -i '349s/help()/help(0)/' src/main.cpp +sed -i 's/getline1111111111/getline1111111111/g' `grep getline -rl --include="*" ./` +sed -i '275s/tzp/*tzp/' lib/Xunderscore.c +#sed -i "69a%\tsed -i '1a#define _POSIX_C_SOURCE 199309L' dunsc.c" src/Makefile +#sed -i 70s/\%// src/Makefile +export DUNSARCH=linux +export DUNSPATH27=`pwd` +export PATH=$DUNSPATH27/util:$PATH +cd lib +make && make install +cd .. +dunssource 3d all +sed -i '20a#define _POSIX_C_SOURCE 199309L' duns-3d-all/setsignals.c +sed -i '13s/clang/clang -ansi' duns-3d-all/Makesystem +cd duns-3d-all +make +mkdir -p ${JARVIS_LIBS}/bisheng4.0.0-mini/duns/2.7.1/bin +cp duns.e dunsplot.e ${JARVIS_LIBS}/bisheng4.0.0-mini/duns/2.7.1/bin +[RUN] +run = +binary = +nodes = 1 + + +mkdir /hpcrunner/software/moduledeps/bisheng4.0.0-mini/duns -p +cat >> /hpcrunner/software/moduledeps/bisheng4.0.0-mini/duns/2.7.1 << EOF +#%Module1.0 +set prefix ${JARVIS_LIBS}/bisheng4.0.0-mini/duns/2.7.1 +set version 2.7.1 +setenv DUNS_PATH $prefix +prepend-path PATH $prefix/bin + +EOF diff --git a/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config b/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config index 6683dc5a8d1a04d98faf3beb785f4efc39332d49..a9578bb16df6d14daf229bd56f1c4354c51f4c82 100644 --- a/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config +++ b/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config @@ -9,7 +9,7 @@ boost/1.72.0 https://nchc.dl.sourceforge.net/project/boost/boost/1.72.0/boost_1_ set -e set -x -yum install zlib-devel git cmake make git vim tar time glibc-headers gcc-c++ -y +yum install glibc-headers -y yum install fftw-devel fftw3-devel -y yum install libxml2-devel libxslt-devel cmake -y pip3 install numpy --upgrade --force-reinstall diff --git a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config index 35727f37243de944ff539fe3fbdd52529a62255b..668e6ac4a49e3de2865f882fbddc25212a57ac8a 100644 --- a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config +++ b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config @@ -6,7 +6,7 @@ [DEPENDENCY] set -e set -x -./CHECK_ROOT && yum install -y time.aarch64 zlib.aarch64 zlib-devel.aarch64 libtirpc.aarch64 libtirpc-devel.aarch64 numactl.aarch64 +./CHECK_ROOT && yum install -y libtirpc.aarch64 libtirpc-devel.aarch64 numactl.aarch64 module purge ./jarvis -install hpckit/24.0.0 com module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles diff --git a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config index 50329f29bad10d05538316fce34e9ee0899a243d..0cd902980e26d5244df7b881d9d3d3ffb3e8dda0 100644 --- a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config +++ b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config @@ -5,7 +5,7 @@ NCL/6.3.0 $JARVIS_PROXY/chen-shaoheng/NCL-SOURCE/releases/download/ncl-6.3.0/ncl-6.3.0.tar.gz [DEPENDENCY] -yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel zlib-devel cairo cairo-devel pixman pixman-devel patch -y +yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel cairo cairo-devel pixman pixman-devel -y ./jarvis -install bisheng/3.2.0-mini com module use ./software/modulefiles diff --git a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config index ca573b8b25e87d838c8ee7141e1ec0d2e5bfffb1..7db554a4a3d340e5b11e15f1c5125346972ca405 100644 --- a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config +++ b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config @@ -5,7 +5,7 @@ NCL/6.3.0 $JARVIS_PROXY/chen-shaoheng/NCL-SOURCE/releases/download/ncl-6.3.0/ncl-6.3.0.tar.gz [DEPENDENCY] -yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel zlib-devel cairo cairo-devel pixman pixman-devel patch -y +yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel cairo cairo-devel pixman pixman-devel -y ./jarvis -install bisheng/3.2.0-mini com module use ./software/modulefiles diff --git a/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config b/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config index fa42e1b167a3ec8b670fab6b46478ae46cbc752b..c167a124b04728fb3e59e96cbd835a4ee232c043 100644 --- a/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config @@ -5,7 +5,7 @@ NCL/6.6.2 $JARVIS_PROXY/chen-shaoheng/NCL-SOURCE/releases/download/ncl-6.6.2/ncl-6.6.2.tar.gz [DEPENDENCY] -yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel zlib-devel cairo cairo-devel pixman pixman-devel patch -y +yum install tar byacc bison expat-devel expat libtirpc-devel libX11 libX11-devel libXmu* libXaw libXaw-devel flex flex-devel freetype-devel libpng-devel libXi libSM-devel libXi-devel libXext-devel pkgconf curl libcurl-devel cairo cairo-devel pixman pixman-devel -y ./jarvis -install bisheng/3.2.0-mini com module use ./software/modulefiles diff --git a/templates/ncview/2.1.5/data.ncview.arm.cpu.config b/templates/ncview/2.1.5/data.ncview.arm.cpu.config index 8f1ffbdcde584b93f75fb536e0fa59636ccb7868..9c751ee66f672a49e5020ddc79b8dcc2737050fa 100644 --- a/templates/ncview/2.1.5/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.5/data.ncview.arm.cpu.config @@ -42,7 +42,7 @@ binary_dir = case_dir = ${JARVIS_ROOT}/case [BUILD] -. $CHECK_ROOT && yum install libX11 libX11-devel libXaw libXaw-devel libpng-devel libpng curl curl-devel zlib zlib-devel libXt-devel xorg-x11-xauth xorg-x11-server-utils xorg-x11-server-Xnest libXtst -y +. $CHECK_ROOT && yum install libX11 libX11-devel libXaw libXaw-devel libpng-devel libpng curl curl-devel libXt-devel xorg-x11-xauth xorg-x11-server-utils xorg-x11-server-Xnest libXtst -y set -x set -e cd ${JARVIS_TMP} diff --git a/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config b/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config index 8cabb27d7a9bae19aee500672bdad476d3dacc1b..1f7559a0dd70ab85628741cb32a33efd34c1c040 100644 --- a/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config +++ b/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config @@ -9,7 +9,7 @@ eigen/3.4.0 https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz set -e set -x -yum install zlib-devel git cmake make git vim tar time glibc-headers gcc-c++ python3-devel -y +yum install time glibc-headers -y ./jarvis -install hpckit/24.0.0 any module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge diff --git a/templates/plink/1.9/data.plink.arm-920.cpu.config b/templates/plink/1.9/data.plink.arm-920.cpu.config index a1236b032d9bb411aee47aedf79c23e0ee07c7b6..fd7f536569ddf68a81b1a6ff2287eb27f2ed39f8 100644 --- a/templates/plink/1.9/data.plink.arm-920.cpu.config +++ b/templates/plink/1.9/data.plink.arm-920.cpu.config @@ -6,7 +6,7 @@ plink/1.9 https://github.com/chrchang/plink-ng/archive/refs/heads/master.zip pli [DEPENDENCY] yum install make cmake gcc g++ -y -dnf install openblas-devel zstd-devel zlib-devel -y +dnf install openblas-devel zstd-devel -y module purge ./jarvis -install hpckit/24.0.0 com diff --git a/templates/sambamba/0.8.2/data.sambamba.arm.cpu.bisheng.config b/templates/sambamba/0.8.2/data.sambamba.arm.cpu.bisheng.config index b816286be832a6ed7c6baaeee86345f792877787..34556c10045b96d5234bb8610d25cf58f29b74a7 100644 --- a/templates/sambamba/0.8.2/data.sambamba.arm.cpu.bisheng.config +++ b/templates/sambamba/0.8.2/data.sambamba.arm.cpu.bisheng.config @@ -17,7 +17,7 @@ module add bisheng/compiler4.1.0/bishengmodule export CC=`which clang` export CXX=`which clang++` export FC=`which flang` -sudo dnf install zlib-devel lz4-devel +sudo dnf install lz4-devel tar -xzvf ${JARVIS_DOWNLOAD}/sambamba-0.8.2.tar.gz tar xf ${JARVIS_DOWNLOAD}/ldc2-1.29.0-linux-aarch64.tar.xz mkdir -p ldc diff --git a/templates/wps/4.6.0/bisheng/data.wps.arm.cpu.bisheng.hmpi.config b/templates/wps/4.6.0/bisheng/data.wps.arm.cpu.bisheng.hmpi.config index 92ac3a3a779a81ec1a69a21b1cf3ff8986902964..1970020f1ff6f3897dff30f5e29a07f1b6ba68c9 100644 --- a/templates/wps/4.6.0/bisheng/data.wps.arm.cpu.bisheng.hmpi.config +++ b/templates/wps/4.6.0/bisheng/data.wps.arm.cpu.bisheng.hmpi.config @@ -15,7 +15,7 @@ if [ ! -d "${JARVIS_ROOT}/WRF-4.2" ]; then #判断wrf是否安装 ./jarvis -e ./jarvis -b" fi -yum install -y time.aarch64 zlib.aarch64 zlib-devel.aarch64 libtirpc.aarch64 libtirpc-devel.aarch64 csh +yum install -y libtirpc.aarch64 libtirpc-devel.aarch64 csh module purge ./jarvis -install hpckit/25.0.0 com module use ./software/compiler/hpckit/25.0.0/HPCKit/latest/modulefiles diff --git a/templates/wrf/4.2.1/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.2.1/bisheng/data.wrf.arm.cpu.config index dbacf621d131a5c564cf6f209171f9f9b694042c..e80e27182cbf4799bd60d075714ace92dbeaff69 100644 --- a/templates/wrf/4.2.1/bisheng/data.wrf.arm.cpu.config +++ b/templates/wrf/4.2.1/bisheng/data.wrf.arm.cpu.config @@ -9,7 +9,7 @@ case/conus12km https://www2.mmm.ucar.edu/wrf/src/conus12km.tar.gz set -e set -x # basic system components -./CHECK_ROOT && yum install -y time.aarch64 zlib.aarch64 zlib-devel.aarch64 libtirpc.aarch64 libtirpc-devel.aarch64 +./CHECK_ROOT && yum install -y libtirpc.aarch64 libtirpc-devel.aarch64 module purge module use ./software/modulefiles ./jarvis -install bisheng/3.2.0-mini com diff --git a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config index 9db74176d235fa7da0fa65ead8312ba4f8d87d77..dbe60687052f9f40e0adb3583294dd2c370f3189 100644 --- a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config +++ b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config @@ -8,7 +8,7 @@ wrf/4.2 $JARVIS_PROXY/wrf-model/WRF/archive/refs/tags/v4.2.tar.gz wrf-4.2.tar.gz set -e set -x # basic system components -yum install -y time.aarch64 zlib.aarch64 zlib-devel.aarch64 libtirpc.aarch64 libtirpc-devel.aarch64 csh +yum install -y libtirpc.aarch64 libtirpc-devel.aarch64 csh module purge ./jarvis -install hpckit/25.0.0 com module use ./software/compiler/hpckit/25.0.0/HPCKit/latest/modulefiles diff --git a/templates/wrf/4.6.0/data.wrf.arm.cpu.config b/templates/wrf/4.6.0/data.wrf.arm.cpu.config index 82acaef3e46b58cfea651d2a8896eb4e764eba75..c4b220edd98124c488daaa1ffd255c23c0899f25 100644 --- a/templates/wrf/4.6.0/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.0/data.wrf.arm.cpu.config @@ -14,7 +14,7 @@ export CXX=`which mpicxx` export FC=`which mpifort` # basic system components -yum install -y time zlib zlib-devel libtirpc libtirpc-devel patch +yum install -y time libtirpc libtirpc-devel wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.5.4.tar.gz -O /hpcrunner/downloads/netcdf-fortran-4.5.4.tar.gz --no-check-certificate wget https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.8.1.tar.gz/ -O /hpcrunner/downloads/netcdf-c-4.8.1.tar.gz --no-check-certificate diff --git a/templates/wrf/4.6.0/data.wrf.arm.cpu.sve.config b/templates/wrf/4.6.0/data.wrf.arm.cpu.sve.config index 035fa657b9e56e9c00c8f3f98c140ce4710d0fd8..30e3c6848110e5c1878f6497df56ee52c730ba37 100644 --- a/templates/wrf/4.6.0/data.wrf.arm.cpu.sve.config +++ b/templates/wrf/4.6.0/data.wrf.arm.cpu.sve.config @@ -14,7 +14,7 @@ export CXX=`which mpicxx` export FC=`which mpifort` # basic system components -yum install -y time zlib zlib-devel libtirpc libtirpc-devel patch +yum install -y libtirpc libtirpc-devel wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.5.4.tar.gz -O /hpcrunner/downloads/netcdf-fortran-4.5.4.tar.gz --no-check-certificate wget https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.8.1.tar.gz/ -O /hpcrunner/downloads/netcdf-c-4.8.1.tar.gz --no-check-certificate diff --git a/templates/wrf/4.6.0/data.wrf.cpu.sve.config b/templates/wrf/4.6.0/data.wrf.cpu.sve.config index a8f2a0c2e85f209d713e1be819676462ec4aff36..d6c9d31abfbccdff187c74a6abd2f3eee4d9426b 100644 --- a/templates/wrf/4.6.0/data.wrf.cpu.sve.config +++ b/templates/wrf/4.6.0/data.wrf.cpu.sve.config @@ -30,7 +30,7 @@ module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread ./jarvis -install jasper/1.900.2 bisheng # basic system components -yum install -y time zlib zlib-devel libtirpc libtirpc-devel patch +yum install -y libtirpc libtirpc-devel [ENV] #!/bin/bash