From 351eef8c3284d9a0e2267a9d3886a49cc5094efe Mon Sep 17 00:00:00 2001
From: yuanchunlin1 <798049430@qq.com>
Date: Mon, 25 Apr 2022 14:56:09 +0800
Subject: [PATCH 1/3] add-clang

---
 .../bedtools/2.28.0/{ => clang}/install.sh    |  6 ++-
 package/curl/7.82.0/{ => clang}/install.sh    |  1 +
 package/openjpeg/2.4.0/{ => clang}/install.sh |  1 +
 package/picard/2.27.0/{ => clang}/install.sh  |  0
 package/pnetcdf/1.11.2/{ => clang}/install.sh |  1 +
 .../2.28.0/data.bedtools.arm.cpu.config       |  8 +---
 .../curl/7.82.0/data.curl.arm.cpu.config      |  5 +--
 .../2.4.0/data.openjpeg.arm.cpu.config        |  5 +--
 .../picard/2.27.0/data.picard.arm.cpu.config  |  4 +-
 .../pnetcdf/1.11.2/data.lapack.arm.cpu.config | 39 -------------------
 .../1.11.2/data.pnetcdf.arm.cpu.config        |  9 +----
 11 files changed, 12 insertions(+), 67 deletions(-)
 rename package/bedtools/2.28.0/{ => clang}/install.sh (70%)
 rename package/curl/7.82.0/{ => clang}/install.sh (73%)
 rename package/openjpeg/2.4.0/{ => clang}/install.sh (76%)
 rename package/picard/2.27.0/{ => clang}/install.sh (100%)
 rename package/pnetcdf/1.11.2/{ => clang}/install.sh (81%)
 delete mode 100644 templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config

diff --git a/package/bedtools/2.28.0/install.sh b/package/bedtools/2.28.0/clang/install.sh
similarity index 70%
rename from package/bedtools/2.28.0/install.sh
rename to package/bedtools/2.28.0/clang/install.sh
index ff99268..e50a0e0 100644
--- a/package/bedtools/2.28.0/install.sh
+++ b/package/bedtools/2.28.0/clang/install.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
-
-#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
+#wget https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz
+
+export CC=clang CXX=clang++ FC=flang
 cd ${JARVIS_TMP}
 rm -rf bedtools2
 tar -zxvf ${JARVIS_DOWNLOAD}/bedtools-2.28.0.tar.gz
diff --git a/package/curl/7.82.0/install.sh b/package/curl/7.82.0/clang/install.sh
similarity index 73%
rename from package/curl/7.82.0/install.sh
rename to package/curl/7.82.0/clang/install.sh
index d57c581..65504e2 100644
--- a/package/curl/7.82.0/install.sh
+++ b/package/curl/7.82.0/clang/install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. ${DOWNLOAD_TOOL} -u https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz
 #https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz
 set -x
 set -e
diff --git a/package/openjpeg/2.4.0/install.sh b/package/openjpeg/2.4.0/clang/install.sh
similarity index 76%
rename from package/openjpeg/2.4.0/install.sh
rename to package/openjpeg/2.4.0/clang/install.sh
index 1324c47..1618818 100644
--- a/package/openjpeg/2.4.0/install.sh
+++ b/package/openjpeg/2.4.0/clang/install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. ${DOWNLOAD_TOOL} -u https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz
 #https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz
 set -x
 set -e
diff --git a/package/picard/2.27.0/install.sh b/package/picard/2.27.0/clang/install.sh
similarity index 100%
rename from package/picard/2.27.0/install.sh
rename to package/picard/2.27.0/clang/install.sh
diff --git a/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/clang/install.sh
similarity index 81%
rename from package/pnetcdf/1.11.2/install.sh
rename to package/pnetcdf/1.11.2/clang/install.sh
index 58fc7d1..2ae54ed 100644
--- a/package/pnetcdf/1.11.2/install.sh
+++ b/package/pnetcdf/1.11.2/clang/install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
 #http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
 set -x
 set -e
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 b5a5d23..60c12ff 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/curl/7.82.0/data.curl.arm.cpu.config b/templates/curl/7.82.0/data.curl.arm.cpu.config
index 39ff9ad..daf2bfa 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 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 656c87d..f5aa450 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 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 f4e0945..a91748a 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 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 8825750..0000000
--- 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 af0b157..01b2adc 100644
--- a/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config
+++ b/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config
@@ -1,13 +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]
 module use ./software/modulefiles
