From b79037fb71991c6e71c13b0d983ef7c860d722b7 Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Fri, 10 Feb 2023 08:49:22 +0000 Subject: [PATCH 01/35] =?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 2dd6f449f878b4aa002f39ca3001b2d3441c11a8 Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Fri, 10 Feb 2023 09:59:45 +0000 Subject: [PATCH 02/35] =?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 914d839e03a75250e608c71f06ef314c306cafef Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Sat, 11 Feb 2023 07:59:19 +0000 Subject: [PATCH 03/35] =?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 64b07aa25c2c61a3f3fd2ac650dd2c53bb70fa39 Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Sat, 11 Feb 2023 08:10:02 +0000 Subject: [PATCH 04/35] =?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 73bd31ac1891627664201fd13675e97768286fc8 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:13:56 +0000 Subject: [PATCH 05/35] 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 3afc9d1ae14367934395ff5ed113e77c395c79a2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:14:18 +0000 Subject: [PATCH 06/35] 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 b7ede4d20c874a53ec4fc11fe46a25dc26604dbd Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:14:26 +0000 Subject: [PATCH 07/35] =?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 96a0b134607138672995d4200aadbf79139edb0c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:22:10 +0000 Subject: [PATCH 08/35] 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 188cd62482d231d3ef343fc7ed8ca7a495e931c5 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:23:04 +0000 Subject: [PATCH 09/35] 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 6165b6399717888993ab5ead6b0f3b3c423c683d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:25:27 +0000 Subject: [PATCH 10/35] 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 407a3d83e3c2f396f6ae15280eb8fff7cc783c48 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:27:13 +0000 Subject: [PATCH 11/35] 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 e8062a7b781ce12459cf867068cc6fb39f24ec78 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:31:55 +0000 Subject: [PATCH 12/35] 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 971d66e20af60e8264b7eeb7aa898b70cfd3a03a Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:34:42 +0000 Subject: [PATCH 13/35] 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 f64c2a98a3175e721058812fa5765cf878931ad2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:37:09 +0000 Subject: [PATCH 14/35] 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 9d6804c38cf57027afa499894c293d51a6cf5b3d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:38:55 +0000 Subject: [PATCH 15/35] 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 21b20cb22d9a681628770391df5638072ce3b4fb Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:40:08 +0000 Subject: [PATCH 16/35] 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 827835882e16d4d0724db4094c05da3fe4a05e0e Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Feb 2023 09:50:59 +0000 Subject: [PATCH 17/35] 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 c3bcdeb8e6a9e3a8fffcb4aed16f94dabbd4da53 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:54:46 +0000 Subject: [PATCH 18/35] 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 0263368df1b812fbfd8bf9c65c7a4d9cb89e311e Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:56:34 +0000 Subject: [PATCH 19/35] 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 9982d5c8e33359d63bac0400c09f24c855385ae4 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:58:41 +0000 Subject: [PATCH 20/35] 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 921a1cc3bcd033003f2899a53024ef256fc4b39d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 01:59:26 +0000 Subject: [PATCH 21/35] 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 6859bfef55471d355a8ae2b1c942efc49e983b2c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 02:06:48 +0000 Subject: [PATCH 22/35] 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 6249122ccf5361e7f40c1a054b93c6776eed2406 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:11:31 +0000 Subject: [PATCH 23/35] 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 58a51f6b1c16ba3dd057c0f2d48d2e69a8f0819f Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:20:09 +0000 Subject: [PATCH 24/35] 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 f77e3180eb65c044fa93414c19d8607328b8531c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:41:06 +0000 Subject: [PATCH 25/35] 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 b8e32200a8decca4e507809f68d0db043f60f28c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 03:48:04 +0000 Subject: [PATCH 26/35] 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 76334da01832cec0c427f491163618f7bbac735b Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 06:27:10 +0000 Subject: [PATCH 27/35] 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 feaff44de7ba08aa1da4effa24ac783d1c90e140 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 06:33:27 +0000 Subject: [PATCH 28/35] 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 c4c64f05734f98bfec2ef9d92c5bbee4074acd78 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 07:08:58 +0000 Subject: [PATCH 29/35] 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 2c3637e976892160a675bd4d228d02bfcfebb7d9 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 08:35:48 +0000 Subject: [PATCH 30/35] 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 47926e5843b572b7d3812ed90a2dd3577645b197 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 09:43:26 +0000 Subject: [PATCH 31/35] 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 12a14e0fa940d7e6111becef35f00806072c9c34 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Feb 2023 10:09:51 +0000 Subject: [PATCH 32/35] 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 f6b89a82e9edbe583a1893469ee7b62e9b2265e0 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Feb 2023 01:22:42 +0000 Subject: [PATCH 33/35] 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 3fcadafbf30e38631cf3eb5a50a8dfc061342f57 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Feb 2023 01:23:01 +0000 Subject: [PATCH 34/35] 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 9db4a6aaae3bc9decd99595fd2a147169548117d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Feb 2023 01:28:44 +0000 Subject: [PATCH 35/35] 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