diff --git a/package/bedtools/2.28.0/install.sh b/package/bedtools/2.28.0/clang/install.sh similarity index 76% rename from package/bedtools/2.28.0/install.sh rename to package/bedtools/2.28.0/clang/install.sh index ff99268b456c9e431dfa5d5a86adb22ca90bbcc6..9741bcaa25d6f05810acc4def916531796ad30c4 100644 --- a/package/bedtools/2.28.0/install.sh +++ b/package/bedtools/2.28.0/clang/install.sh @@ -3,6 +3,7 @@ #wget https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz set -x set -e +. ${DOWNLOAD_TOOL} -u https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz cd ${JARVIS_TMP} rm -rf bedtools2 tar -zxvf ${JARVIS_DOWNLOAD}/bedtools-2.28.0.tar.gz diff --git a/package/blas/3.10.0/bisheng/install.sh b/package/blas/3.10.0/clang/install.sh similarity index 81% rename from package/blas/3.10.0/bisheng/install.sh rename to package/blas/3.10.0/clang/install.sh index 4bceade8a93c6a4d495566c0deca0cda525a6b76..a8328d78f22baa7c33583643301af109aa7d2f78 100644 --- a/package/blas/3.10.0/bisheng/install.sh +++ b/package/blas/3.10.0/clang/install.sh @@ -2,6 +2,7 @@ #http://www.netlib.org/blas/blas-3.10.0.tgz set -x set -e +. ${DOWNLOAD_TOOL} -u http://www.netlib.org/blas/blas-3.10.0.tgz cd ${JARVIS_TMP} rm -rf BLAS-3.10.0 tar -xvf ${JARVIS_DOWNLOAD}/blas-3.10.0.tgz diff --git a/package/curl/7.82.0/install.sh b/package/curl/7.82.0/install.sh index d57c5811139679884a4262c220b23721f31c43a3..83f8d7a86d034829a97be290e29a9437cfa62cb4 100644 --- a/package/curl/7.82.0/install.sh +++ b/package/curl/7.82.0/install.sh @@ -2,6 +2,7 @@ #https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz set -x set -e +. {DOWNLOAD_TOOL} -u https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz cd ${JARVIS_TMP} rm -rf curl-7.82.0 tar -xvf ${JARVIS_DOWNLOAD}/curl-7.82.0.tar.gz diff --git a/package/openjpeg/2.4.0/install.sh b/package/openjpeg/2.4.0/install.sh index 1324c478edd384f2d06742b70084d77ee4423ea7..87d16472ba30f9a2cbfe8f3a474e50a5345da058 100644 --- a/package/openjpeg/2.4.0/install.sh +++ b/package/openjpeg/2.4.0/install.sh @@ -2,6 +2,7 @@ #https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz set -x set -e +. ${DOWNLOAD_TOOL} -u https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz -f /openjpeg-2.4.0.tar.gz cd ${JARVIS_TMP} rm -rf openjpeg-2.4.0 tar -xvf ${JARVIS_DOWNLOAD}/openjpeg-2.4.0.tar.gz diff --git a/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/install.sh index 58fc7d123ef3a75baa9059543b1287bf93eae270..79379fc91d25df3b8629b4c55e0d500cd7b0ac07 100644 --- a/package/pnetcdf/1.11.2/install.sh +++ b/package/pnetcdf/1.11.2/install.sh @@ -1,7 +1,9 @@ #!/bin/bash #http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz + set -x set -e +. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz cd ${JARVIS_TMP} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-1.11.2.tar.gz cd pnetcdf-1.11.2 diff --git a/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config b/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config index b5a5d2333c32ae5552296f504337f084497e6048..60c12ffbf681ccb5aaef9bdec9e5d68cf2933609 100644 --- a/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config +++ b/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config @@ -1,12 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.tar.gz hucx-1.1.1-huawei.tar.gz -xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.tar.gz xucg-1.1.1-huawei.tar.gz -hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.tar.gz hmpi-1.1.1-huawei.tar.gz -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz -bedtools/2.28.0 https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz [DEPENDENCY] module use ./software/modulefiles @@ -31,7 +25,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install bedtools/2.28.0 bisheng+mpi +./jarvis -install bedtools/2.28.0/clang clang+mpi [RUN] run = diff --git a/templates/blas/3.10.0/data.blas.arm.bisheng.config b/templates/blas/3.10.0/data.blas.arm.bisheng.config index 96edb25603fbf2ec293febd5bdf8d144a2fb352a..fb426cc0461af0dd35bf25d1dfaa5e0edafa1cf2 100644 --- a/templates/blas/3.10.0/data.blas.arm.bisheng.config +++ b/templates/blas/3.10.0/data.blas.arm.bisheng.config @@ -1,9 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -blas/3.10.0 http://www.netlib.org/blas/blas-3.10.0.tgz -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz [DEPENDENCY] ./jarvis -install bisheng/2.1.0 com @@ -23,7 +20,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install blas/3.10.0/bisheng clang +./jarvis -install blas/3.10.0/clang clang [RUN] diff --git a/templates/curl/7.82.0/data.curl.arm.cpu.config b/templates/curl/7.82.0/data.curl.arm.cpu.config index 39ff9ad40fc906bbc7dc3a21f7e0ad8d3bb270e3..c8df18723643b15ad59d1043ea427c391dfdecf9 100644 --- a/templates/curl/7.82.0/data.curl.arm.cpu.config +++ b/templates/curl/7.82.0/data.curl.arm.cpu.config @@ -1,9 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz -curl/7.82.0 https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz [DEPENDENCY] module use ./software/modulefiles @@ -25,7 +22,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install curl/7.82.0 bisheng +./jarvis -install curl/7.82.0 clang [RUN] run = diff --git a/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config b/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config index 656c87d4df3e20b1c28f48a7fd90aaf9389f501b..c071e107dc4508aa160c599d31dad22259d87fe5 100644 --- a/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config +++ b/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config @@ -1,9 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz -openjepg/2.4.0 https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz openjpeg-2.4.0.tar.gz [DEPENDENCY] module use ./software/modulefiles @@ -25,7 +22,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install openjpeg/2.4.0 bisheng +./jarvis -install openjpeg/2.4.0 clang [RUN] run = diff --git a/templates/picard/2.27.0/data.picard.arm.cpu.config b/templates/picard/2.27.0/data.picard.arm.cpu.config index f4e094583f00cd54f1122df70ba2bcd6af6ba32b..d6736575bed53c1ce6546d03fc872ef3e8c85218 100644 --- a/templates/picard/2.27.0/data.picard.arm.cpu.config +++ b/templates/picard/2.27.0/data.picard.arm.cpu.config @@ -1,8 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz [DEPENDENCY] module use ./software/modulefiles @@ -24,7 +22,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install picard/2.27.0 bisheng +./jarvis -install picard/2.27.0 clang [RUN] run = diff --git a/templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config b/templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config deleted file mode 100644 index 882575058b2a62e217f042edfafc2420d2001a41..0000000000000000000000000000000000000000 --- a/templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config +++ /dev/null @@ -1,39 +0,0 @@ -[SERVER] -11.11.11.11 - -[DOWNLOAD] -lapack/3.8.0 http://www.netlib.org/lapack/lapack-3.8.0.tar.gz -hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.tar.gz hucx-1.1.1-huawei.tar.gz -xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.tar.gz xucg-1.1.1-huawei.tar.gz -hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.tar.gz hmpi-1.1.1-huawei.tar.gz -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz - -[DEPENDENCY] -module use ./software/modulefiles -module purge -./jarvis -install bisheng/2.1.0 com -module load bisheng2/2.1.0 -export CC=clang CXX=clang++ FC=flang -./jarvis -install hmpi/1.1.1 clang -module load hmpi1/1.1.1 - -[ENV] -module use ./software/modulefiles -module purge -module load bisheng2/2.1.0 -module load hmpi1/1.1.1 -export CC=clang CXX=clang++ FC=flang - -[APP] -app_name = lacack -build_dir = $JARVIS_ROOT -binary_dir = -case_dir = - -[BUILD] -./jarvis -install lapack/3.8.0/bisheng clang - -[RUN] -run = -binary = -node = 1 diff --git a/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config b/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config index af0b1578a0668c095138b5ffe10dd6dc8bccb61a..584d560266d096a88202f79302a1e3c67b79d113 100644 --- a/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config +++ b/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config @@ -1,12 +1,6 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.tar.gz hucx-1.1.1-huawei.tar.gz -xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.tar.gz xucg-1.1.1-huawei.tar.gz -hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.tar.gz hmpi-1.1.1-huawei.tar.gz -bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz -pnetcdf/1.11.2 http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz [DEPENDENCY] @@ -32,7 +26,7 @@ binary_dir = case_dir = [BUILD] -./jarvis -install pnetcdf/1.11.2 bisheng+mpi +./jarvis -install pnetcdf/1.11.2/clang clang+mpi [RUN] run =