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/5] 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/5] 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/5] 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


From c28560df185834cb0496f5bbed4dd367a4e13bc0 Mon Sep 17 00:00:00 2001
From: yuanchunlin <798049430@qq.com>
Date: Tue, 26 Apr 2022 03:14:13 +0000
Subject: [PATCH 4/5] update package/curl/7.82.0/install.sh.

---
 package/curl/7.82.0/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/curl/7.82.0/install.sh b/package/curl/7.82.0/install.sh
index 83f8d7a..b548b87 100644
--- a/package/curl/7.82.0/install.sh
+++ b/package/curl/7.82.0/install.sh
@@ -2,7 +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
+. ${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
-- 
Gitee


From 6e0b94d5fa83800494e151dc6597d02bddcb734e Mon Sep 17 00:00:00 2001
From: yuanchunlin1 <798049430@qq.com>
Date: Tue, 26 Apr 2022 12:00:39 +0800
Subject: [PATCH 5/5] down

---
 package/ImageMagick/7.1.0/install.sh          |  1 +
 package/fftw/3.3.8/install.sh                 |  3 ++-
 package/gsl/2.6/install.sh                    |  8 --------
 package/lapack/3.8.0/bisheng/install.sh       | 19 ------------------
 package/libxc/5.1.4/install.sh                |  9 ---------
 package/ncview/2.1.7/install.sh               |  1 +
 package/netcdf/4.7.0/install.sh               |  2 ++
 .../scalapack/2.1.0/lapack-bisheng/install.sh | 20 -------------------
 .../7.1.0/data.ImageMagick.arm.cpu.config     |  3 ---
 templates/fftw/3.3.8/data.fftw.arm.cpu.config |  6 ------
 templates/gsl/2.6/data.gsl.arm.cpu.config     |  8 +-------
 .../lapack/3.8.0/data.lapack.arm.cpu.config   |  5 +----
 .../libxc/5.1.4/data.libxc.arm.cpu.config     |  6 +-----
 .../ncview/2.1.7/data.ncview.arm.cpu.config   | 11 ----------
 .../netcdf/4.7.0/data.netcdf.arm.cpu.config   | 10 ----------
 .../2.1.0/data.scalapack.arm.cpu.config       |  8 +-------
 16 files changed, 10 insertions(+), 110 deletions(-)
 delete mode 100644 package/gsl/2.6/install.sh
 delete mode 100755 package/lapack/3.8.0/bisheng/install.sh
 delete mode 100644 package/libxc/5.1.4/install.sh
 delete mode 100644 package/scalapack/2.1.0/lapack-bisheng/install.sh

diff --git a/package/ImageMagick/7.1.0/install.sh b/package/ImageMagick/7.1.0/install.sh
index dd9a4e5..cfc6b18 100644
--- a/package/ImageMagick/7.1.0/install.sh
+++ b/package/ImageMagick/7.1.0/install.sh
@@ -3,6 +3,7 @@
 # download from https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/refs/tags/7.1.0-30
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/refs/tags/7.1.0-30
 
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/ImageMagick-7.1.0-30.tar.gz
diff --git a/package/fftw/3.3.8/install.sh b/package/fftw/3.3.8/install.sh
index df0242a..1473102 100644
--- a/package/fftw/3.3.8/install.sh
+++ b/package/fftw/3.3.8/install.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 set -x
 set -e
+. ${DOWMLOAD_TOOL} -u https://fftw.org/pub/fftw/fftw-3.3.8.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/fftw-3.3.8.tar.gz
 cd fftw-3.3.8
 ./configure --prefix=$1 MPICC=mpicc --enable-shared --enable-threads --enable-openmp --enable-mpi
-make -j install
\ No newline at end of file
+make -j install
diff --git a/package/gsl/2.6/install.sh b/package/gsl/2.6/install.sh
deleted file mode 100644
index 2645fa6..0000000
--- a/package/gsl/2.6/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-cd ${JARVIS_TMP}
-tar -xvf ${JARVIS_DOWNLOAD}/gsl-2.6.tar.gz
-cd gsl-2.6
-./configure --prefix=$1 CC=clang CXX=clang++ FC=flang
-make -j
-make install
diff --git a/package/lapack/3.8.0/bisheng/install.sh b/package/lapack/3.8.0/bisheng/install.sh
deleted file mode 100755
index b163ae1..0000000
--- a/package/lapack/3.8.0/bisheng/install.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -x
-set -e
-cd ${JARVIS_TMP}
-tar -xvf ${JARVIS_DOWNLOAD}/lapack-3.8.0.tgz
-cd lapack-3.8.0
-cp make.inc.example make.inc
-sed -i '11s/gcc/clang/g' ./make.inc
-sed -i '12s/$/& -march=native/g' ./make.inc
-sed -i '22s/gfortran/flang/g' ./make.inc
-sed -i '23s/-frecursive$//g' ./make.inc
-sed -i '25s/-frecursive$//g' ./make.inc
-sed -i '30s/gfortran/flang/g' ./make.inc
-sed -i '50s/^/#  /g' ./make.inc
-sed -i '54s/^#//g' ./make.inc
-make -j
-mkdir $1/lib/
-cp *.a $1/lib/
-cp -r LAPACKE/include $1/
diff --git a/package/libxc/5.1.4/install.sh b/package/libxc/5.1.4/install.sh
deleted file mode 100644
index 3f8dbf1..0000000
--- a/package/libxc/5.1.4/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -x
-set -e
-cd ${JARVIS_TMP}
-tar -xvf ${JARVIS_DOWNLOAD}/libxc-5.1.4.tar.gz
-cd libxc-5.1.4
-./configure --prefix=$1 CC=clang CXX=clang++ FC=flang CFLAGS='-fPIC' FCFLAGS='-fPIC'
-make -j
-make install
diff --git a/package/ncview/2.1.7/install.sh b/package/ncview/2.1.7/install.sh
index 0ed4339..620d3c0 100644
--- a/package/ncview/2.1.7/install.sh
+++ b/package/ncview/2.1.7/install.sh
@@ -4,6 +4,7 @@
 # yum install libX11 libX11-devel libXaw libXaw-devel libpng-devel libpng
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.7.tar.gz 
 
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/ncview-2.1.7.tar.gz
diff --git a/package/netcdf/4.7.0/install.sh b/package/netcdf/4.7.0/install.sh
index a436251..3dfde2d 100644
--- a/package/netcdf/4.7.0/install.sh
+++ b/package/netcdf/4.7.0/install.sh
@@ -4,6 +4,8 @@
 
 set -x
 set -e
+. ${DOWMLOAD_TOOL} -u https://codeload.github.com/Unidata/netcdf-fortran/tar.gz/refs/tags/v4.4.5 -f netcdf-fortran-4.4.5.tar.gz
+. ${DOWMLOAD_TOOL} -u https://codeload.github.com/Unidata/netcdf-c/tar.gz/refs/tags/v4.7.0 -f netcdf-fortran-4.4.5.tar.gz 
 cd ${JARVIS_TMP}
 rm -rf netcdf-c-4.7.0 netcdf-fortran-4.4.5
 tar -xvf ${JARVIS_DOWNLOAD}/netcdf-c-4.7.0.tar.gz
diff --git a/package/scalapack/2.1.0/lapack-bisheng/install.sh b/package/scalapack/2.1.0/lapack-bisheng/install.sh
deleted file mode 100644
index b2b6072..0000000
--- a/package/scalapack/2.1.0/lapack-bisheng/install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -x
-set -e
-cd ${JARVIS_TMP}
-tar  -xvf ${JARVIS_DOWNLOAD}/scalapack-2.1.0.tgz
-cd scalapack-2.1.0
-cp SLmake.inc.example SLmake.inc
-LAPACK_PATH=$1
-LAPACK_PATH=${LAPACK_PATH%/*/*/*}
-LAPACK_PATH=${LAPACK_PATH}/lapack-bisheng/3.8.0/lib
-sed -i "58s/-lblas//g" ./SLmake.inc
-sed -i "59s/-llapack//g" ./SLmake.inc
-sed -i "58s%$%${LAPACK_PATH}/librefblas.a%g" ./SLmake.inc
-sed -i "59s%$%${LAPACK_PATH}/liblapack.a%g" ./SLmake.inc
-sed -i '17a $(LIBS) += -fuse-ld=lld' REDIST/TESTING/Makefile
-make
-mkdir -p $1/lib
-cp *.a $1/lib
-mkdir -p $1/include
-cp SRC/*.h $1/include
diff --git a/templates/ImageMagick/7.1.0/data.ImageMagick.arm.cpu.config b/templates/ImageMagick/7.1.0/data.ImageMagick.arm.cpu.config
index ec3d7b3..cfa3e56 100644
--- a/templates/ImageMagick/7.1.0/data.ImageMagick.arm.cpu.config
+++ b/templates/ImageMagick/7.1.0/data.ImageMagick.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
-ImageMagick/7.1.0 https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/refs/tags/7.1.0-30 ImageMagick-7.1.0-30.tar.gz
 
 [DEPENDENCY]
 module use ./software/modulefiles
diff --git a/templates/fftw/3.3.8/data.fftw.arm.cpu.config b/templates/fftw/3.3.8/data.fftw.arm.cpu.config
index b43acb2..4a14e43 100644
--- a/templates/fftw/3.3.8/data.fftw.arm.cpu.config
+++ b/templates/fftw/3.3.8/data.fftw.arm.cpu.config
@@ -1,12 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-fftw/3.3.8 https://fftw.org/pub/fftw/fftw-3.3.8.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
diff --git a/templates/gsl/2.6/data.gsl.arm.cpu.config b/templates/gsl/2.6/data.gsl.arm.cpu.config
index 7d24a37..5bc5e3c 100644
--- a/templates/gsl/2.6/data.gsl.arm.cpu.config
+++ b/templates/gsl/2.6/data.gsl.arm.cpu.config
@@ -1,12 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-gsl/2.6 http://mirrors.ustc.edu.cn/gnu/gsl/gsl-2.6.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
@@ -28,7 +22,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install gsl/2.6 clang
+./jarvis -install gsl/2.6/clang clang
 
 [RUN]
 run =
diff --git a/templates/lapack/3.8.0/data.lapack.arm.cpu.config b/templates/lapack/3.8.0/data.lapack.arm.cpu.config
index 0edff8f..2e939dd 100644
--- a/templates/lapack/3.8.0/data.lapack.arm.cpu.config
+++ b/templates/lapack/3.8.0/data.lapack.arm.cpu.config
@@ -1,9 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-lapack/3.8.0 http://www.netlib.org/lapack/lapack-3.8.0.tar.gz lapack-3.8.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]
 module use ./software/modulefiles
@@ -24,7 +21,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install lapack/3.8.0/bisheng clang
+./jarvis -install lapack/3.8.0/clang clang
 
 [RUN]
 run =
diff --git a/templates/libxc/5.1.4/data.libxc.arm.cpu.config b/templates/libxc/5.1.4/data.libxc.arm.cpu.config
index 6a3d452..35f525b 100644
--- a/templates/libxc/5.1.4/data.libxc.arm.cpu.config
+++ b/templates/libxc/5.1.4/data.libxc.arm.cpu.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-libxc/5.1.4 http://www.tddft.org/programs/libxc/down.php?file=5.1.4/libxc-5.1.4.tar.gz libxc-5.1.4.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
@@ -25,7 +21,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install libxc/5.1.4 clang
+./jarvis -install libxc/5.1.4/clang clang
 
 [RUN]
 run =
diff --git a/templates/ncview/2.1.7/data.ncview.arm.cpu.config b/templates/ncview/2.1.7/data.ncview.arm.cpu.config
index 9efeeab..a747195 100644
--- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config
+++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config
@@ -1,17 +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
-hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.zip hucx-1.1.1-huawei.zip
-xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.zip xucg-1.1.1-huawei.zip
-hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.zip hmpi-1.1.1-huawei.zip
-netcdf/4.7.0 https://codeload.github.com/Unidata/netcdf-c/tar.gz/refs/tags/v4.7.0 netcdf-c-4.7.0.tar.gz
-netcdf-f/4.4.5 https://codeload.github.com/Unidata/netcdf-fortran/tar.gz/refs/tags/v4.4.5 netcdf-fortran-4.4.5.tar.gz
-pnetcdf/1.11.2 http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
-hdf5/1.10.1 https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz
-ncview/2.1.7 ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.7.tar.gz ncview-2.1.7.tar.gz
-udunits/2.2.28 https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz
 
 [DEPENDENCY]
 module use ./software/modulefiles
diff --git a/templates/netcdf/4.7.0/data.netcdf.arm.cpu.config b/templates/netcdf/4.7.0/data.netcdf.arm.cpu.config
index df0644d..69c939d 100644
--- a/templates/netcdf/4.7.0/data.netcdf.arm.cpu.config
+++ b/templates/netcdf/4.7.0/data.netcdf.arm.cpu.config
@@ -1,16 +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
-hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.zip hucx-1.1.1-huawei.zip
-xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.zip xucg-1.1.1-huawei.zip
-hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.zip hmpi-1.1.1-huawei.zip
-netcdf/4.7.0 https://codeload.github.com/Unidata/netcdf-c/tar.gz/refs/tags/v4.7.0 netcdf-c-4.7.0.tar.gz
-netcdf-f/4.4.5 https://codeload.github.com/Unidata/netcdf-fortran/tar.gz/refs/tags/v4.4.5 netcdf-fortran-4.4.5.tar.gz
-pnetcdf/1.11.2 http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-1.11.2.tar.gz
-hdf5/1.10.1 https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz
-
 [DEPENDENCY]
 module use ./software/modulefiles
 module purge
diff --git a/templates/scalapack/2.1.0/data.scalapack.arm.cpu.config b/templates/scalapack/2.1.0/data.scalapack.arm.cpu.config
index 1731912..4796628 100644
--- a/templates/scalapack/2.1.0/data.scalapack.arm.cpu.config
+++ b/templates/scalapack/2.1.0/data.scalapack.arm.cpu.config
@@ -1,12 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-scalapack/2.1.0 http://www.netlib.org/scalapack/scalapack-2.1.0.tgz
-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
@@ -32,7 +26,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install scalapack/2.1.0/lapack-bisheng clang+mpi
+./jarvis -install scalapack/2.1.0/clang clang+mpi
 
 [RUN]
 run =
-- 
Gitee