@@ -32,7 +25,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 =
-- 
Gitee


From cf56dd48365d82440c4b4074fa63478fc469eefe Mon Sep 17 00:00:00 2001
From: yuanchunlin1 <798049430@qq.com>
Date: Mon, 25 Apr 2022 17:55:37 +0800
Subject: [PATCH 2/3] Revert "add-clang"

This reverts commit 351eef8c3284d9a0e2267a9d3886a49cc5094efe.
---
 .../bedtools/2.28.0/{clang => }/install.sh    |  6 +--
 package/curl/7.82.0/{clang => }/install.sh    |  1 -
 package/openjpeg/2.4.0/{clang => }/install.sh |  1 -
 package/picard/2.27.0/{clang => }/install.sh  |  0
 package/pnetcdf/1.11.2/{clang => }/install.sh |  1 -
 .../2.28.0/data.bedtools.arm.cpu.config       |  8 +++-
 .../curl/7.82.0/data.curl.arm.cpu.config      |  5 ++-
 .../2.4.0/data.openjpeg.arm.cpu.config        |  5 ++-
 .../picard/2.27.0/data.picard.arm.cpu.config  |  4 +-
 .../pnetcdf/1.11.2/data.lapack.arm.cpu.config | 39 +++++++++++++++++++
 .../1.11.2/data.pnetcdf.arm.cpu.config        |  9 ++++-
 11 files changed, 67 insertions(+), 12 deletions(-)
 rename package/bedtools/2.28.0/{clang => }/install.sh (70%)
 rename package/curl/7.82.0/{clang => }/install.sh (73%)
 rename package/openjpeg/2.4.0/{clang => }/install.sh (76%)
 rename package/picard/2.27.0/{clang => }/install.sh (100%)
 rename package/pnetcdf/1.11.2/{clang => }/install.sh (81%)
 create mode 100644 templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config

diff --git a/package/bedtools/2.28.0/clang/install.sh b/package/bedtools/2.28.0/install.sh
similarity index 70%
rename from package/bedtools/2.28.0/clang/install.sh
rename to package/bedtools/2.28.0/install.sh
index e50a0e0..ff99268 100644
--- a/package/bedtools/2.28.0/clang/install.sh
+++ b/package/bedtools/2.28.0/install.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
+
+#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
-#wget https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz
-
-export CC=clang CXX=clang++ FC=flang
 cd ${JARVIS_TMP}
 rm -rf bedtools2
 tar -zxvf ${JARVIS_DOWNLOAD}/bedtools-2.28.0.tar.gz
diff --git a/package/curl/7.82.0/clang/install.sh b/package/curl/7.82.0/install.sh
similarity index 73%
rename from package/curl/7.82.0/clang/install.sh
rename to package/curl/7.82.0/install.sh
index 65504e2..d57c581 100644
--- a/package/curl/7.82.0/clang/install.sh
+++ b/package/curl/7.82.0/install.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-. ${DOWNLOAD_TOOL} -u https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz
 #https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz
 set -x
 set -e
diff --git a/package/openjpeg/2.4.0/clang/install.sh b/package/openjpeg/2.4.0/install.sh
similarity index 76%
rename from package/openjpeg/2.4.0/clang/install.sh
rename to package/openjpeg/2.4.0/install.sh
index 1618818..1324c47 100644
--- a/package/openjpeg/2.4.0/clang/install.sh
+++ b/package/openjpeg/2.4.0/install.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-. ${DOWNLOAD_TOOL} -u https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz
 #https://github.com/uclouvain/openjpeg/archive/refs/tags/v2.4.0.tar.gz
 set -x
 set -e
