From 7d012ae8dd1b93c9d4c0fdfd515f544ae8d9f855 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Fri, 10 Feb 2023 08:49:22 +0000 Subject: [PATCH 01/50] =?UTF-8?q?update=20templates/qmcpack/3.13.0/data.qm?= =?UTF-8?q?cpack.arm.cpu.config.=20=E6=9B=B4=E6=94=B9qmcpack=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=AE=89=E8=A3=85zlib=E7=89=88=E6=9C=AC=E4=B8=BA12=20?= =?UTF-8?q?=E5=9B=A0=E5=AE=89=E8=A3=85package/zlib=E5=86=85=E6=97=A01.2.11?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=94=E8=8E=B7=E5=8F=9611=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=BD=91=E5=9D=80=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config index a9bec6c..c14ee25 100644 --- a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config +++ b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config @@ -19,8 +19,8 @@ module load cmake/3.23.1 ./jarvis -install openblas/0.3.18 clang ./jarvis -install boost/1.72.0/clang clang module load boost-clang/1.72.0 -./jarvis -install zlib/1.2.11 clang -module load zlib/1.2.11 +./jarvis -install zlib/1.2.12 clang +module load zlib/1.2.12 ./jarvis -install libxml2/2.10.1 clang module load libxml2/2.10.1 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort @@ -37,7 +37,7 @@ module use ${JARVIS_ROOT}/software/modulefiles module load bisheng/2.1.0 module load hmpi/1.1.1 module load cmake/3.23.1 openblas/0.3.18 libxml2/2.10.1 -module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.11 +module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.12 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] @@ -51,7 +51,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${JARVIS_LIBS}/qmcpack-3.13.0 \ -DLIBXML2_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/libxml2/2.10.1/lib/libxml2.so \ --DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.11/lib/libz.so \ +-DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.12/lib/libz.so \ -DFFTW_HOME=${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/fftw/3.3.8 \ -DBOOST_ROOT=${JARVIS_LIBS}/bisheng2.1.0/boost-clang/1.72.0 \ ../ -- Gitee From db7af3993ca42d47e2c00408c603d77d8c295366 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Fri, 10 Feb 2023 09:59:45 +0000 Subject: [PATCH 02/50] =?UTF-8?q?=E4=BF=AE=E6=94=B9zlib=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E8=AE=BF=E9=97=AE=E7=BD=91=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- package/zlib/1.2.12/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zlib/1.2.12/install.sh b/package/zlib/1.2.12/install.sh index 3b77899..9e3c1c6 100644 --- a/package/zlib/1.2.12/install.sh +++ b/package/zlib/1.2.12/install.sh @@ -2,7 +2,7 @@ set -x set -e zlib_ver='1.2.12' -. ${DOWNLOAD_TOOL} -u https://zlib.net/zlib-${zlib_ver}.tar.gz +. ${DOWNLOAD_TOOL} -u https://zlib.net/fossils/zlib-${zlib_ver}.tar.gz cd ${JARVIS_TMP} rm -rf zlib-${zlib_ver} tar -xvf ${JARVIS_DOWNLOAD}/zlib-${zlib_ver}.tar.gz -- Gitee From ae847877d9816df7b090f120d17edb7e608a508d Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Sat, 11 Feb 2023 07:59:19 +0000 Subject: [PATCH 03/50] =?UTF-8?q?update=20templates/qmcpack/3.13.0/data.qm?= =?UTF-8?q?cpack.arm.cpu.config.=20=E7=BB=8F=E6=B5=8B=E8=AF=95=E9=9C=80?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=9B=B4=E6=94=B9zlib=E4=B8=BA11=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config index c14ee25..a9bec6c 100644 --- a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config +++ b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config @@ -19,8 +19,8 @@ module load cmake/3.23.1 ./jarvis -install openblas/0.3.18 clang ./jarvis -install boost/1.72.0/clang clang module load boost-clang/1.72.0 -./jarvis -install zlib/1.2.12 clang -module load zlib/1.2.12 +./jarvis -install zlib/1.2.11 clang +module load zlib/1.2.11 ./jarvis -install libxml2/2.10.1 clang module load libxml2/2.10.1 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort @@ -37,7 +37,7 @@ module use ${JARVIS_ROOT}/software/modulefiles module load bisheng/2.1.0 module load hmpi/1.1.1 module load cmake/3.23.1 openblas/0.3.18 libxml2/2.10.1 -module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.12 +module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.11 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] @@ -51,7 +51,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${JARVIS_LIBS}/qmcpack-3.13.0 \ -DLIBXML2_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/libxml2/2.10.1/lib/libxml2.so \ --DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.12/lib/libz.so \ +-DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.11/lib/libz.so \ -DFFTW_HOME=${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/fftw/3.3.8 \ -DBOOST_ROOT=${JARVIS_LIBS}/bisheng2.1.0/boost-clang/1.72.0 \ ../ -- Gitee From cc82bfa60814c24e754b3230b2b25999eda755c2 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Sat, 11 Feb 2023 08:10:02 +0000 Subject: [PATCH 04/50] =?UTF-8?q?=E6=B7=BB=E5=8A=A0package/zlib/1.2.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- package/zlib/1.2.11/clang/install.sh | 12 ++++++++++++ package/zlib/1.2.11/install.sh | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 package/zlib/1.2.11/clang/install.sh create mode 100644 package/zlib/1.2.11/install.sh diff --git a/package/zlib/1.2.11/clang/install.sh b/package/zlib/1.2.11/clang/install.sh new file mode 100644 index 0000000..8cad2b3 --- /dev/null +++ b/package/zlib/1.2.11/clang/install.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -x +set -e +zlib_ver='1.2.11' +. ${DOWNLOAD_TOOL} -u https://zlib.net/fossils/zlib-${zlib_ver}.tar.gz +cd ${JARVIS_TMP} +rm -rf zlib-${zlib_ver} +tar -xvf ${JARVIS_DOWNLOAD}/zlib-${zlib_ver}.tar.gz +cd zlib-${zlib_ver} +./configure --prefix=$1 FCFLAGS="-O3 -fPIC" +make -j +make install diff --git a/package/zlib/1.2.11/install.sh b/package/zlib/1.2.11/install.sh new file mode 100644 index 0000000..39c232f --- /dev/null +++ b/package/zlib/1.2.11/install.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -x +set -e +zlib_ver='1.2.11' +. ${DOWNLOAD_TOOL} -u https://zlib.net/fossils/zlib-${zlib_ver}.tar.gz +cd ${JARVIS_TMP} +rm -rf zlib-${zlib_ver} +tar -xvf ${JARVIS_DOWNLOAD}/zlib-${zlib_ver}.tar.gz +cd zlib-${zlib_ver} +./configure --prefix=$1 +make -j +make install -- Gitee From e0615347d82469e527e7b4c81411873f431eeaa2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:13:56 +0000 Subject: [PATCH 05/50] add package/libjpeg/v9b. Signed-off-by: chenshaoheng --- package/libjpeg/v9b | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 package/libjpeg/v9b diff --git a/package/libjpeg/v9b b/package/libjpeg/v9b new file mode 100644 index 0000000..e69de29 -- Gitee From 3f22aac47116a1572c90d7be141e2368b533c582 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:14:18 +0000 Subject: [PATCH 06/50] update package/libjpeg/v9b. Signed-off-by: chenshaoheng --- package/libjpeg/v9b | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjpeg/v9b b/package/libjpeg/v9b index e69de29..61e71e2 100644 --- a/package/libjpeg/v9b +++ b/package/libjpeg/v9b @@ -0,0 +1 @@ +install.sh \ No newline at end of file -- Gitee From 3cf4caa974ae26f4a9c2fd365242930cc098ae46 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:14:26 +0000 Subject: [PATCH 07/50] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20pa?= =?UTF-8?q?ckage/libjpeg/v9b?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/libjpeg/v9b | 1 - 1 file changed, 1 deletion(-) delete mode 100644 package/libjpeg/v9b diff --git a/package/libjpeg/v9b b/package/libjpeg/v9b deleted file mode 100644 index 61e71e2..0000000 --- a/package/libjpeg/v9b +++ /dev/null @@ -1 +0,0 @@ -install.sh \ No newline at end of file -- Gitee From 867e75665e7283e92fec160503214f613b015b97 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:22:10 +0000 Subject: [PATCH 08/50] add package/libjpeg/v9b. Signed-off-by: chenshaoheng --- package/libjpeg/v9b/install.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package/libjpeg/v9b/install.sh diff --git a/package/libjpeg/v9b/install.sh b/package/libjpeg/v9b/install.sh new file mode 100644 index 0000000..508341f --- /dev/null +++ b/package/libjpeg/v9b/install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u http://www.ijg.org/files/jpegsrc.v9b.tar.gz +cd ${JARVIS_TMP} +tar xvf ${JARVIS_DOWNLOAD}/jpegsrc.v9b.tar.gz +cd jpeg-9b +./configure --prefix=$1 --build=aarch64-unknown-linux-gnu +./configure --prefix=$1 CFLAGS="-fPIC" +make install -- Gitee From 6e9c26a566bab8e8d1b2d9871dba0dc899c469c2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:23:04 +0000 Subject: [PATCH 09/50] add package/hdf5/1.10.4. Signed-off-by: chenshaoheng --- package/hdf5/1.10.4/clang/install.sh | 13 +++++++++++++ package/hdf5/1.10.4/install.sh | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 package/hdf5/1.10.4/clang/install.sh create mode 100644 package/hdf5/1.10.4/install.sh diff --git a/package/hdf5/1.10.4/clang/install.sh b/package/hdf5/1.10.4/clang/install.sh new file mode 100644 index 0000000..14587d6 --- /dev/null +++ b/package/hdf5/1.10.4/clang/install.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz +cd ${JARVIS_TMP} +rm -rf hdf5-1.10.1 +tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.1.tar.gz +cd hdf5-1.10.1 +export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 +./configure --prefix=$1 --enable-fortran --enable-static=yes --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 -j +make install \ No newline at end of file diff --git a/package/hdf5/1.10.4/install.sh b/package/hdf5/1.10.4/install.sh new file mode 100644 index 0000000..de3104b --- /dev/null +++ b/package/hdf5/1.10.4/install.sh @@ -0,0 +1,13 @@ +#download from https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4.tar.gz +cd ${JARVIS_TMP} +rm -rf hdf5-1.10.4 +tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.4.tar.gz +cd hdf5-1.10.4 +#CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort -Wno-incompatible-pointer-types-discards-qualifiers +CC=`which mpicc` FC=`which mpifort` ./configure --with-zlib=/usr/lib --prefix=$1 --enable-static=yes --enable-parallel --enable-shared --with-szlib=${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib +make -j +make install -- Gitee From 0f633a196b83b9b2c7d51fd81c0ecb3068346723 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:25:27 +0000 Subject: [PATCH 10/50] update package/hdf5/1.10.4/clang/install.sh. Signed-off-by: chenshaoheng --- package/hdf5/1.10.4/clang/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hdf5/1.10.4/clang/install.sh b/package/hdf5/1.10.4/clang/install.sh index 14587d6..11a1fc8 100644 --- a/package/hdf5/1.10.4/clang/install.sh +++ b/package/hdf5/1.10.4/clang/install.sh @@ -1,11 +1,11 @@ #!/bin/bash set -x set -e -. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz +. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4.tar.gz cd ${JARVIS_TMP} -rm -rf hdf5-1.10.1 -tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.1.tar.gz -cd hdf5-1.10.1 +rm -rf hdf5-1.10.4 +tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.4.tar.gz +cd hdf5-1.10.4 export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 ./configure --prefix=$1 --enable-fortran --enable-static=yes --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 -- Gitee From 3a84f382a4bbec779fbf1ad0c4787374822a9797 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:27:13 +0000 Subject: [PATCH 11/50] add 1.900.1. Signed-off-by: chenshaoheng --- package/jasper/1.900.1/install.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/jasper/1.900.1/install.sh diff --git a/package/jasper/1.900.1/install.sh b/package/jasper/1.900.1/install.sh new file mode 100644 index 0000000..ade3fa5 --- /dev/null +++ b/package/jasper/1.900.1/install.sh @@ -0,0 +1,13 @@ +#download from https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz +cd ${JARVIS_TMP} +rm -rf jasper-1.900.2 +tar -xvf ${JARVIS_DOWNLOAD}/jasper-1.900.2.tar.gz +cd jasper-1.900.2 +#export CC=clang CXX=clang++ +./configure --prefix=$1 +make -j +make install -- Gitee From e9b4325e600ab690383f6ac2a7b349e4cd3b5fb5 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:31:55 +0000 Subject: [PATCH 12/50] update ENV&RUN Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index 151aa61..23502c9 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -87,8 +87,7 @@ module load hmpi/1.2.0 module load libjpeg/v9b module load hdf5/1.12.0 module load netcdf/4.7.4 -module load hdf4-clang/4.2.15 -module load hdf5/1.10.4 +module load hdf4-clang/4.2.13 module load gsl/2.6 module load jasper/1.900.1 module load proj/5.2.0 @@ -114,11 +113,11 @@ rm -rf ncl_ncarg_6.6.2 mkdir ncl_ncarg_6.6.2 cd ncl_ncarg_6.6.2 rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.aarch64.rpm | cpio -div -cp -r usr/* ${JARVIS_LIBS}/bisheng2.3.0/ncl +cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin export NCARG_ROOT=${binary_dir} [RUN] -run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && export NCARG_COLORMAPS=$NCARG_ROOT/lib64/ncarg/colormaps && ncl -Q +run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && ncl -V binary = nodes = 1 -- Gitee From 7428e7753f6ae824b7e46bdde4d8a8e9e687e57c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:34:42 +0000 Subject: [PATCH 13/50] update package/hdf5/1.12.0/clang/install.sh. Signed-off-by: chenshaoheng --- package/hdf5/1.12.0/clang/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hdf5/1.12.0/clang/install.sh b/package/hdf5/1.12.0/clang/install.sh index e2c3200..89603df 100644 --- a/package/hdf5/1.12.0/clang/install.sh +++ b/package/hdf5/1.12.0/clang/install.sh @@ -8,7 +8,7 @@ cd ${JARVIS_TMP} rm -rf hdf5-${hdf5_version} tar -xvf ${JARVIS_DOWNLOAD}/hdf5-${hdf5_version}.tar.gz cd hdf5-${hdf5_version} -./configure --prefix=$1 --enable-fortran --enable-static=yes --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" +./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 -j make install -- Gitee From cf0744f424f61e4bd83edbe6d6d2045b94711bcd Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:37:09 +0000 Subject: [PATCH 14/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index 8d52a9a..fb7c2d5 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -42,6 +42,8 @@ module load antlr/2.7.7 module load udunits/2.2.28 export CC=`which clang` +export CXX=`which clang++` +export FC=`which flang` -- Gitee From 54242d4b412599e05fcf7814539953b08a8e1087 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:38:55 +0000 Subject: [PATCH 15/50] update package/bisheng/2.3.0/install.sh. Signed-off-by: chenshaoheng --- package/bisheng/2.3.0/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/bisheng/2.3.0/install.sh b/package/bisheng/2.3.0/install.sh index d8fa580..442aacd 100644 --- a/package/bisheng/2.3.0/install.sh +++ b/package/bisheng/2.3.0/install.sh @@ -1,3 +1,4 @@ #!/bin/bash -bisheng_ver='bisheng-compiler-2.3.0' +set -e +export bisheng_ver='bisheng-compiler-2.3.0' ../meta.sh $1 -- Gitee From 83ddaedf309c5f5fc772c26865b0354f031030e5 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:40:08 +0000 Subject: [PATCH 16/50] update package/hdf5/1.10.1/install.sh. Signed-off-by: chenshaoheng --- package/hdf5/1.10.1/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hdf5/1.10.1/install.sh b/package/hdf5/1.10.1/install.sh index b2e8e3a..90aa738 100644 --- a/package/hdf5/1.10.1/install.sh +++ b/package/hdf5/1.10.1/install.sh @@ -9,5 +9,6 @@ tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.1.tar.gz cd hdf5-1.10.1 #CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort -Wno-incompatible-pointer-types-discards-qualifiers ./configure --prefix=$1 --enable-fortran --enable-static=yes --enable-parallel --enable-shared +sed -i '11835c wl="-Wl,"' libtool make -j make install -- Gitee From 6120d09858160a70e163d49c6d590578d3064ee0 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:50:59 +0000 Subject: [PATCH 17/50] update templates/ncview/2.1.7/data.ncview.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 6e4653d..2a4f068 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -12,7 +12,9 @@ export CC=clang CXX=clang++ FC=flang module load hmpi/1.1.1 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort ./jarvis -install hdf5/1.10.1 clang+mpi +module add hdf5/1.10.1 ./jarvis -install pnetcdf/1.11.2 bisheng+mpi +module load pnetcdf/1.11.2 ./jarvis -install netcdf/4.7.0 clang+mpi ./jarvis -install udunits/2.2.28 clang+mpi @@ -21,6 +23,11 @@ module purge module use ${JARVIS_ROOT}/software/modulefiles module add bisheng/2.1.0 module add hmpi/1.1.1 +module add hdf5/1.10.1 +module add pnetcdf/1.11.2 +module add netcdf/4.7.0 +module add udunits/2.2.28 +module add ncview/2.1.7 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] @@ -33,6 +40,6 @@ case_dir = ./jarvis -install ncview/2.1.7 clang+mpi [RUN] -run = +run = ncview -c binary = node = 1 -- Gitee From 58abc491b24ca78e3a8803930263c8f5ac1a7f78 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:54:46 +0000 Subject: [PATCH 18/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index 23502c9..3ca5014 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -50,7 +50,7 @@ ln -s -f ${NETCDF_PATH}/lib/libnetcdf.so.18 ${NETCDF_PATH}/lib/libnetcdf.so.15 ./jarvis -install hdf4/4.2.13 bisheng -module load hdf5/1.12.0 +module load hdf4/4.2.13 ln -s -f ${HDF5_PATH}/lib/libhdf5_hl.so.200.0.0 ${HDF5_PATH}/lib/libhdf5_hl.so.100 ln -s -f ${HDF5_PATH}/lib/libhdf5.so.200.0.0 ${HDF5_PATH}/lib/libhdf5.so.103 ./jarvis -install jasper/1.900.1 bisheng -- Gitee From f64504da6d844742825ad26945f93eb4c4470765 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:56:34 +0000 Subject: [PATCH 19/50] update package/libjpeg/v9b/install.sh. Signed-off-by: chenshaoheng --- package/libjpeg/v9b/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjpeg/v9b/install.sh b/package/libjpeg/v9b/install.sh index 508341f..ddfbf7d 100644 --- a/package/libjpeg/v9b/install.sh +++ b/package/libjpeg/v9b/install.sh @@ -3,6 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u http://www.ijg.org/files/jpegsrc.v9b.tar.gz cd ${JARVIS_TMP} +rm -rf jpeg-9b tar xvf ${JARVIS_DOWNLOAD}/jpegsrc.v9b.tar.gz cd jpeg-9b ./configure --prefix=$1 --build=aarch64-unknown-linux-gnu -- Gitee From 0e2cee7f696017b79748f077853b2ec77fbce606 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:58:41 +0000 Subject: [PATCH 20/50] update package/gdal/2.2.4/install.sh. Signed-off-by: chenshaoheng --- package/gdal/2.2.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdal/2.2.4/install.sh b/package/gdal/2.2.4/install.sh index b8b32c2..c956a2a 100755 --- a/package/gdal/2.2.4/install.sh +++ b/package/gdal/2.2.4/install.sh @@ -9,7 +9,7 @@ cd gdal-2.2.4 ./configure --with-static-proj4=${PROJ_PATH} --prefix=$1 --with-png=${LIBPNG_PATH} --with-gif=internal --with-libtiff=internal \ --with-geotiff=internal --with-jpeg=${LIBJPEG_PATH} --with-libz=/usr/local \ --with-sqlite3=no --with-expat=no --with-curl=no --without-ld-shared \ - --with-hdf4=no --with-hdf5=no --with-pg=no --without-grib --disable-shared \ + --with-hdf4=no --with-hdf5=no --with-pg=no --without-grib --enable-shared \ --with-freexl=no --with-geos=no --with-openjpeg=no --with-mysql=no \ --with-ecw=no --with-fgdb=no --with-odbc=no --with-xml2=no --with-ogdi=no\ --with-pcraster=no --with-xerces=no -- Gitee From 7cfd1e63c9a760d9622650dbca0bf7a33476daab Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:59:26 +0000 Subject: [PATCH 21/50] update package/gdal/2.2.4/install.sh. Signed-off-by: chenshaoheng --- package/gdal/2.2.4/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdal/2.2.4/install.sh b/package/gdal/2.2.4/install.sh index c956a2a..3e246ae 100755 --- a/package/gdal/2.2.4/install.sh +++ b/package/gdal/2.2.4/install.sh @@ -3,6 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.gz cd ${JARVIS_TMP} +rm -rf gdal-2.2.4 tar -xvf ${JARVIS_DOWNLOAD}/gdal-2.2.4.tar.gz cd gdal-2.2.4 -- Gitee From 88a4dcfbc5c19321997dad949eb0a955479a062b Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 02:06:48 +0000 Subject: [PATCH 22/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index fb7c2d5..aefa287 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -21,6 +21,8 @@ module load hmpi/1.2.0 sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng module load hdf5-clang/1.12.0 +./jarvis -install hdf4/4.2.15/ bisheng +module load hdf4/4.2.15 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng module load netcdf/4.7.4 @@ -36,6 +38,8 @@ module use ./software/modulefiles module load bisheng/2.3.0 module load hmpi/1.2.0 +module load hdf5-clang/1.12.0 +module load hdf4/4.2.15 module load netcdf/4.7.4 module load gsl/2.6 module load antlr/2.7.7 -- Gitee From 550592aecb1752efabcb4f2994a0996eea964460 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:11:31 +0000 Subject: [PATCH 23/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index aefa287..378317a 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -21,8 +21,8 @@ module load hmpi/1.2.0 sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng module load hdf5-clang/1.12.0 -./jarvis -install hdf4/4.2.15/ bisheng -module load hdf4/4.2.15 +./jarvis -install hdf4/4.2.13/ bisheng +module load hdf4/4.2.13 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng module load netcdf/4.7.4 @@ -39,7 +39,7 @@ module use ./software/modulefiles module load bisheng/2.3.0 module load hmpi/1.2.0 module load hdf5-clang/1.12.0 -module load hdf4/4.2.15 +module load hdf4/4.2.13 module load netcdf/4.7.4 module load gsl/2.6 module load antlr/2.7.7 -- Gitee From 892aada605240e3101fcf50b22da9bf3b4782328 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:20:09 +0000 Subject: [PATCH 24/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index 3ca5014..0da9940 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -87,7 +87,7 @@ module load hmpi/1.2.0 module load libjpeg/v9b module load hdf5/1.12.0 module load netcdf/4.7.4 -module load hdf4-clang/4.2.13 +module load hdf4/4.2.13 module load gsl/2.6 module load jasper/1.900.1 module load proj/5.2.0 -- Gitee From 9148d127c6f44d7e183ab1acd177b72a094d7aa3 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:41:06 +0000 Subject: [PATCH 25/50] update templates/ncview/2.1.7/data.ncview.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2a4f068..bd616b3 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -40,6 +40,6 @@ case_dir = ./jarvis -install ncview/2.1.7 clang+mpi [RUN] -run = ncview -c +run = ncview binary = node = 1 -- Gitee From 6fc49ee79b2c8f4209657e46b525d59aafa66584 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:48:04 +0000 Subject: [PATCH 26/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index 378317a..bd1873b 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -23,6 +23,10 @@ CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng module load hdf5-clang/1.12.0 ./jarvis -install hdf4/4.2.13/ bisheng module load hdf4/4.2.13 +CXX=`which mpicxx` +FC=`which mpifort` +./jarvis -install pnetcdf/1.11.2 bisheng+mpi +module load pnetcdf/1.11.2 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng module load netcdf/4.7.4 -- Gitee From 88f3647555a83cf121888a6230b59a59f119ddef Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 06:27:10 +0000 Subject: [PATCH 27/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index bd1873b..378317a 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -23,10 +23,6 @@ CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng module load hdf5-clang/1.12.0 ./jarvis -install hdf4/4.2.13/ bisheng module load hdf4/4.2.13 -CXX=`which mpicxx` -FC=`which mpifort` -./jarvis -install pnetcdf/1.11.2 bisheng+mpi -module load pnetcdf/1.11.2 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng module load netcdf/4.7.4 -- Gitee From 4162fd1b5465b19259ddd476844ed3c784ca64ae Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 06:33:27 +0000 Subject: [PATCH 28/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index 378317a..c196362 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -20,8 +20,8 @@ module load libjpeg/v9b module load hmpi/1.2.0 sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng -module load hdf5-clang/1.12.0 ./jarvis -install hdf4/4.2.13/ bisheng +module load hdf5-clang/1.12.0 module load hdf4/4.2.13 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng -- Gitee From e25bcb4ebc1527ba6199231f632cd3c305a6d417 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 07:08:58 +0000 Subject: [PATCH 29/50] update templates/ncview/2.1.7/data.ncview.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 bd616b3..1241ca6 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -27,7 +27,6 @@ module add hdf5/1.10.1 module add pnetcdf/1.11.2 module add netcdf/4.7.0 module add udunits/2.2.28 -module add ncview/2.1.7 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] @@ -38,7 +37,7 @@ case_dir = [BUILD] ./jarvis -install ncview/2.1.7 clang+mpi - +module add ncview/2.1.7 [RUN] run = ncview binary = -- Gitee From 441c200eb4ad8bd78d0749dcdd3ac2b2baa727a9 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 08:35:48 +0000 Subject: [PATCH 30/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index c196362..378317a 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -20,8 +20,8 @@ module load libjpeg/v9b module load hmpi/1.2.0 sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng -./jarvis -install hdf4/4.2.13/ bisheng module load hdf5-clang/1.12.0 +./jarvis -install hdf4/4.2.13/ bisheng module load hdf4/4.2.13 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh ./jarvis -install netcdf/4.7.4 bisheng -- Gitee From 8a53569c134d508390c0da147658ead02366d4fb Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 09:43:26 +0000 Subject: [PATCH 31/50] update package/udunits/2.2.28/install.sh. Signed-off-by: chenshaoheng --- package/udunits/2.2.28/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/udunits/2.2.28/install.sh b/package/udunits/2.2.28/install.sh index 655e441..da426de 100644 --- a/package/udunits/2.2.28/install.sh +++ b/package/udunits/2.2.28/install.sh @@ -3,6 +3,7 @@ set -x set -e . ${DOWNLOAD_TOOL} -u https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz cd ${JARVIS_TMP} +rm -rf udunits-2.2.28 tar xvf ${JARVIS_DOWNLOAD}/udunits-2.2.28.tar.gz cd udunits-2.2.28 ./configure --prefix=$1 -- Gitee From 292610be36e3678a1b4c6f3ee68ad79f137f6b5a Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 10:09:51 +0000 Subject: [PATCH 32/50] update package/netcdf/4.7.4/install.sh. Signed-off-by: chenshaoheng --- package/netcdf/4.7.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh index c3b032e..c842ffc 100644 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -16,7 +16,7 @@ if [ x"$(arch)" = xaarch64 ];then else build_type='' fi -HDF5_DIR=${HDF5_PATH} +HDF5_CLANG_DIR=${HDF5_PATH} PNETCDF_DIR=${PNETCDF_PATH} ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --enable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" -- Gitee From d6665c31d630b97d12128b08d235759d94ea0acb Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Feb 2023 01:22:42 +0000 Subject: [PATCH 33/50] update package/netcdf/4.7.4/install.sh. Signed-off-by: chenshaoheng --- package/netcdf/4.7.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh index c842ffc..96f06a0 100644 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -16,7 +16,7 @@ if [ x"$(arch)" = xaarch64 ];then else build_type='' fi -HDF5_CLANG_DIR=${HDF5_PATH} +HDF5_DIR=${HDF5__CLANG_PATH} PNETCDF_DIR=${PNETCDF_PATH} ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --enable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" -- Gitee From e77b6c4926b67d7709dae74d0fa42bbda8b98756 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Feb 2023 01:23:01 +0000 Subject: [PATCH 34/50] update package/netcdf/4.7.4/install.sh. Signed-off-by: chenshaoheng --- package/netcdf/4.7.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh index 96f06a0..6ece15a 100644 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -16,7 +16,7 @@ if [ x"$(arch)" = xaarch64 ];then else build_type='' fi -HDF5_DIR=${HDF5__CLANG_PATH} +HDF5_DIR=${HDF5_CLANG_PATH} PNETCDF_DIR=${PNETCDF_PATH} ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --enable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" -- Gitee From 9d2d7b9150f8a23807fce0f1b6222e2118f7b72f Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Mon, 13 Feb 2023 17:29:53 +0800 Subject: [PATCH 35/50] update esm config --- templates/bcc-esm/bccesm.arm.cpu.config | 84 ++++++++++++++----------- templates/bcc-esm/build.csh | 8 ++- templates/bcc-esm/run.sh | 16 ++--- 3 files changed, 59 insertions(+), 49 deletions(-) diff --git a/templates/bcc-esm/bccesm.arm.cpu.config b/templates/bcc-esm/bccesm.arm.cpu.config index c0dd5f5..7e8b422 100644 --- a/templates/bcc-esm/bccesm.arm.cpu.config +++ b/templates/bcc-esm/bccesm.arm.cpu.config @@ -2,49 +2,58 @@ 11.11.11.11 [DOWNLOAD] -bcc-esm/4.0 http://forecast.bcccsm.ncc-cma.net/web/ +bcc-agcm/4.0 http://forecast.bcccsm.ncc-cma.net/web/?down_id=350 agcm.tar.gz [DEPENDENCY] set -x set -e -./jarvis -install kml/1.6.0/gcc any -./jarvis -install openblas/0.3.18 any ./jarvis -install bisheng/2.1.0 com module purge module use ./software/modulefiles -module load bisheng/2.1.0 -export CC=`which clang` CXX=`which clang++` FC=`which flang` +module load bisheng2/2.1.0 +export CC=`which clang` +export CXX=`which clang++` +export FC=`which flang` ./jarvis -install hmpi/1.1.1 bisheng -module load hmpi/1.1.1 +module load hmpi1/1.1.1 ./jarvis -bench mpi ./jarvis -install fftw/3.3.8 bisheng +./jarvis -bench mpi export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort ./jarvis -install hdf5/1.10.1 clang+mpi ./jarvis -install pnetcdf/1.11.2 clang+mpi ./jarvis -install netcdf/4.7.0 clang+mpi -unzip ${JARVIS_DOWNLOAD}/esm.zip +tar -xvf BCC_ESM.tar [ENV] module purge -module use ./software/moduledeps -module use software/modulefiles -module load bisheng/2.1.0 -module load hmpi/1.1.1 -module load openblas/0.3.18 -module load kml-gcc/1.6.0 +module use /workspace/public/software/modules/ +module use software/moduledeps +module load compilers/bisheng/2.1.0/bisheng2.1.0 mpi/hmpi/1.1.1/bisheng2.1.0 libs/pnetcdf/1.12.1/bisheng2.1.0_hmpi1.1.1 libs/netcdf/netcdf_c_4.7.4_fortran_4.5.3/bisheng2.1.0_hmpi1.1.1 libs/fftw/3.3.8/bisheng2.1.0-hmpi1.1.1 libs/hdf5/1.12.0/bisheng2.1.0_hmpi1.1.1 +module load gcc7.3.0/openblas/0.3.18 export LIBS_DIR=/workspace/public/software/libs -export NETCDF_DIR=${NETCDF_PATH} -export PNETCDF_DIR=${PNETCDF_PATH} -export FFTW_DIR=${FFTW_PATH} -export MPI_DIR=${HMPI_PATH} +export NETCDF_DIR=${LIBS_DIR}/netcdf/netcdf_c_4.7.4_fortran_4.5.3/bisheng2.1.0_hmpi1.1.1 +export PNETCDF_DIR=${LIBS_DIR}/pnetcdf/1.12.1/bisheng2.1.0_hmpi1.1.1 +export FFTW_DIR=${LIBS_DIR}/fftw/3.3.8/bisheng2.1.0_hmpi1.1.1 +export MPI_DIR=/workspace/public/software/mpi/hmpi/1.1.1/bisheng2.1.0/ompi export USER_CC=mpicc export USER_FC=mpifort export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort +export CSMDATA=/workspace/home/BCC_ESM-T382/INIDATA +export DATA_PATH=$CSMDATA/data export MODEL_PATH=$JARVIS_ROOT/esm -export DATA_PATH=$JARVIS_ROOT/INIDATA/data -export CSMDATA=$JARVIS_ROOT/INIDATA export WORK_PATH=$MODEL_PATH/T382L70p25 -export KML_LIB=${KML_GCC_PATH}/lib + +export COMMON_PRECISE_OPT="-ffp-contract=off -mllvm -disable-sincos-opt -faarch64-pow-alt-precision=18 -mllvm -enable-alt-precision-math-functions -Hx,124,0xc00000 -Mflushz" +export LD_KML="-L${KML_LIB} -lkm_l9" +export ATM_PRECISE=$COMMON_PRECISE_OPT +export LND_PRECISE=$COMMON_PRECISE_OPT +export ICE_PRECISE=$COMMON_PRECISE_OPT +export OCN_PRECISE=$COMMON_PRECISE_OPT +export CPL_PRECISE=$COMMON_PRECISE_OPT +chmod +x -R $MODEL_PATH/tools +chmod +x -R $WORK_PATH/*.csh +chmod +x -R $MODEL_PATH/models [APP] app_name = BCCESM @@ -53,11 +62,11 @@ binary_dir = case_dir = $WORK_PATH [BUILD] -rm -rf output/atm/atm -rm -rf output/lnd/lnd -rm -rf output/ocn/ocn -rm -rf output/cpl/cpl -rm -rf output/ice/ice +#rm -rf output/atm/atm +#rm -rf output/lnd/lnd +#rm -rf output/ocn/ocn +#rm -rf output/cpl/cpl +#rm -rf output/ice/ice csh -f build.csh 1 [CLEAN] @@ -66,14 +75,13 @@ rm -rf OBJ [RUN] #run = ./build.csh 2 2>&1 | tee run.log run = ./build.csh 2 -binary = +binary = nodes = 1 [BATCH] #! /bin/bash - time1=$(date "+%Y-%m-%d"); -perfdir="perf-data/${time1}" +perfdir="perf-data/${time1}-28n-AJ-IJ-CPL8t-2day-8min" mkdir $perfdir cp output/atm/atm.log.* $perfdir/atm.log cp output/atm/timing.0 $perfdir/timing.atm.log @@ -83,23 +91,23 @@ cp output/lnd/lnd.log.* $perfdir/lnd.log cp output/lnd/timing.0 $perfdir/timing.lnd.log cp output/ocn/ocn.log.* $perfdir/ocn.log echo "All of the data has archived under $perfdir" - -# PRECT_GPCP(gpcp_vars) SST_HADISST TS_NCEP +PRECT_GPCP(gpcp_vars) SST_HADISST TS_NCEP exit 0 outputdir="job10-12M" -export MSS_testpath=/share/output/atm -export WKDIR=$JARVIS_ROOT/diag-ncl/$outputdir/ + +export MSS_testpath=/share/esm10/T382L70p25/output10-121n-8cpl/atm +#export WKDIR=$JARVIS_ROOT/diag-ncl/cn-test/$outputdir/ image_dir=$WKDIR/${outputdir}-obs export test_prefix=$outputdir cd $MSS_testpath echo "COMPUTE TEST CASE CLIMATOLOGY..." cur_var="" for n in {1..12}; do - if [ $n -lt 10 ]; then - cur_var="$cur_var historical.cam2.h0.2001-0$n.nc" - else - cur_var="$cur_var historical.cam2.h0.2001-$n.nc" - fi +if [ $n -lt 10 ]; then +cur_var="$cur_var historical.cam2.h0.2001-0$n.nc" +else +cur_var="$cur_var historical.cam2.h0.2001-$n.nc" +fi done echo "handing $cur_var" ncea -4 -O $cur_var ${test_prefix}_ANN_climo.nc @@ -112,4 +120,4 @@ cd $outputdir cp $image_dir/set5_6/set5_ANN_TS_NCEP_obsc.gif ./ cp $image_dir/set5_6/set5_ANN_SST_HADISST_obsc.gif ./ cp $image_dir/set5_6/set5_ANN_PRECT_GPCP_obsc.gif ./ -cp $image_dir/set7/set7_ANN_ICEFRAC_HADISST_NP_obsc.gif ./ \ No newline at end of file +cp $image_dir/set7/set7_ANN_ICEFRAC_HADISST_NP_obsc.gif ./ diff --git a/templates/bcc-esm/build.csh b/templates/bcc-esm/build.csh index 0f5e02d..46b83ca 100644 --- a/templates/bcc-esm/build.csh +++ b/templates/bcc-esm/build.csh @@ -6,7 +6,6 @@ setenv MPI_ROOT ${MPI_DIR} limit datasize unlimited setenv XLSMPOPTS stack=860000000 -setenv OMP_STACKSIZE 3G setenv Atmosphere_Model CAM3 setenv System_Time_Type day # month/day @@ -158,6 +157,7 @@ if ( $argv[1] == 1 ) then $SCRIPTS/esmf.setup.csh >>& esmf.log.$LID || exit 1 endif + echo ------------------------------------------------------------------------- echo h. Execute component setup.csh scripts, build models echo ------------------------------------------------------------------------- @@ -202,13 +202,15 @@ end if ( $argv[1] == 2 ) then cd $EXEROOT - rm -rf atm/historical.cam2* atm/atm.log.* cpl/cpl.log.* esmf/esmf.log.* ice/ice.log.* lnd/lnd.log.* - rm -rf ocn/ocn.log.* esm_* esm_err_* + rm -rf atm/historical.cam2* atm/atm.log.* cpl/cpl.log.* ice/ice.log.* lnd/lnd.log.* ocn/ocn.log.* + rm -rf atm/timing.* atm/spmdstats.* + rm -rf esm_* echo ------------------------------------------------------------------------- echo j. Run the model, execute models simultaneously allocating CPUs echo ------------------------------------------------------------------------- echo "`date` -- CSM EXECUTION BEGINS HERE" setenv I_MPI_COMPATIBILITY 4 + setenv OMP_STACKSIZE 3G setenv KMP_AFFINITY compact echo "`date` -- CSM JOB SUBMIT HAS FINISHED" chmod +x run.sh diff --git a/templates/bcc-esm/run.sh b/templates/bcc-esm/run.sh index 6aa258d..abbf99c 100644 --- a/templates/bcc-esm/run.sh +++ b/templates/bcc-esm/run.sh @@ -1,7 +1,7 @@ #!/bin/bash -#DSUB -n esm-29n +#DSUB -n esm-28n #DSUB --job_type cosched -#DSUB -N 29 +#DSUB -N 28 #DSUB -R "cpu=128;mem=256000" #DSUB -A root.default #DSUB -q root.default @@ -28,10 +28,10 @@ ntask=`cat ${CCSCHEDULER_ALLOC_FILE} | sort | awk -v fff="$HOSTFILE" '{} total_task+=a[2] } }END{print total_task}'` -head -n 28 $HOSTFILE > $tmpfs -sed -i 's/128/96/' $tmpfs +head -n 27 $HOSTFILE > $tmpfs +sed -i 's/128/126/' $tmpfs tail -n 1 $HOSTFILE >> $tmpfs -sed -i 's/128/24/' $tmpfs +sed -i 's/128/128/' $tmpfs mv $tmpfs $HOSTFILE echo "openmpi hostfile $HOSTFILE generated:" echo "-----------------------" @@ -39,7 +39,7 @@ cat $HOSTFILE echo "-----------------------" echo "Total tasks is $ntask" echo "mpirun -hostfile $HOSTFILE -n $ntask " -sed -i "15c layout =20,10," ocn/input.nml +sed -i "15c layout =40,20," ocn/input.nml #generate run_roce.sh cat <<\EOF > run_roce.sh #!/bin/bash @@ -47,7 +47,7 @@ rank=$OMPI_COMM_WORLD_RANK idx=$(expr $rank % 32 / 8) # atm lnd ice ocn cpl -NTASKS=( 2304 96 96 200 16 ) +NTASKS=( 2304 116 182 800 8 ) NTHRDS=( 1 1 1 1 1 ) lnd_proc=`expr ${NTASKS[0]} + ${NTASKS[1]}` @@ -81,6 +81,6 @@ fi EOF chmod +x run_roce.sh date -mpirun --allow-run-as-root --mca plm_rsh_agent /opt/batch/agent/tools/dstart -mca btl ^vader,tcp,openib,uct -mca coll ^ucx -x UCX_BUILTIN_ALLREDUCE_ALGORITHM=6 -x UCX_BUILTIN_ALLTOALLV_ALGORITHM=1 -hostfile $HOSTFILE -np 2712 -x LD_LIBRARY_PATH -x PATH -x OMP_WAIT_POLICY=ACTIVE --bind-to socket run_roce.sh +mpirun --allow-run-as-root --mca plm_rsh_agent /opt/batch/agent/tools/dstart --mca pml ucx -mca btl ^vader,tcp,openib,uct -x UCX_NET_DEVICES=mlx5_0:1 -x UCX_BUILTIN_ALLREDUCE_ALGORITHM=6 -x UCX_BUILTIN_ALLTOALLV_ALGORITHM=1 -hostfile $HOSTFILE -np 3410 -x LD_LIBRARY_PATH -x PATH -x OMP_WAIT_POLICY=ACTIVE --bind-to core run_roce.sh #/share/fang/osu_init date exit 0 -- Gitee From 6084d12d6e26ba9457a2f54ad0e240db10174177 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 01:28:44 +0000 Subject: [PATCH 36/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index 0da9940..ba3474d 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -71,6 +71,7 @@ export FC=`which flang` ./jarvis -install udunits/2.2.28 bisheng ./jarvis -install gsl/2.6 bisheng module load gsl/2.6 +module load udunits/2.2.28 ln -s -f ${GSL_PATH}/lib/libgsl.so.25.0.0 ${GSL_PATH}/lib/libgsl.so.23 ./jarvis -install openblas/0.3.18 bisheng module load openblas/0.3.18 -- Gitee From 50ebdc8d8e549cba5d79e1cc2b75daa0ac4292ff Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 02:20:01 +0000 Subject: [PATCH 37/50] update package/netcdf/4.7.4/install.sh. Signed-off-by: chenshaoheng --- package/netcdf/4.7.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh index 6ece15a..c3b032e 100644 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -16,7 +16,7 @@ if [ x"$(arch)" = xaarch64 ];then else build_type='' fi -HDF5_DIR=${HDF5_CLANG_PATH} +HDF5_DIR=${HDF5_PATH} PNETCDF_DIR=${PNETCDF_PATH} ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --enable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" -- Gitee From a1ee4f063ae3ffa2b2fefc61ca4dd62d7d7f5f8a Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 02:27:55 +0000 Subject: [PATCH 38/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index 378317a..c8ffee8 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -19,8 +19,8 @@ module load libjpeg/v9b module load hmpi/1.2.0 sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh -CC=`which mpicc` ./jarvis -install hdf5/1.12.0/clang bisheng -module load hdf5-clang/1.12.0 +CC=`which mpicc` ./jarvis -install hdf5/1.12.0 bisheng +module load hdf5/1.12.0 ./jarvis -install hdf4/4.2.13/ bisheng module load hdf4/4.2.13 sed -i '21c ./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --disable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HMPI_PATH}/include -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include"' package/netcdf/4.7.4/install.sh -- Gitee From 1bdb72d273e99cea2fa2f9186774793ae0176222 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 04:05:30 +0000 Subject: [PATCH 39/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index c8ffee8..b8b0e52 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -38,7 +38,7 @@ module use ./software/modulefiles module load bisheng/2.3.0 module load hmpi/1.2.0 -module load hdf5-clang/1.12.0 +module load hdf5/1.12.0 module load hdf4/4.2.13 module load netcdf/4.7.4 module load gsl/2.6 -- Gitee From e0d6cf458f2286a40e90664c288e2a8b5046c212 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 08:06:40 +0000 Subject: [PATCH 40/50] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20pa?= =?UTF-8?q?ckage/hdf5/1.10.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/hdf5/1.10.4/clang/install.sh | 13 ------------- package/hdf5/1.10.4/install.sh | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 package/hdf5/1.10.4/clang/install.sh delete mode 100644 package/hdf5/1.10.4/install.sh diff --git a/package/hdf5/1.10.4/clang/install.sh b/package/hdf5/1.10.4/clang/install.sh deleted file mode 100644 index 11a1fc8..0000000 --- a/package/hdf5/1.10.4/clang/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -x -set -e -. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4.tar.gz -cd ${JARVIS_TMP} -rm -rf hdf5-1.10.4 -tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.4.tar.gz -cd hdf5-1.10.4 -export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 -./configure --prefix=$1 --enable-fortran --enable-static=yes --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 -j -make install \ No newline at end of file diff --git a/package/hdf5/1.10.4/install.sh b/package/hdf5/1.10.4/install.sh deleted file mode 100644 index de3104b..0000000 --- a/package/hdf5/1.10.4/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#download from https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz -#!/bin/bash -set -x -set -e -. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4.tar.gz -cd ${JARVIS_TMP} -rm -rf hdf5-1.10.4 -tar -xvf ${JARVIS_DOWNLOAD}/hdf5-1.10.4.tar.gz -cd hdf5-1.10.4 -#CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort -Wno-incompatible-pointer-types-discards-qualifiers -CC=`which mpicc` FC=`which mpifort` ./configure --with-zlib=/usr/lib --prefix=$1 --enable-static=yes --enable-parallel --enable-shared --with-szlib=${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib -make -j -make install -- Gitee From 4a5619dc6f4c53c3e08bd30ef641f31b07000b2b Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 08:09:10 +0000 Subject: [PATCH 41/50] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE--wit?= =?UTF-8?q?h-zlib=3D/usr/lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng --- package/hdf5/1.12.0/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hdf5/1.12.0/install.sh b/package/hdf5/1.12.0/install.sh index 011e37e..f30c860 100644 --- a/package/hdf5/1.12.0/install.sh +++ b/package/hdf5/1.12.0/install.sh @@ -8,6 +8,6 @@ cd ${JARVIS_TMP} rm -rf hdf5-${hdf5_version} tar -xvf ${JARVIS_DOWNLOAD}/hdf5-${hdf5_version}.tar.gz cd hdf5-${hdf5_version} -./configure --prefix=$1 --enable-fortran --enable-static=yes --enable-parallel --enable-shared +./configure --prefix=$1 --enable-fortran --enable-static=yes --enable-parallel --enable-shared --with-zlib=/usr/lib make -j make install -- Gitee From 8e2c89dcc08eba5bae2f4cb289a9cecc8c85ee68 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 15 Feb 2023 08:14:27 +0000 Subject: [PATCH 42/50] update templates/nco/5.1.4/data.NCO.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nco/5.1.4/data.NCO.arm.cpu.config b/templates/nco/5.1.4/data.NCO.arm.cpu.config index b8b0e52..d3bd3e1 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -18,7 +18,7 @@ module load libjpeg/v9b module load hmpi/1.2.0 -sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/clang/install.sh +sed -i '5c hdf5_version="${hdf5_big_version}.0"' package/hdf5/1.12.0/install.sh CC=`which mpicc` ./jarvis -install hdf5/1.12.0 bisheng module load hdf5/1.12.0 ./jarvis -install hdf4/4.2.13/ bisheng -- Gitee From c762df6744494cf2f32f7aed7aa0378befa6954b Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Sat, 18 Feb 2023 06:34:09 +0000 Subject: [PATCH 43/50] update templates/ncview/2.1.7/data.ncview.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 1241ca6..7cfe251 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -33,12 +33,12 @@ export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort app_name = ncview build_dir = ${JARVIS_ROOT} binary_dir = -case_dir = +case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncview/2.1.7/bin [BUILD] ./jarvis -install ncview/2.1.7 clang+mpi -module add ncview/2.1.7 + [RUN] -run = ncview +run = ./ncview binary = -node = 1 +nodes = 1 -- Gitee From 06b78004fe074b63b3ef11ef0a9c5d9a89911256 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Sat, 18 Feb 2023 07:04:55 +0000 Subject: [PATCH 44/50] update templates/ncview/2.1.7/data.ncview.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7cfe251..fc9e332 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -33,10 +33,10 @@ export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort app_name = ncview build_dir = ${JARVIS_ROOT} binary_dir = -case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncview/2.1.7/bin +case_dir = ${JARVIS_LIBS}/bisheng2.1.0/ncview/2.1.7/bin [BUILD] -./jarvis -install ncview/2.1.7 clang+mpi +./jarvis -install ncview/2.1.7 clang [RUN] run = ./ncview -- Gitee From c550f70b26fffd4533a4ab0c00f951b7f9d7667b Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Sat, 18 Feb 2023 07:49:55 +0000 Subject: [PATCH 45/50] =?UTF-8?q?fix=20case=5Fdir=E3=80=81[RUN]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng --- templates/ncview/2.1.7/data.ncview.arm.cpu.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fc9e332..e5abeb9 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -33,10 +33,10 @@ export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort app_name = ncview build_dir = ${JARVIS_ROOT} binary_dir = -case_dir = ${JARVIS_LIBS}/bisheng2.1.0/ncview/2.1.7/bin +case_dir = ${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/ncview/2.1.7/bin [BUILD] -./jarvis -install ncview/2.1.7 clang +./jarvis -install ncview/2.1.7 clang+mpi [RUN] run = ./ncview -- Gitee From 8d98dff28bb0f1eead61d2af73678fbeed4d4fb9 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Fri, 24 Feb 2023 02:51:02 +0000 Subject: [PATCH 46/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index ba3474d..1fe3350 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -119,6 +119,6 @@ export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin export NCARG_ROOT=${binary_dir} [RUN] -run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && ncl -V +run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && export NCARG_COLORMAPS=$NCARG_ROOT/lib64/ncarg/colormaps && ncl -Q binary = nodes = 1 -- Gitee From 63e8704232d7054db75b5405ce0f86eb9eda22f1 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Fri, 24 Feb 2023 03:39:34 +0000 Subject: [PATCH 47/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config. Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index 1fe3350..ddebf35 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -34,7 +34,7 @@ module load pnetcdf/1.12.1 sed -i '9c ./configure --prefix=$1 --enable-netcdf-4 --disable-shared' package/szip/2.1.1/install.sh -sed -i '11c CC=`which mpicc` FC=`which mpifort` ./configure --with-zlib=/usr/lib --prefix=$1 --enable-static=yes --enable-parallel --enable-shared --with-szlib=${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib' package/hdf5/1.10.4/install.sh +sed -i '11c CC=`which mpicc` FC=`which mpifort` ./configure --with-zlib=/usr/lib --prefix=$1 --enable-static=yes --enable-parallel --enable-shared --with-szlib=${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib' package/hdf5/1.12.0/install.sh sed -i 's/# sed/sed/g' package/hdf5/1.12.0/install.sh ./jarvis -install hdf5/1.12.0 bisheng -- Gitee From b4aeeb9e2070d9c6770f7817a453f11839aa2090 Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Fri, 24 Feb 2023 09:29:28 +0000 Subject: [PATCH 48/50] update templates/ncl/6.6.2/data.NCL.arm.cpu.config.RUN Signed-off-by: chenshaoheng --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index ddebf35..e27eb2e 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -119,6 +119,6 @@ export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin export NCARG_ROOT=${binary_dir} [RUN] -run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && export NCARG_COLORMAPS=$NCARG_ROOT/lib64/ncarg/colormaps && ncl -Q +run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl && ncl -V binary = nodes = 1 -- Gitee From 91ec53ff7f27a54e952c65ed748591da8e25c93a Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 1 Mar 2023 11:06:18 +0800 Subject: [PATCH 49/50] fix install --- package/jasper/1.900.1/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/package/jasper/1.900.1/install.sh b/package/jasper/1.900.1/install.sh index ade3fa5..e76a397 100644 --- a/package/jasper/1.900.1/install.sh +++ b/package/jasper/1.900.1/install.sh @@ -7,7 +7,6 @@ cd ${JARVIS_TMP} rm -rf jasper-1.900.2 tar -xvf ${JARVIS_DOWNLOAD}/jasper-1.900.2.tar.gz cd jasper-1.900.2 -#export CC=clang CXX=clang++ ./configure --prefix=$1 make -j make install -- Gitee From 02467e1378b783bf4f95d0aeeb98df112188a30e Mon Sep 17 00:00:00 2001 From: Qiyu8 Date: Wed, 1 Mar 2023 11:41:34 +0800 Subject: [PATCH 50/50] fix NCL Error --- ...6\244\215\346\214\207\345\215\227\343\200\213.md" | 8 ++++---- package/jasper/1.900.1/install.sh | 12 ------------ package/jasper/1.900.2/install.sh | 12 ++++++------ templates/ncl/6.6.2/data.NCL.arm.cpu.config | 6 +++--- templates/ncl/6.6.2/data.NCL.x86.cpu.config | 2 +- templates/ncview/2.1.7/data.ncview.x86.cpu.config | 3 ++- 6 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 package/jasper/1.900.1/install.sh diff --git "a/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index bcea9ef..0eaa9e9 100644 --- "a/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -58,7 +58,7 @@ | hdf-eos5 | 1.16 | | | hdf4 | 4.2.14 | | | hdf5 | 1.12.0 | | -| jasper | 1.900.1 | | +| jasper | 1.900.2 | | | libjpeg | v9b | | | libpng | 1.6.37 | | | Mesa | 3.1 | | @@ -303,11 +303,11 @@ cd proj-5.2.0 make all install #jasper -. wget -u https://www.ece.uvic.ca/~frodo/jasper/software/jasper_1.900.1.orig.tar.gz +. wget -u https://www.ece.uvic.ca/~frodo/jasper/software/jasper_1.900.2.orig.tar.gz cd $DEP_BUILD_DIR rm -rf jasper-1.900.2 -tar -xvf $DEP_DOWNLOAD_DIR/jasper_1.900.1.orig.tar.gz -cd jasper-1.900.1 +tar -xvf $DEP_DOWNLOAD_DIR/jasper_1.900.2.orig.tar.gz +cd jasper-1.900.2 ./configure --prefix=$1 make -j make install diff --git a/package/jasper/1.900.1/install.sh b/package/jasper/1.900.1/install.sh deleted file mode 100644 index e76a397..0000000 --- a/package/jasper/1.900.1/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#download from https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz -#!/bin/bash -set -x -set -e -. ${DOWNLOAD_TOOL} -u https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz -cd ${JARVIS_TMP} -rm -rf jasper-1.900.2 -tar -xvf ${JARVIS_DOWNLOAD}/jasper-1.900.2.tar.gz -cd jasper-1.900.2 -./configure --prefix=$1 -make -j -make install diff --git a/package/jasper/1.900.2/install.sh b/package/jasper/1.900.2/install.sh index ade3fa5..cdf5db7 100644 --- a/package/jasper/1.900.2/install.sh +++ b/package/jasper/1.900.2/install.sh @@ -1,13 +1,13 @@ -#download from https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz +#download from https://www.ece.uvic.ca/~frodo/jasper/software/${jasper_ver}.tar.gz #!/bin/bash set -x set -e -. ${DOWNLOAD_TOOL} -u https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz +jasper_ver="jasper-1.900.2" +. ${DOWNLOAD_TOOL} -u https://www.ece.uvic.ca/~frodo/jasper/software/${jasper_ver}.tar.gz cd ${JARVIS_TMP} -rm -rf jasper-1.900.2 -tar -xvf ${JARVIS_DOWNLOAD}/jasper-1.900.2.tar.gz -cd jasper-1.900.2 -#export CC=clang CXX=clang++ +rm -rf ${jasper_ver} +tar -xvf ${JARVIS_DOWNLOAD}/${jasper_ver}.tar.gz +cd ${jasper_ver} ./configure --prefix=$1 make -j make install diff --git a/templates/ncl/6.6.2/data.NCL.arm.cpu.config b/templates/ncl/6.6.2/data.NCL.arm.cpu.config index e27eb2e..5c40ba8 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -53,8 +53,8 @@ ln -s -f ${NETCDF_PATH}/lib/libnetcdf.so.18 ${NETCDF_PATH}/lib/libnetcdf.so.15 module load hdf4/4.2.13 ln -s -f ${HDF5_PATH}/lib/libhdf5_hl.so.200.0.0 ${HDF5_PATH}/lib/libhdf5_hl.so.100 ln -s -f ${HDF5_PATH}/lib/libhdf5.so.200.0.0 ${HDF5_PATH}/lib/libhdf5.so.103 -./jarvis -install jasper/1.900.1 bisheng -module load jasper/1.900.1 +./jarvis -install jasper/1.900.2 bisheng +module load jasper/1.900.2 ln -s -f ${JASPER_PATH}/lib/libjasper.so.1.0.0 ${JASPER_PATH}/lib/libjasper.so.4 ./jarvis -install proj/5.2.0 bisheng @@ -90,7 +90,7 @@ module load hdf5/1.12.0 module load netcdf/4.7.4 module load hdf4/4.2.13 module load gsl/2.6 -module load jasper/1.900.1 +module load jasper/1.900.2 module load proj/5.2.0 module load gdal/2.2.4 module load udunits/2.2.28 diff --git a/templates/ncl/6.6.2/data.NCL.x86.cpu.config b/templates/ncl/6.6.2/data.NCL.x86.cpu.config index d172fcf..09540bb 100644 --- a/templates/ncl/6.6.2/data.NCL.x86.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.x86.cpu.config @@ -144,7 +144,7 @@ sed -i '/#define ManRoot/a \ #define LibPath ${JARVIS_LIBS}/gcc10.3.0/ncl/lib \ #define IncPath ${JARVIS_LIBS}/gcc10.3.0/ncl/include \ #define ManPath ${JARVIS_LIBS}/gcc10.3.0/ncl/man \ -#define LibSearch -L/usr/lib64 -L/usr/local/lib -ltirpc -L${LIBJPEG_PATH}/lib -L${LIBPNG_PATH}/lib -L${JARVIS_LIBS}/gcc10.3.0/jasper/1.900.1/lib -L${JARVIS_LIBS}/gcc10.3.0/szip/2.1.1/lib -L${JARVIS_LIBS}/gcc10.3.0/cairo/1.16.0/lib -L${JARVIS_LIBS}/gcc10.3.0/pixman/0.38.0/lib -L${JARVIS_MPI}/openmpi4.1.2-gcc10.3.0/4.1.2/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf5/1.10.4/lib -L${JARVIS_LIBS}/gcc10.3.0/gsl/2.6/lib -L${JARVIS_LIBS}/gcc10.3.0/netcdf/4.7.4/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf4/4.2.15/lib -L${JARVIS_LIBS}/gcc10.3.0/cairo/1.16.0/lib -L${JARVIS_LIBS}/gcc10.3.0/udunits/2.2.28/lib -L${JARVIS_LIBS}/gcc10.3.0/g2clib/1.6.0/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf-eos2/2.20/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf-eos5/1.16/lib\ +#define LibSearch -L/usr/lib64 -L/usr/local/lib -ltirpc -L${LIBJPEG_PATH}/lib -L${LIBPNG_PATH}/lib -L${JARVIS_LIBS}/gcc10.3.0/jasper/1.900.2/lib -L${JARVIS_LIBS}/gcc10.3.0/szip/2.1.1/lib -L${JARVIS_LIBS}/gcc10.3.0/cairo/1.16.0/lib -L${JARVIS_LIBS}/gcc10.3.0/pixman/0.38.0/lib -L${JARVIS_MPI}/openmpi4.1.2-gcc10.3.0/4.1.2/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf5/1.10.4/lib -L${JARVIS_LIBS}/gcc10.3.0/gsl/2.6/lib -L${JARVIS_LIBS}/gcc10.3.0/netcdf/4.7.4/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf4/4.2.15/lib -L${JARVIS_LIBS}/gcc10.3.0/cairo/1.16.0/lib -L${JARVIS_LIBS}/gcc10.3.0/udunits/2.2.28/lib -L${JARVIS_LIBS}/gcc10.3.0/g2clib/1.6.0/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf-eos2/2.20/lib -L${JARVIS_LIBS}/gcc10.3.0/hdf-eos5/1.16/lib\ #define IncSearch -I/usr/local/include -I${LIBPNG_PATH}/include -I${JARVIS_MPI}/openmpi4.1.2-gcc10.3.0/4.1.2/include -I${JARVIS_LIBS}/gcc10.3.0/hdf5/1.10.4/include -I${JARVIS_LIBS}/gcc10.3.0/gsl/2.6/include -I${JARVIS_LIBS}/gcc10.3.0/netcdf/4.7.4/include -I${JARVIS_LIBS}/gcc10.3.0/hdf4/4.2.15/include -I${JARVIS_LIBS}/gcc10.3.0/cairo/1.16.0/include -I${JARVIS_LIBS}/gcc10.3.0/freetype/2.5.1/include -I${JARVIS_LIBS}/gcc10.3.0/udunits/2.2.28/include -I${JARVIS_LIBS}/gcc10.3.0/g2clib/1.6.0/include -I${JARVIS_LIBS}/gcc10.3.0/hdf-eos2/2.20/include -I${JARVIS_LIBS}/gcc10.3.0/hdf-eos5/1.16/include\ #define XdrLibrary -ltirpc' ./Site diff --git a/templates/ncview/2.1.7/data.ncview.x86.cpu.config b/templates/ncview/2.1.7/data.ncview.x86.cpu.config index 903579a..b967a05 100644 --- a/templates/ncview/2.1.7/data.ncview.x86.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.x86.cpu.config @@ -39,7 +39,8 @@ case_dir = ./jarvis -install netcdf/4.7.4 gcc sed -i '13c NETCDF_DIR=${1%/*/*}/netcdf/4.7.4' package/ncview/2.1.7/install.sh ./jarvis -install ncview/2.1.7 gcc + [RUN] run = binary = -node = 1 +nodes = 1 -- Gitee