diff --git a/package/picard/2.27.0/clang/install.sh b/package/picard/2.27.0/install.sh
similarity index 100%
rename from package/picard/2.27.0/clang/install.sh
rename to package/picard/2.27.0/install.sh
diff --git a/package/pnetcdf/1.11.2/clang/install.sh b/package/pnetcdf/1.11.2/install.sh
similarity index 81%
rename from package/pnetcdf/1.11.2/clang/install.sh
rename to package/pnetcdf/1.11.2/install.sh
index 2ae54ed..58fc7d1 100644
--- a/package/pnetcdf/1.11.2/clang/install.sh
+++ b/package/pnetcdf/1.11.2/install.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
 #http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
 set -x
 set -e
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 60c12ff..b5a5d23 100644
--- a/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config
+++ b/templates/bedtools/2.28.0/data.bedtools.arm.cpu.config
@@ -1,6 +1,12 @@
 [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
@@ -25,7 +31,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install bedtools/2.28.0/clang clang+mpi
+./jarvis -install bedtools/2.28.0 bisheng+mpi
 
 [RUN]
 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 daf2bfa..39ff9ad 100644
--- a/templates/curl/7.82.0/data.curl.arm.cpu.config
+++ b/templates/curl/7.82.0/data.curl.arm.cpu.config
@@ -1,6 +1,9 @@
 [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
@@ -22,7 +25,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install curl/7.82.0/clang clang
+./jarvis -install curl/7.82.0 bisheng
 
 [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 f5aa450..656c87d 100644
--- a/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config
+++ b/templates/openjpeg/2.4.0/data.openjpeg.arm.cpu.config
@@ -1,6 +1,9 @@
 [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
@@ -22,7 +25,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install openjpeg/2.4.0/clang clang
+./jarvis -install openjpeg/2.4.0 bisheng
 
 [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 a91748a..f4e0945 100644
--- a/templates/picard/2.27.0/data.picard.arm.cpu.config
+++ b/templates/picard/2.27.0/data.picard.arm.cpu.config
@@ -1,6 +1,8 @@
 [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
@@ -22,7 +24,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install picard/2.27.0/clang clang
+./jarvis -install picard/2.27.0 bisheng
 
 [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
new file mode 100644
index 0000000..8825750
--- /dev/null
+++ b/templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config
@@ -0,0 +1,39 @@
+[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 01b2adc..af0b157 100644
--- a/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config
+++ b/templates/pnetcdf/1.11.2/data.pnetcdf.arm.cpu.config
@@ -1,6 +1,13 @@
 [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]
 module use ./software/modulefiles
@@ -25,7 +32,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install pnetcdf/1.11.2/clang clang+mpi
+./jarvis -install pnetcdf/1.11.2 bisheng+mpi
 
 [RUN]
 run =
-- 
Gitee


From 00710afc4f2d657340d3b620f4704ea0451386c5 Mon Sep 17 00:00:00 2001
From: yuanchunlin1 <798049430@qq.com>
Date: Tue, 26 Apr 2022 09:54:45 +0800
Subject: [PATCH 3/3] add-download

---
 .../bedtools/2.28.0/{ => clang}/install.sh    |  1 +
 .../blas/3.10.0/{bisheng => clang}/install.sh |  1 +
 package/curl/7.82.0/install.sh                |  1 +
 package/openjpeg/2.4.0/install.sh             |  1 +
 package/pnetcdf/1.11.2/install.sh             |  2 +
 .../2.28.0/data.bedtools.arm.cpu.config       |  8 +---
 .../blas/3.10.0/data.blas.arm.bisheng.config  |  5 +--
 .../curl/7.82.0/data.curl.arm.cpu.config      |  5 +--
 .../2.4.0/data.openjpeg.arm.cpu.config        |  5 +--
 .../picard/2.27.0/data.picard.arm.cpu.config  |  4 +-
 .../pnetcdf/1.11.2/data.lapack.arm.cpu.config | 39 -------------------
 .../1.11.2/data.pnetcdf.arm.cpu.config        |  8 +---
 12 files changed, 12 insertions(+), 68 deletions(-)
 rename package/bedtools/2.28.0/{ => clang}/install.sh (76%)
 rename package/blas/3.10.0/{bisheng => clang}/install.sh (81%)
 delete mode 100644 templates/pnetcdf/1.11.2/data.lapack.arm.cpu.config

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 ff99268..9741bca 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 4bceade..a8328d7 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 d57c581..83f8d7a 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 1324c47..87d1647 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 58fc7d1..79379fc 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 b5a5d23..60c12ff 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 96edb25..fb426cc 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 39ff9ad..c8df187 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 656c87d..c071e10 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 f4e0945..d673657 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 8825750..0000000
--- 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 af0b157..584d560 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 =
-- 
Gitee