From ca8c6a8db149340afdcef4f9d1302d01a27b5eaa Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 1 Mar 2023 15:49:00 +0800 Subject: [PATCH 01/55] fix compiler install --- package/bisheng/2.3.0/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 package/bisheng/2.3.0/install.sh diff --git a/package/bisheng/2.3.0/install.sh b/package/bisheng/2.3.0/install.sh old mode 100644 new mode 100755 index d8fa580..442aacd --- 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 84cdecbad0a482c4e345d9ecc0185434ec17c2ea Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 2 Mar 2023 09:46:55 +0800 Subject: [PATCH 02/55] fix templates_nco --- templates/nco/5.1.4/data.NCO.arm.cpu.config | 14 ++++++++++---- 1 file changed, 10 insertions(+), 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 8d52a9a..c0213ba 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -18,10 +18,13 @@ 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 +CC=`which mpicc` +./jarvis -install hdf5/1.12.0/clang bisheng module load hdf5-clang/1.12.0 -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 hdf4/4.2.13 bisheng +module load hdf4/4.2.13 +./jarvis -install hdf4/ bisheng +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_CLANG_PATH}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_CLANG_PATH}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_CLANG_PATH}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_CLANG_PATH}/lib -L${PNETCDF_DIR}/lib -I${HDF5_CLANG_PATH}/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 ./jarvis -install gsl/2.6 bisheng @@ -36,13 +39,16 @@ 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.13 module load netcdf/4.7.4 module load gsl/2.6 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 0fa9e0d1368a28b5d063f9646a35dc34ac93029d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 2 Mar 2023 10:03:14 +0800 Subject: [PATCH 03/55] fix container_nco_arm --- container/nco/data.NCO.arm.cpu.config.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/nco/data.NCO.arm.cpu.config.def b/container/nco/data.NCO.arm.cpu.config.def index a9ece4f..ac8cbd3 100644 --- a/container/nco/data.NCO.arm.cpu.config.def +++ b/container/nco/data.NCO.arm.cpu.config.def @@ -8,14 +8,14 @@ From: openeuler/openeuler:20.03 %post # Install the necessary development environment - yum install -y environment-modules git dmidecode pciutils wget vim expat-devel + yum install -y environment-modules git dmidecode pciutils wget vim expat-devel zlib-devel expat-devel cpio # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package yum install -y tcsh tcl lsof tk bc source /etc/profile || true git config --global http.sslVerify false - git clone https://gitee.com/openeuler/hpcrunner + git clone https://gitee.com/chenshaoheng/hpcrunner cd hpcrunner source ./init.sh # add your personal files here -- Gitee From 2b50a8e23c453a48fda9954e79995e706aa00d11 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 2 Mar 2023 10:10:45 +0800 Subject: [PATCH 04/55] add container_ncview_arm --- .../ncview/data.ncview.arm.cpu.config.def | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 container/ncview/data.ncview.arm.cpu.config.def diff --git a/container/ncview/data.ncview.arm.cpu.config.def b/container/ncview/data.ncview.arm.cpu.config.def new file mode 100644 index 0000000..d019388 --- /dev/null +++ b/container/ncview/data.ncview.arm.cpu.config.def @@ -0,0 +1,34 @@ +BootStrap: docker +From: openeuler/openeuler:20.03 + +%environment + source /etc/profile || true + cd /hpcrunner + source env.sh + +%post + # Install the necessary development environment + yum install -y environment-modules git dmidecode pciutils wget vim expat-devel cpio libcurl-devel zlib zlib-devel libX11* mesa* libXmu libICE-devel libSM-devel libX*-devel netpbm-devel + # Install base gcc + yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran + # install network package + yum install -y tcsh tcl lsof tk bc + source /etc/profile || true + git config --global http.sslVerify false + git clone https://gitee.com/chenshaoheng/hpcrunner + cd hpcrunner + source ./init.sh + # add your personal files here + + # Switch config + ./jarvis -use templates/ncview/2.1.7/data.ncview.arm.cpu.config + # download dependency + ./jarvis -d + # install dependency + ./jarvis -dp + # build hpc + ./jarvis -b + # run hpc + ./jarvis -r + # clean tmp directory + rm -rf downloads tmp -- Gitee From 8ca4b47fff662ac3f199041074b262e02a3a7176 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 3 Mar 2023 10:25:53 +0800 Subject: [PATCH 05/55] fix hdf51.10.1 install --- package/hdf5/1.10.1/install.sh | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 package/hdf5/1.10.1/install.sh diff --git a/package/hdf5/1.10.1/install.sh b/package/hdf5/1.10.1/install.sh old mode 100644 new mode 100755 index b2e8e3a..a589ae0 --- a/package/hdf5/1.10.1/install.sh +++ b/package/hdf5/1.10.1/install.sh @@ -9,5 +9,8 @@ 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 +sed +sed -i 11835c make -j make install -- Gitee From 3ecccca4d7974781a90a8e32ad6e83990e3b6bbf Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 16:15:27 +0800 Subject: [PATCH 06/55] fix hdf5 install --- package/hdf5/1.10.1/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/hdf5/1.10.1/install.sh b/package/hdf5/1.10.1/install.sh index a589ae0..a5f991a 100755 --- a/package/hdf5/1.10.1/install.sh +++ b/package/hdf5/1.10.1/install.sh @@ -9,8 +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 -sed -sed -i 11835c +sed -i "11835c wl=-Wl," libtool make -j make install -- Gitee From 407f229383e59ccec2935f82d0263771f0e3cc96 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 16:22:25 +0800 Subject: [PATCH 07/55] fix hdf5 install --- package/hdf5/1.10.1/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hdf5/1.10.1/install.sh b/package/hdf5/1.10.1/install.sh index a5f991a..90aa738 100755 --- a/package/hdf5/1.10.1/install.sh +++ b/package/hdf5/1.10.1/install.sh @@ -9,6 +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 +sed -i '11835c wl="-Wl,"' libtool make -j make install -- Gitee From f937db088bd58a86acc19128d9c01c6469596b9e Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 16:24:17 +0800 Subject: [PATCH 08/55] fix hdf5 install --- package/hdf5/1.10.1/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/package/hdf5/1.10.1/install.sh b/package/hdf5/1.10.1/install.sh index 90aa738..b2e8e3a 100755 --- a/package/hdf5/1.10.1/install.sh +++ b/package/hdf5/1.10.1/install.sh @@ -9,6 +9,5 @@ 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 2b8e188ecf7c8e636b8538269bb00660862a9bef Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 16:36:04 +0800 Subject: [PATCH 09/55] add package/libjpeg/v9b --- package/libjpeg/v9b/install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 package/libjpeg/v9b/install.sh diff --git a/package/libjpeg/v9b/install.sh b/package/libjpeg/v9b/install.sh new file mode 100755 index 0000000..ac243d9 --- /dev/null +++ b/package/libjpeg/v9b/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +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 CFLAGS="-fPIC" +make -j +make install -- Gitee From 9856dafbb6a13c033f09b2ac0aafb330131f1d49 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 17:01:50 +0800 Subject: [PATCH 10/55] updata package/netcdf/4.7.4/install.sh --- package/netcdf/4.7.4/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 package/netcdf/4.7.4/install.sh diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh old mode 100644 new mode 100755 index c3b032e..d279368 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -18,7 +18,7 @@ else fi 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" +./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_PATH}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_PATH}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_PATH}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_PATH}/lib -L${PNETCDF_DIR}/lib -I${HDF5_PATH}/include -I${PNETCDF_DIR}/include" make -j16 make install -- Gitee From 3769c5f28ba6f1ca64025870c391950c6ede392e Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 17:08:55 +0800 Subject: [PATCH 11/55] add package/netcdf/4.7.0/clang --- package/netcdf/4.7.0/clang/install.sh | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 package/netcdf/4.7.0/clang/install.sh diff --git a/package/netcdf/4.7.0/clang/install.sh b/package/netcdf/4.7.0/clang/install.sh new file mode 100755 index 0000000..04a74f3 --- /dev/null +++ b/package/netcdf/4.7.0/clang/install.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -x +set -e +netcdf_c_version='4.7.0' +netcdf_f_version='4.4.5' +. ${DOWNLOAD_TOOL} -u https://codeload.github.com/Unidata/netcdf-fortran/tar.gz/refs/tags/v${netcdf_f_version} -f netcdf-fortran-${netcdf_f_version}.tar.gz +. ${DOWNLOAD_TOOL} -u https://codeload.github.com/Unidata/netcdf-c/tar.gz/refs/tags/v${netcdf_c_version} -f netcdf-c-${netcdf_c_version}.tar.gz +cd ${JARVIS_TMP} +rm -rf netcdf-c-${netcdf_c_version} netcdf-fortran-${netcdf_f_version} +tar -xvf ${JARVIS_DOWNLOAD}/netcdf-c-${netcdf_c_version}.tar.gz +tar -xvf ${JARVIS_DOWNLOAD}/netcdf-fortran-${netcdf_f_version}.tar.gz +cd netcdf-c-${netcdf_c_version} +if [ x"$(arch)" = xaarch64 ];then + build_type='--build=aarch64-unknown-linux-gnu' +else + build_type='' +fi +export CC=mpicc CXX=mpicxx FC=mpifort +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" + +make -j16 +make install + +export PATH=$1/bin:$PATH +export LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH +export NETCDF=${1} + +cd ../netcdf-fortran-${netcdf_f_version} +./configure --prefix=$1 ${build_type} --enable-shared --with-pic --disable-doxygen --enable-largefile --enable-static CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${1}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${1}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${1}/lib" CFLAGS="-O3 -L${HDF5_DIR}/HDF5/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" CXXFLAGS="-O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" FCFLAGS="-O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" +sed -i '11686c wl="-Wl,"' libtool +sed -i '11838c wl="-Wl,"' libtool +make -j16 +make install -- Gitee From 55d6b63f55f3928286024ae2de76fcb974ce46c9 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 17:46:36 +0800 Subject: [PATCH 12/55] fix package/netcdf/4.7.0/clang/install.sh --- package/netcdf/4.7.0/clang/install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/netcdf/4.7.0/clang/install.sh b/package/netcdf/4.7.0/clang/install.sh index 04a74f3..73a8055 100755 --- a/package/netcdf/4.7.0/clang/install.sh +++ b/package/netcdf/4.7.0/clang/install.sh @@ -19,6 +19,13 @@ fi export CC=mpicc CXX=mpicxx FC=mpifort HDF5_DIR=${HDF5_CLANG_PATH} PNETCDF_DIR=${PNETCDF_PATH} + +cd include/ +rm -rf ncconfigure.h +wget https://github.com/Unidata/netcdf-c/files/3234181/ncconfigure.zip --no-ch +unzip ncconfigure.zip +cd .. + ./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" make -j16 -- Gitee From d70d97e690b0e66f2f9fef47a4011658ccae28b5 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 18:51:44 +0800 Subject: [PATCH 13/55] fix zlib&add package/zlib/1.2.11/ --- package/zlib/1.2.11/clang/install.sh | 11 +++++++++++ package/zlib/1.2.11/install.sh | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 package/zlib/1.2.11/clang/install.sh create mode 100755 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 100755 index 0000000..264fa4d --- /dev/null +++ b/package/zlib/1.2.11/clang/install.sh @@ -0,0 +1,11 @@ +#!/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} +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 100755 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 c66732e82ed66ad5ed42361a6a2dbcab0c868ca4 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Mon, 13 Mar 2023 19:27:57 +0800 Subject: [PATCH 14/55] fix templates/ncview/2.1.7/data.ncview.arm.cpu.config --- .../ncview/2.1.7/data.ncview.arm.cpu.config | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 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 6e4653d..0af52eb 100644 --- a/templates/ncview/2.1.7/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.7/data.ncview.arm.cpu.config @@ -11,28 +11,37 @@ export CC=clang CXX=clang++ FC=flang ./jarvis -install hmpi/1.1.1 clang module load hmpi/1.1.1 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort -./jarvis -install hdf5/1.10.1 clang+mpi +./jarvis -install hdf5/1.10.1/clang clang+mpi ./jarvis -install pnetcdf/1.11.2 bisheng+mpi -./jarvis -install netcdf/4.7.0 clang+mpi -./jarvis -install udunits/2.2.28 clang+mpi +module add hdf5-clang/1.10.1 +module load pnetcdf/1.11.2 +./jarvis -install netcdf/4.7.0/clang clang+mpi +sed -i '13c NETCDF_DIR=${1%/*/*}/netcdf-clang/4.7.0' package/ncview/2.1.7/install.sh + + + [ENV] module purge module use ${JARVIS_ROOT}/software/modulefiles module add bisheng/2.1.0 module add hmpi/1.1.1 +module add hdf5-clang/1.10.1 +module add pnetcdf/1.11.2 +module add netcdf-clang/4.7.0 +module add udunits/2.2.28 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] app_name = ncview build_dir = ${JARVIS_ROOT} binary_dir = -case_dir = +case_dir = ${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/ncview/2.1.7/bin [BUILD] ./jarvis -install ncview/2.1.7 clang+mpi [RUN] -run = +run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/ncview/2.1.7/bin && ncview binary = -node = 1 +nodes = 1 -- Gitee From 9aafb78d7751bc0c69bfef5b60daefc46f5047d6 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 14 Mar 2023 17:45:27 +0800 Subject: [PATCH 15/55] add package/ncl/6.6.2/install.sh --- package/ncl/6.6.2/install.sh | 154 +++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100755 package/ncl/6.6.2/install.sh diff --git a/package/ncl/6.6.2/install.sh b/package/ncl/6.6.2/install.sh new file mode 100755 index 0000000..5fa85f1 --- /dev/null +++ b/package/ncl/6.6.2/install.sh @@ -0,0 +1,154 @@ +#!/bin/bash + +# download from https://github.com/NCAR/ncl/archive/refs/tags/6.6.2.tar.gz +. $CHECK_ROOT && yum install zlib zlib-devel expat-devel freetype freetype-devel freetype-demos python-freetype ftgl ftgl-devel udunits2 udunits2-devel +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://github.com/NCAR/ncl/archive/refs/tags/6.6.2.tar.gz +cd ${JARVIS_TMP} +rm -rf ncl-6.6.2 +tar -xvf ${JARVIS_DOWNLOAD}/6.6.2.tar.gz +cd ncl-6.6.2 + +#INCULE_PATCH################################################################# +#common/src/libncarg_c/yMakefile +sed -i '61c EXCSRCS = bcopyswap.c logic32.c' common/src/libncarg_c/yMakefile +sed -i '62c EXFSRCS = gbytes.f sbytes.f' common/src/libncarg_c/yMakefile +sed -i '62a EXOBJS = bcopyswap.o sbytes.o gbytes.o logic32.o' common/src/libncarg_c/yMakefile +#config/LINUX +sed -i '32c #define LibSearchUser -L/usr/X11R6/lib64 -L/usr/lib64' config/LINUX +sed -i '33c #define IncSearchUser -I/usr/X11R6/include -I/usr/include' config/LINUX +sed -i '35c #define ArchRecLibSearch -L/usr/X11R6/lib64 -L/usr/lib64' config/LINUX +sed -i '36c #define ArchRecIncSearch -I/usr/X11R6/include -I/usr/include' config/LINUX +#ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9660c IF ((CEX1(1:1).EQ.' ') .AND. (LCX1 .EQ. 1)) LCX1=0" ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9662c IF ((CEX2(1:1).EQ.' ') .AND. (LCX2 .EQ. 1)) LCX2=0" ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9669a DO (III=1,LBUF)\n\CBUF(III:III)=' '\n\END DO" ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9795c CBUF(1:1)='0'" ncarg2d/src/libncarg/conpack/CodeIftran +#ni/src/ncl/yMakefile +sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ni/src/ncl/yMakefile +#common/src/bin/ncargpath/ncargpath.c +sed -i '30a #include ' common/src/bin/ncargpath/ncargpath.c +#ncarg2d/src/libncarg/plotchar/bofred.c +sed -i "14a #include \n\#include \n\#include \n\#include " ncarg2d/src/libncarg/plotchar/bofred.c +#ncarg2d/src/libncarg/areasC/c_argeti.c +sed -i "14a #include " ncarg2d/src/libncarg/areasC/c_argeti.c +#ncarg2d/src/libncarg/ncargC.h +sed -i "182a extern void NGCALLF(agback,AGBACK)(\n\#ifdef NeedFuncProto\nvoid\n\#endif\n\);\n" ncarg2d/src/libncarg/ncargC.h +#ncarview/src/lib/libncarg_ras/raster.c +sed -i "37a #include " ncarview/src/lib/libncarg_ras/raster.c +sed -i "508a int" ncarview/src/lib/libncarg_ras/raster.c +#ncarview/src/lib/libncarg_ras/misc.c +sed -i "60a void" ncarview/src/lib/libncarg_ras/misc.c +sed -i "76a void" ncarview/src/lib/libncarg_ras/misc.c +sed -i "103a int" ncarview/src/lib/libncarg_ras/misc.c +##################################### +#ncarview/src/lib/libncarg_ras/misc.h +cat << EOF > ncarview/src/lib/libncarg_ras/misc.h +int read_swap(FILE *fp, int nb, char *buf, int swapflag); +void _swapshort (register char *bp, register unsigned n); +void _swaplong (register char *bp, register unsigned n); +int ImageCount_(char *name, char *format); +EOF +##################################### +#ncarview/src/lib/libctrans/buffer.c +sed -i "66c void flush()" ncarview/src/lib/libctrans/buffer.c +sed -i "76c void buffer(str,count)" ncarview/src/lib/libctrans/buffer.c +#################################### +#ncarview/src/lib/libctrans/buffer.h +cat << EOF > ncarview/src/lib/libctrans/buffer.h +#include "ctrandef.h" +int GcapOpenBuffer(char *file); +void flush(void); +void buffer(SignedChar *str, int count); +EOF +################################### +#ncarview/src/lib/libctrans/default.c +sed -i "89c void InitDefault()" ncarview/src/lib/libctrans/default.c +sed -i "163c void SetInPic(value)" ncarview/src/lib/libctrans/default.c +sed -i "1280c void SetMinLineWidthDefault(line_width)" ncarview/src/lib/libctrans/default.c +sed -i "1305c void SetMaxLineWidthDefault(line_width)" ncarview/src/lib/libctrans/default.c +sed -i "1320c void SetAdditionalLineScale(line_scale)" ncarview/src/lib/libctrans/default.c +sed -i "1334c void SetRGBIntensityScale(rgb_scale)" ncarview/src/lib/libctrans/default.c +#ncarview/src/lib/libctrans/default.h +sed -i "443a void InitDefault(void);\nvoid _CtDefNoColorDefault(void);\nvoid SetInPic(boolean value);\nint MFVersion(CGMC *c);\nint MFDesc(CGMC *c);\nint VDCType(CGMC *c);\nint IntergerPrec(CGMC *c);\nint RealPrec(CGMC *c);\nint IndexPrec(CGMC *c);\nint ColrPrec(CGMC *c);\nint ColrIndexPrec(CGMC *c);\nint MaxColrIndex(CGMC *c);\nint ColrValueExt(CGMC *c);\nint MFElemList(CGMC *c);\nint MFDefaults(CGMC *c);\nint CharSetList(CGMC *c);\nint CharCoding(CGMC *c);\nint ScaleMode(CGMC *c);\nint ColrMode(CGMC *c);\nint LineWidthMode(CGMC *c);\nint MarkerSizeMode(CGMC *c);\nint EdgeWidthMode(CGMC *c);\nint VDCExt(CGMC *c);\nint BackColr(CGMC *c);\nint VDCIntergerPrec(CGMC *c);\nint VDCRealPrec(CGMC *c);\nint AuxColr(CGMC *c);\nint Transparency(CGMC *c);\nint ClipRect(CGMC *c);\nint Clip(CGMC *c);\nint LineIndex(CGMC *c);\nint LineType(CGMC *c);\nint LineWidth(CGMC *c);\nint LineColr(CGMC *c);\nint MarkerIndex(CGMC *c);\nint MarkerType(CGMC *c);\nint MarkerSize(CGMC *c);\nint MarkerColr(CGMC *c);\nint TextIndex(CGMC *c);\nint TextFontIndex(CGMC *c);\nint TextPrec(CGMC *c);\nint CharExpan(CGMC *c);\nint CharSpace(CGMC *c);\nint TextColr(CGMC *c);\nint CharHeight(CGMC *c);\nint CharOri(CGMC *c);\nint TextPath(CGMC *c);\nint TextAlign(CGMC *c);\nint CharSetIndex(CGMC *c);\nint AltCharSetIndex(CGMC *c);\nint FillIndex(CGMC *c);\nint IntStyle(CGMC *c);\nint FillColr(CGMC *c);\nint HatchIndex(CGMC *c);\nint PatIndex(CGMC *c);\nint EdgeIndex(CGMC *c);\nint EdgeType(CGMC *c);\nint EdgeWidth(CGMC *c);\nint EdgeColr(CGMC *c);\nint EdgeVis(CGMC *c);\nint FillRefPt(CGMC *c);\nint PatTable(CGMC *c);\nint PatSize(CGMC *c);\nint ColrTable(CGMC *c);\nint ASF(CGMC *c);\nvoid SetMinLineWidthDefault(float line_width);\nvoid SetMaxLineWidthDefault(float line_width);\nvoid SetAdditionalLineScale(float line_scale);\nvoid SetRGBIntensityScale(float rgb_scale); " ncarview/src/lib/libctrans/default.h +#ncarview/src/lib/libctrans/gcaprast.c +sed -i "33a #include " ncarview/src/lib/libctrans/gcaprast.c +sed -i '44a #include "buffer.h"' ncarview/src/lib/libctrans/gcaprast.c +sed -i '45a #include "format.h"' ncarview/src/lib/libctrans/gcaprast.c +#ncarview/src/lib/libctrans/in.h +sed -i '18a #include "cgmc.h"' ncarview/src/lib/libctrans/in.h +sed -i "63a int Instr_Dec(CGMC *cgmc);" ncarview/src/lib/libctrans/in.h +#ncarview/src/lib/libctrans/misc.c +sed -i "26c int CoordStringToInt(s, llx, lly, urx, ury)" ncarview/src/lib/libctrans/misc.c +#ncarview/src/lib/libctrans/misc.h +################################## +cat << EOF > ncarview/src/lib/libctrans/misc.h +int CoordStringToInt(char *s, int *llx, int *lly, int *urx, int *ury); +EOF +################################## +#ncarview/src/lib/libctrans/rast.c +sed -i '19a #include "in.h"' ncarview/src/lib/libctrans/rast.c +sed -i '34a #include "misc.h"' ncarview/src/lib/libctrans/rast.c +sed -i "96c static int build_ras_arg(ras_argc, ras_argv, rast_opts)" ncarview/src/lib/libctrans/rast.c +sed -i "158c static void clear_grid(grid)" ncarview/src/lib/libctrans/rast.c +sed -i "176c static void init_color_tab()" ncarview/src/lib/libctrans/rast.c +sed -i "190c void get_resolution(dev_extent, opts, name)" ncarview/src/lib/libctrans/rast.c +#ncarview/src/lib/libncarg_ras/sunraster.c +sed -i "48a #include " ncarview/src/lib/libncarg_ras/sunraster.c +sed -i '58a #include "misc.h"' ncarview/src/lib/libncarg_ras/sunraster.c +sed -i "227c nb = write(ras->fd, dep, sizeof(SunInfo));" ncarview/src/lib/libncarg_ras/sunraster.c +sed -i "232c nb = write(ras->fd, ras->red, ras->ncolor);" ncarview/src/lib/libncarg_ras/sunraster.c +sed -i "235c nb = write(ras->fd, ras->green, ras->ncolor);" ncarview/src/lib/libncarg_ras/sunraster.c +sed -i "238c nb = write(ras->fd, ras->blue, ras->ncolor);" ncarview/src/lib/libncarg_ras/sunraster.c +#END_INCLUDE_PATCH############################################################ + +#LNETCDFF##################################################################### +#ni/src/scripts/nhlf77.csh +sed -i '67c set extra_libs = "$extra_libs SED_NCDFLIBS -lnetcdff"' ni/src/scripts/nhlf77.csh +#END_LNETCDFF################################################################# + + +#Other###################### +#common/src/fontcap/yMakefile +sed -i '46c .fc: $(FONTC)' common/src/fontcap/yMakefile + +#ni/src/scripts/yMakefile +sed -i '9a InstallTarget($(SCRIPTS1),$(INSTALL_BIN),$(BINPATH))' ni/src/scripts/yMakefile +sed -i '10a InstallTarget($(SCRIPTS2),$(INSTALL_BIN),$(BINPATH))' ni/src/scripts/yMakefile +sed -i '11a CleanFilesTarget($(SCRIPTS1))' ni/src/scripts/yMakefile +sed -i '12a InstallManPages($(MAN1),$(FORMAT_EXT),$(MAN1PATH),$(MAN1_SECTION))'ni/src/scripts/yMakefile +sed -i '13a FormatManPages($(MAN1),.m,.p)' ni/src/scripts/yMakefile +sed -i '79,83d' ni/src/scripts/yMakefile + +#config/Rules +sed -i '82c install-local:: ]\' config/Rules +############ +#config/ymake +sed -i '187a set share_dir = `ncargpath share`' config/ymake +sed -i '188a if ($status != 0) then' config/ymake +sed -i '189a echo "$0 : Unable to find NCARG_SHARE dir" > /dev/tty' config/ymake +sed -i "190a exit 1\nendif" config/ymake +sed -i '191a set defines = ($defines -D_InstShare\=$share_dir)' config/ymake + +#config/Template +sed -i "165a #ifndef ShareRoot\n#ifndef _IgnoreYmakeRoot\n#define ShareRoot YmakeRoot/share\n#else\n#define ShareRoot _InstShare\n#endif /* _IgnoreYmakeRoot */\n#endif /* ShareRoot */\n" config/Template +sed -i "224a #ifndef SharePath\n#ifdef _UseRootPath\n#define SharePath RootPath/share\n#else\n#define SharePath ShareRoot\n#endif\n#endif\n" config/Template +sed -i "615a SHAREPATH = SharePath" config/Template + +#config/Project +sed -i '384c LIBNCARGROOT = $(SHAREPATH)/$(NCARGDIR)' config/Project +sed -i '384a LIBNCARGARCH = $(LIBPATH)/$(NCARGDIR)' config/Project +sed -i + + + + + + + + +./configure --prefix=$1 --with-nc-config=${NETCDF_DIR}/bin/nc-config -with-udunits2_incdir=${UDUNITS_DIR}/include -with-udunits2_libdir=${UDUNITS_DIR}/lib +make -j +make install -- Gitee From e66b2d84b64ad66e71f268840e98ae0b2f6fbf86 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Mar 2023 11:01:55 +0800 Subject: [PATCH 16/55] add package/ncl/6.6.2/install.sh --- package/ncl/6.6.2/install.sh | 80 ++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/package/ncl/6.6.2/install.sh b/package/ncl/6.6.2/install.sh index 5fa85f1..8b032e0 100755 --- a/package/ncl/6.6.2/install.sh +++ b/package/ncl/6.6.2/install.sh @@ -24,18 +24,18 @@ sed -i '36c #define ArchRecIncSearch -I/usr/X11R6/include -I/usr/include' con sed -i "9660c IF ((CEX1(1:1).EQ.' ') .AND. (LCX1 .EQ. 1)) LCX1=0" ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9662c IF ((CEX2(1:1).EQ.' ') .AND. (LCX2 .EQ. 1)) LCX2=0" ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncarg2d/src/libncarg/conpack/CodeIftran -sed -i "9669a DO (III=1,LBUF)\n\CBUF(III:III)=' '\n\END DO" ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9669a DO (III=1,LBUF)\nCBUF(III:III)=' '\nEND DO" ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9795c CBUF(1:1)='0'" ncarg2d/src/libncarg/conpack/CodeIftran #ni/src/ncl/yMakefile sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ni/src/ncl/yMakefile #common/src/bin/ncargpath/ncargpath.c sed -i '30a #include ' common/src/bin/ncargpath/ncargpath.c #ncarg2d/src/libncarg/plotchar/bofred.c -sed -i "14a #include \n\#include \n\#include \n\#include " ncarg2d/src/libncarg/plotchar/bofred.c +sed -i "14a #include \n#include \n#include \n#include " ncarg2d/src/libncarg/plotchar/bofred.c #ncarg2d/src/libncarg/areasC/c_argeti.c sed -i "14a #include " ncarg2d/src/libncarg/areasC/c_argeti.c #ncarg2d/src/libncarg/ncargC.h -sed -i "182a extern void NGCALLF(agback,AGBACK)(\n\#ifdef NeedFuncProto\nvoid\n\#endif\n\);\n" ncarg2d/src/libncarg/ncargC.h +sed -i "182a extern void NGCALLF(agback,AGBACK)(\n#ifdef NeedFuncProto\nvoid\n#endif\n);\n" ncarg2d/src/libncarg/ncargC.h #ncarview/src/lib/libncarg_ras/raster.c sed -i "37a #include " ncarview/src/lib/libncarg_ras/raster.c sed -i "508a int" ncarview/src/lib/libncarg_ras/raster.c @@ -124,31 +124,75 @@ sed -i '79,83d' ni/src/scripts/yMakefile #config/Rules sed -i '82c install-local:: ]\' config/Rules -############ + #config/ymake sed -i '187a set share_dir = `ncargpath share`' config/ymake sed -i '188a if ($status != 0) then' config/ymake sed -i '189a echo "$0 : Unable to find NCARG_SHARE dir" > /dev/tty' config/ymake sed -i "190a exit 1\nendif" config/ymake -sed -i '191a set defines = ($defines -D_InstShare\=$share_dir)' config/ymake +sed -i '192a set defines = ($defines -D_InstShare\=$share_dir)' config/ymake #config/Template sed -i "165a #ifndef ShareRoot\n#ifndef _IgnoreYmakeRoot\n#define ShareRoot YmakeRoot/share\n#else\n#define ShareRoot _InstShare\n#endif /* _IgnoreYmakeRoot */\n#endif /* ShareRoot */\n" config/Template sed -i "224a #ifndef SharePath\n#ifdef _UseRootPath\n#define SharePath RootPath/share\n#else\n#define SharePath ShareRoot\n#endif\n#endif\n" config/Template -sed -i "615a SHAREPATH = SharePath" config/Template +sed -i "623a SHAREPATH = SharePath" config/Template #config/Project sed -i '384c LIBNCARGROOT = $(SHAREPATH)/$(NCARGDIR)' config/Project sed -i '384a LIBNCARGARCH = $(LIBPATH)/$(NCARGDIR)' config/Project -sed -i - - - - - - - - -./configure --prefix=$1 --with-nc-config=${NETCDF_DIR}/bin/nc-config -with-udunits2_incdir=${UDUNITS_DIR}/include -with-udunits2_libdir=${UDUNITS_DIR}/lib -make -j -make install +sed -i '393c ROBJROOT = $(LIBNCARGARCH)/$(ROBJDIR)' config/Project +sed -i '402c LIBNCARGPATH = $(SHAREPATH)/$(NCARGDIR)' config/Project + +sed -i '410c ROBJPATH = $(LIBNCARGARCH)/$(ROBJDIR)' config/Project +sed -i '472c "lib",NULL,NULL,"$(LIBROOT)",NULL, \\' config/Project +sed -i '473a "share",NULL,"root",NULL,NULL, \\' config/Project +sed -i '476c "ncarg",NULL,"share",NULL,NULL, \\' config/Project + +#config/ymake line+6 +sed -i '374c case ppc*:' config/ymake +sed -i '381c case aarch64:' config/ymake +sed -i '384c set sysincs = LINUX' config/ymake +sed -i '385c set vendor = ARM' config/ymake +sed -i '374a case s390*:' config/ymake +sed -i '375a case sparc*:' config/ymake + +#ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "19c parameter (ARGBMASK = INT(Z'40000000'))" ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "20c parameter (RMASK = INT(Z'00FF0000'))" ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "21c parameter (GMASK = INT(Z'0000FF00'))" ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "22c parameter (BMASK = INT(Z'000000FF'))" ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "34c r = (iand(index, RMASK) / INT(Z'0000FFFF')) / 255." ncarg2d/src/libncarg_gks/bwi/argb2ci.f +sed -i "35c g = (iand(index, GMASK) / INT(Z'000000FF')) / 255." ncarg2d/src/libncarg_gks/bwi/argb2ci.f + +#ni/src/lib/nfp/ripW.c +sed -i "536c fputs(errmsg, stderr);" ni/src/lib/nfp/ripW.c +sed -i "1083c fputs(errmsg, stderr);" ni/src/lib/nfp/ripW.c + +#ni/src/lib/nfp/wrfW.c +sed -i "1517c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c +sed -i "9224c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c +sed -i "9870c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c +sed -i "10532c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c +sed -i "11235c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c +sed -i "13623c fputs(errmsg, stderr);" ni/src/lib/nfp/wrfW.c + +#ni/src/lib/nfp/wrf_vinterpW.c +sed -i "822c fputs(errmsg, stderr);" ni/src/lib/nfp/wrf_vinterpW.c + +#ni/src/ncl/yMakefile--vim ncl-gdal.patch +sed -i '201c # EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(SPHERELIB) $(FFTPACK5LIB) -fast -xlic_lib=sunperf -lnsl -lintl -lsocket -ldl -lw -lfui' ni/src/ncl/yMakefile +sed -i '202c EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lnsl -lintl -lsocket -ldl -lw' ni/src/ncl/yMakefile +sed -i '204c EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lxlf90 -lxlopt' ni/src/ncl/yMakefile +sed -i '206c EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)' ni/src/ncl/yMakefile +sed -i '208c EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)' ni/src/ncl/yMakefile + +#ncarview/src/bin/ictrans/yMakefile +sed -i "31a #else\nMORE_LIBS = -lm" ncarview/src/bin/ictrans/yMakefile + +##################################END######################################## + +./Configure -v + + +make Everything +make all install -- Gitee From 07c4f35d84ac1cb343e23447474d457b853d8e21 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 15 Mar 2023 14:02:52 +0800 Subject: [PATCH 17/55] add package/ncl/6.6.2/install.sh --- package/hdf5/1.12.0/clang/install.sh | 6 +++++- package/ncl/6.6.2/install.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 package/hdf5/1.12.0/clang/install.sh diff --git a/package/hdf5/1.12.0/clang/install.sh b/package/hdf5/1.12.0/clang/install.sh old mode 100644 new mode 100755 index e2c3200..715306a --- a/package/hdf5/1.12.0/clang/install.sh +++ b/package/hdf5/1.12.0/clang/install.sh @@ -2,13 +2,17 @@ set -x set -e hdf5_big_version='1.12' -hdf5_version='${hdf5_big_version}.0' +hdf5_version="${hdf5_big_version}.0" . ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${hdf5_big_version}/hdf5-${hdf5_version}/src/hdf5-${hdf5_version}.tar.gz cd ${JARVIS_TMP} rm -rf hdf5-${hdf5_version} tar -xvf ${JARVIS_DOWNLOAD}/hdf5-${hdf5_version}.tar.gz cd hdf5-${hdf5_version} +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 + +#./configure --prefix=$1 --with-zlib=/usr/lib --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 diff --git a/package/ncl/6.6.2/install.sh b/package/ncl/6.6.2/install.sh index 8b032e0..a4701d5 100755 --- a/package/ncl/6.6.2/install.sh +++ b/package/ncl/6.6.2/install.sh @@ -118,7 +118,7 @@ sed -i '46c .fc: $(FONTC)' common/src/fontcap/yMakefile sed -i '9a InstallTarget($(SCRIPTS1),$(INSTALL_BIN),$(BINPATH))' ni/src/scripts/yMakefile sed -i '10a InstallTarget($(SCRIPTS2),$(INSTALL_BIN),$(BINPATH))' ni/src/scripts/yMakefile sed -i '11a CleanFilesTarget($(SCRIPTS1))' ni/src/scripts/yMakefile -sed -i '12a InstallManPages($(MAN1),$(FORMAT_EXT),$(MAN1PATH),$(MAN1_SECTION))'ni/src/scripts/yMakefile +sed -i '12a InstallManPages($(MAN1),$(FORMAT_EXT),$(MAN1PATH),$(MAN1_SECTION))' ni/src/scripts/yMakefile sed -i '13a FormatManPages($(MAN1),.m,.p)' ni/src/scripts/yMakefile sed -i '79,83d' ni/src/scripts/yMakefile -- Gitee From 9d588d2d005eab0ce3d7c4aef70708db35b104c8 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 17:19:21 +0800 Subject: [PATCH 18/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 56 +++++++++++++++------ 1 file changed, 41 insertions(+), 15 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..e64d99b 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -1,16 +1,16 @@ [SERVER] 11.11.11.11 -[DOWNLOAD] -NCL/6.6.2 https://rpmfind.net/linux/epel/8/Everything/aarch64/Packages/n/ncl-6.6.2-12.el8.aarch64.rpm +[DOWANLOAD] +NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Packages/n/ncl-6.6.2-12.el8.src.rpm + [DEPENDENCY] set -e set -x module purge -sed -i '1a export bisheng_ver='bisheng-compiler-2.3.0'' package/bisheng/2.3.0/install.sh -./jarvis -install kgcc/10.3.1 com -./jarvis -install bisheng/2.3.0 com +./jarvis -install package/kgcc/10.3.1 com +./jarvis -install package/bisheng/2.3.0 com module use ./software/modulefiles module load bisheng/2.3.0 CC=`which clang` @@ -53,8 +53,8 @@ ln -s -f ${NETCDF_PATH}/lib/libnetcdf.so.18 ${NETCDF_PATH}/lib/libnetcdf.so.15 module load hdf5/1.12.0 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 @@ -87,10 +87,9 @@ 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/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 @@ -110,11 +109,38 @@ case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin [BUILD] cd ${JARVIS_TMP} -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 +rm -rf ncl_6.6.2 +mkdir ncl_6.6.2 +cd ncl_6.6.2 + +rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.src.rpm | cpio -div + +sed -i "20a + case aarch64:" ncl-5.1.0-ppc64.patch +sed -i '21a + set model = $mach' ncl-5.1.0-ppc64.patch +sed -i '22a + set arch = $mach' ncl-5.1.0-ppc64.patch +sed -i "23a + set sysincs = LINUX" ncl-5.1.0-ppc64.patch +sed -i "24a + set vendor = ARM" ncl-5.1.0-ppc64.patch +sed -i "25a + breaksw" ncl-5.1.0-ppc64.patch +sed -i '3c @@ -372,19 +372,19 @@' ncl-5.1.0-ppc64.patch + +sed -i "9,10d" ncl-5.2.1-secondary.patch +sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch + +cat << EOF > ~/.rpmmacros +$a%_topdir %(echo $PWD) +EOF + +mkdir -p $PWD/{BUILD,RPMS,SOURCES,SPECS,SRPMS} +cp ncl-6.6.2.tar.gz SOURCES/ +cp *.patch SOURCES/ +cp Site.local.ncl SOURCES/ +cp ncarg.csh SOURCES/ +cp ncarg.sh SOURCES/ +rpmbuild -ba ncl.spec + +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-6.6.2-12.el8.aarch64.rpm | cpio -div + +cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin export NCARG_ROOT=${binary_dir} -- Gitee From 03e1bb3781fb0236fcebaf3ef81b3051a3fd2521 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 17:48:30 +0800 Subject: [PATCH 19/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e64d99b..3fcc70d 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -139,6 +139,14 @@ cp ncarg.sh SOURCES/ rpmbuild -ba ncl.spec rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-6.6.2-12.el8.aarch64.rpm | cpio -div +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-debuginfo-6.6.2-12.el8.aarch64.rpm |cpio -div +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-debugsource-6.6.2-12.el8.aarch64.rpm | cpio -div +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-devel-6.6.2-12.el8.aarch64.rpm | cpio -div +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-devel-debuginfo-6.6.2-12.el8.aarch64.rpm | cpio -div + +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-common-6.6.2-12.el8.noarch.rpm | cpio -div +rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-examples-6.6.2-12.el8.noarch.rpm | cpio -div + cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin -- Gitee From 0a6d70f1bbcd278c638fd3409dd76fbbc7b3214b Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 19:46:39 +0800 Subject: [PATCH 20/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- package/hdf5/1.12.0/install.sh | 0 templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 package/hdf5/1.12.0/install.sh diff --git a/package/hdf5/1.12.0/install.sh b/package/hdf5/1.12.0/install.sh old mode 100644 new mode 100755 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 3fcc70d..ac4953e 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 c978b32f7fccf5fc0d2e1270320748a7f252b1c2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 21:19:27 +0800 Subject: [PATCH 21/55] fix package/gdal/2.2.4/install.sh --- package/gdal/2.2.4/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/gdal/2.2.4/install.sh b/package/gdal/2.2.4/install.sh index b8b32c2..769eac5 100755 --- a/package/gdal/2.2.4/install.sh +++ b/package/gdal/2.2.4/install.sh @@ -3,14 +3,15 @@ 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 ./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 -make all install \ No newline at end of file +make all install -- Gitee From 66d103a985bbeec0c10de8e1818894065ff64bd9 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 21:31:24 +0800 Subject: [PATCH 22/55] fix container/ncl/data.NCL.arm.cpu.config.def --- container/ncl/data.NCL.arm.cpu.config.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index 16c01d7..6ce7551 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -8,14 +8,14 @@ From: openeuler/openeuler:20.03 %post # Install the necessary development environment - yum install -y environment-modules git dmidecode pciutils wget vim + yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel freetype freetype-devel freetype-demos python-freetype ftgl ftgl-devel udunits2 udunits2-devel # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package yum install -y tcsh tcl lsof tk bc source /etc/profile || true git config --global http.sslVerify false - git clone https://gitee.com/openeuler/hpcrunner + git clone https://gitee.com/chenshaoheng/hpcrunner cd hpcrunner source ./init.sh # add your personal files here -- Gitee From 62939c09b739c18b0fe0a0b07755f9a968ae8d75 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 16 Mar 2023 21:52:00 +0800 Subject: [PATCH 23/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- 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 ac4953e..92b60cc 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -1,7 +1,7 @@ [SERVER] 11.11.11.11 -[DOWANLOAD] +[DOWNLOAD] NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Packages/n/ncl-6.6.2-12.el8.src.rpm -- Gitee From 3cd70d58bced73c9b1044e1a2e5e5272492a6c29 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 17 Mar 2023 09:19:12 +0800 Subject: [PATCH 24/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- 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 92b60cc..1852a6c 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 hdf5/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.2 bisheng -- Gitee From 62808128d7e692c6f09236bb1e6e94f07822edee Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 17 Mar 2023 15:09:26 +0800 Subject: [PATCH 25/55] fix templates/ncl/6.6.2/data.NCL.arm.cpu.config --- 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 1852a6c..5412d72 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -103,7 +103,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/l [APP] app_name = NCL -build_dir = ${JARVIS_TMP}/ncl_ncarg-6.6.2 +build_dir = ${JARVIS_TMP}/ncl_6.6.2 binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin -- Gitee From 9535d369b8f43320ecd1d5713e0fb2ef13487dda Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 17 Mar 2023 16:52:07 +0800 Subject: [PATCH 26/55] fix ncl --- 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 5412d72..cdae12d 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/4.2.13 +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.2 bisheng -- Gitee From 76967f026c3b50162fac714459ef33f738aea61b Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 17 Mar 2023 17:08:04 +0800 Subject: [PATCH 27/55] fix ncl_szip --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 ++ 1 file changed, 2 insertions(+) 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 cdae12d..7ea4a68 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -32,6 +32,8 @@ CC=`which mpicc` ./jarvis -install pnetcdf/1.12.1 bisheng module load pnetcdf/1.12.1 sed -i '9c ./configure --prefix=$1 --enable-netcdf-4 --disable-shared' package/szip/2.1.1/install.sh +./jarvis -install package/szip/2.1.1 bisheng +module add szip/2.1.1 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 -- Gitee From 7f5d36ecda638c36c8d844f951b6419a94bc6825 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 17 Mar 2023 18:09:15 +0800 Subject: [PATCH 28/55] fix ncl --- 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 7ea4a68..ef43e0b 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -150,7 +150,7 @@ rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-common-6.6.2-12.el8.noarch.rpm rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-examples-6.6.2-12.el8.noarch.rpm | cpio -div -cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl +cp -r ${JARVIS_TMP}/ncl_6.6.2/BUILDROOT/ncl-6.6.2-12.el8.aarch64/usr ${JARVIS_LIBS}/bisheng2.3.0/ncl export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin export NCARG_ROOT=${binary_dir} -- Gitee From 72806befa2450b8d721ac9ec5cc4fb2877aa4ea0 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 21 Mar 2023 14:13:12 +0800 Subject: [PATCH 29/55] fix ncl yum install --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 60 ++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 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 ef43e0b..987f441 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -100,7 +100,9 @@ module load kgcc/10.3.1 export CC=`which mpicc` export F77=`which mpif77` export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib:${JARVIS_LIBS}/bisheng2.3.0/libjpeg/v9b/lib:${JARVIS_LIBS}/bisheng2.3.0/gsl/2.6/lib - +export CPPFLAGS=" -g -fsigned-char "$CPPFLAGS +export CFLAGS=" -g -fsigned-char "$CFLAGS +export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS [APP] @@ -115,8 +117,35 @@ rm -rf ncl_6.6.2 mkdir ncl_6.6.2 cd ncl_6.6.2 +cd /etc/yum.repos.d/ +mkdir backup +cp *.repo backup/ +cd - +sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-AppStream.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-AppStream.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Base.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Base.repo +sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-centosplus.repo +sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-centosplus.repo +sed -i '19 s/^/#/' /etc/yum.repos.d/CentOS-CR.repo +sed -i '20 s/^#//' /etc/yum.repos.d/CentOS-CR.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Devel.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Devel.repo +sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-Extras.repo +sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-Extras.repo +sed -i '5 s/^/#/' /etc/yum.repos.d/CentOS-fasttrack.repo +sed -i '6 s/^#//' /etc/yum.repos.d/CentOS-fasttrack.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-HA.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-HA.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo + + rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.src.rpm | cpio -div + + sed -i "20a + case aarch64:" ncl-5.1.0-ppc64.patch sed -i '21a + set model = $mach' ncl-5.1.0-ppc64.patch sed -i '22a + set arch = $mach' ncl-5.1.0-ppc64.patch @@ -134,11 +163,38 @@ EOF mkdir -p $PWD/{BUILD,RPMS,SOURCES,SPECS,SRPMS} cp ncl-6.6.2.tar.gz SOURCES/ +cd SOURCES/ +tar -zxvf ncl-6.6.2.tar.gz +sed -i '61c EXCSRCS = bcopyswap.c logic32.c' ncl-6.6.2/common/src/libncarg_c/yMakefile +sed -i '62c EXFSRCS = gbytes.f sbytes.f' ncl-6.6.2/common/src/libncarg_c/yMakefile +sed -i '62a EXOBJS = bcopyswap.o sbytes.o gbytes.o logic32.o' ncl-6.6.2/common/src/libncarg_c/yMakefile + +sed -i '32c #define LibSearchUser -L/usr/X11R6/lib64 -L/usr/lib64' ncl-6.6.2/config/LINUX +sed -i '33c #define IncSearchUser -I/usr/X11R6/include -I/usr/include' ncl-6.6.2/config/LINUX +sed -i '35c #define ArchRecLibSearch -L/usr/X11R6/lib64 -L/usr/lib64' ncl-6.6.2/config/LINUX +sed -i '36c #define ArchRecIncSearch -I/usr/X11R6/include -I/usr/include' ncl-6.6.2/config/LINUX + +sed -i "9660c IF ((CEX1(1:1).EQ.' ') .AND. (LCX1 .EQ. 1)) LCX1=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9662c IF ((CEX2(1:1).EQ.' ') .AND. (LCX2 .EQ. 1)) LCX2=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9791c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran + +sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ncl-6.6.2/ni/src/ncl/yMakefile + +rm -rf ncl-6.6.2.tar.gz +tar -zcvf ncl-6.6.2.tar.gz ncl-6.6.2 +rm -rf ncl-6.6.2 +cd .. + cp *.patch SOURCES/ cp Site.local.ncl SOURCES/ cp ncarg.csh SOURCES/ cp ncarg.sh SOURCES/ +cp ncl.spec SPECS/ +cd SPECS/ rpmbuild -ba ncl.spec +cd .. + rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-6.6.2-12.el8.aarch64.rpm | cpio -div rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-debuginfo-6.6.2-12.el8.aarch64.rpm |cpio -div @@ -150,7 +206,7 @@ rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-common-6.6.2-12.el8.noarch.rpm rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-examples-6.6.2-12.el8.noarch.rpm | cpio -div -cp -r ${JARVIS_TMP}/ncl_6.6.2/BUILDROOT/ncl-6.6.2-12.el8.aarch64/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} -- Gitee From 7cadd12efa0785005631e953cebb9796f7afdc3f Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 21 Mar 2023 20:10:51 +0800 Subject: [PATCH 30/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 134 ++++---------------- 1 file changed, 26 insertions(+), 108 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 987f441..9ebe7d7 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -9,118 +9,12 @@ NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Pa set -e set -x module purge -./jarvis -install package/kgcc/10.3.1 com -./jarvis -install package/bisheng/2.3.0 com +./jarvis -install bisheng/2.3.0 com module use ./software/modulefiles module load bisheng/2.3.0 -CC=`which clang` -CXX=`which clang++` -FC=`which flang` -sed -i '9c ./configure --prefix=$1 CFLAGS="-fPIC"' package/libjpeg/v9b/install.sh -./jarvis -install libjpeg/v9b bisheng -./jarvis -install hmpi/1.2.0 bisheng -module load libjpeg/v9b - -module load hmpi/1.2.0 - - - - - -CC=`which mpicc` - -./jarvis -install pnetcdf/1.12.1 bisheng -module load pnetcdf/1.12.1 -sed -i '9c ./configure --prefix=$1 --enable-netcdf-4 --disable-shared' package/szip/2.1.1/install.sh -./jarvis -install package/szip/2.1.1 bisheng -module add szip/2.1.1 - - -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 - -export CC=`which clang` -export CXX=`which clang++` -export FC=`which flang` -module load hdf5/1.12.0 - -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 -ln -s -f ${NETCDF_PATH}/lib/libnetcdf.so.18 ${NETCDF_PATH}/lib/libnetcdf.so.15 -./jarvis -install hdf4/4.2.13 bisheng - - -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.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 -./jarvis -install gdal/2.2.4 bisheng -module load gdal/2.2.4 -module load proj/5.2.0 -ln -s -f ${GDAL_PATH}/lib/libgdal.so.20.3.3 ${GDAL_PATH}/lib/libgdal.so.26 -ln -s -f ${PROJ_PATH}/lib/libproj.so ${PROJ_PATH}/lib/libproj.so.15 - -export CC=`which clang` -export CXX=`which clang++` -export FC=`which flang` - -./jarvis -install udunits/2.2.28 bisheng -./jarvis -install gsl/2.6 bisheng -module load gsl/2.6 -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 - - - - -[ENV] -module purge -module use ./software/modulefiles - -module load bisheng/2.3.0 -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/4.2.13 -module load gsl/2.6 -module load jasper/1.900.2 -module load proj/5.2.0 -module load gdal/2.2.4 -module load udunits/2.2.28 -module load openblas/0.3.18 -module load kgcc/10.3.1 -export CC=`which mpicc` -export F77=`which mpif77` -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JARVIS_LIBS}/bisheng2.3.0/szip/2.1.1/lib:${JARVIS_LIBS}/bisheng2.3.0/libjpeg/v9b/lib:${JARVIS_LIBS}/bisheng2.3.0/gsl/2.6/lib -export CPPFLAGS=" -g -fsigned-char "$CPPFLAGS -export CFLAGS=" -g -fsigned-char "$CFLAGS -export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS - - -[APP] -app_name = NCL -build_dir = ${JARVIS_TMP}/ncl_6.6.2 -binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin -case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin - -[BUILD] -cd ${JARVIS_TMP} -rm -rf ncl_6.6.2 -mkdir ncl_6.6.2 -cd ncl_6.6.2 - cd /etc/yum.repos.d/ mkdir backup cp *.repo backup/ -cd - sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-AppStream.repo sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-AppStream.repo @@ -140,11 +34,35 @@ sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-HA.repo sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-HA.repo sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo +sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo +yum install -y epel-release -rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.src.rpm | cpio -div +yum clean all && yum makecache +yum install -y zlib zlib-devel rpm rpm-build rpmdevtools gzip expat expat-devel byacc cairo-devel tcsh gsl-devel imake libXaw-devel libjpeg-devel openblas-devel g2clib-static gdal-devel hdf-devel hdf-static netcdf-fortran-devel proj-devel udunits2-devel + + +[ENV] +module purge + +export CPPFLAGS=" -g -fsigned-char "$CPPFLAGS +export CFLAGS=" -g -fsigned-char "$CFLAGS +export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS + + +[APP] +app_name = NCL +build_dir = ${JARVIS_TMP}/ncl_6.6.2 +binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin +case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin +[BUILD] +cd ${JARVIS_TMP} +rm -rf ncl_6.6.2 +mkdir ncl_6.6.2 +cd ncl_6.6.2 +rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.src.rpm | cpio -div sed -i "20a + case aarch64:" ncl-5.1.0-ppc64.patch sed -i '21a + set model = $mach' ncl-5.1.0-ppc64.patch -- Gitee From c1892be8cbe14eb2529ce0f3ebf0a8f37fb3f4b0 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Tue, 21 Mar 2023 21:07:59 +0800 Subject: [PATCH 31/55] fix container ncl --- container/ncl/data.NCL.arm.cpu.config.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index 6ce7551..c7faa32 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -8,11 +8,11 @@ From: openeuler/openeuler:20.03 %post # Install the necessary development environment - yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel freetype freetype-devel freetype-demos python-freetype ftgl ftgl-devel udunits2 udunits2-devel + yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package - yum install -y tcsh tcl lsof tk bc + yum install -y tcsh tcl lsof tk bc tar source /etc/profile || true git config --global http.sslVerify false git clone https://gitee.com/chenshaoheng/hpcrunner -- Gitee From 6e346ba9f48432a114e3359b03545c75317df4bc Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 09:02:54 +0800 Subject: [PATCH 32/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 9ebe7d7..ba5568f 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -39,8 +39,7 @@ sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum install -y epel-release yum clean all && yum makecache -yum install -y zlib zlib-devel rpm rpm-build rpmdevtools gzip expat expat-devel byacc cairo-devel tcsh gsl-devel imake libXaw-devel libjpeg-devel openblas-devel g2clib-static gdal-devel hdf-devel hdf-static netcdf-fortran-devel proj-devel udunits2-devel - +yum install -y zlib zlib-devel rpm rpm-build rpmdevtools gzip expat expat-devel byacc cairo-devel tcsh gsl-devel imake libXaw-devel libjpeg-devel openblas-devel g2clib-static gdal-devel hdf-devel hdf-static netcdf-fortran-devel proj-devel udunits2-devel flex gcc-c++ make [ENV] module purge @@ -53,8 +52,8 @@ export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS [APP] app_name = NCL build_dir = ${JARVIS_TMP}/ncl_6.6.2 -binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin -case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/bin +binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin +case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin [BUILD] cd ${JARVIS_TMP} @@ -125,10 +124,10 @@ rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-examples-6.6.2-12.el8.noarch.rp cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl -export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/bin +export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/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/usr/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl/usr && export NCARG_COLORMAPS=$NCARG_ROOT/lib64/ncarg/colormaps && ncl -Q binary = nodes = 1 -- Gitee From c069d99cba1283711a532d7228c4be9d1ee9d7ae Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 10:06:52 +0800 Subject: [PATCH 33/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 22 +++++---------------- 1 file changed, 5 insertions(+), 17 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 ba5568f..86dfb44 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -9,9 +9,6 @@ NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Pa set -e set -x module purge -./jarvis -install bisheng/2.3.0 com -module use ./software/modulefiles -module load bisheng/2.3.0 cd /etc/yum.repos.d/ mkdir backup cp *.repo backup/ @@ -102,7 +99,6 @@ rm -rf ncl-6.6.2.tar.gz tar -zcvf ncl-6.6.2.tar.gz ncl-6.6.2 rm -rf ncl-6.6.2 cd .. - cp *.patch SOURCES/ cp Site.local.ncl SOURCES/ cp ncarg.csh SOURCES/ @@ -112,22 +108,14 @@ cd SPECS/ rpmbuild -ba ncl.spec cd .. - -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-6.6.2-12.el8.aarch64.rpm | cpio -div -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-debuginfo-6.6.2-12.el8.aarch64.rpm |cpio -div -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-debugsource-6.6.2-12.el8.aarch64.rpm | cpio -div -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-devel-6.6.2-12.el8.aarch64.rpm | cpio -div -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/aarch64/ncl-devel-debuginfo-6.6.2-12.el8.aarch64.rpm | cpio -div - -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-common-6.6.2-12.el8.noarch.rpm | cpio -div -rpm2cpio ${JARVIS_TMP}/ncl_6.6.2/RPMS/noarch/ncl-examples-6.6.2-12.el8.noarch.rpm | cpio -div +cd ${JARVIS_TMP}/ncl_6.6.2/RPMS +cp noarch/* aarch64/ +cd aarch64 +yum localinstall ncl-6.6.2-12.el8.aarch64.rpm ncl-common-6.6.2-12.el8.noarch.rpm ncl-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-devel-6.6.2-12.el8.aarch64.rpm ncl-examples-6.6.2-12.el8.noarch.rpm -y -cp -r usr ${JARVIS_LIBS}/bisheng2.3.0/ncl -export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin -export NCARG_ROOT=${binary_dir} [RUN] -run = export PATH=$PATH:${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin && export NCARG_ROOT=${JARVIS_LIBS}/bisheng2.3.0/ncl/usr && export NCARG_COLORMAPS=$NCARG_ROOT/lib64/ncarg/colormaps && ncl -Q +run = export NCARG_FONTCAPS=/usr/lib64/ncarg/fontcaps && export NCARG_GRAPHCAPS=/usr/lib64/ncarg/graphcaps && export NCARG_ROOT=/usr && export NCARG_DATABASE=/usr/lib64/ncarg/database && export NCARG_LIB=/usr/lib64/ncarg && export NCARG_NCARG=/usr/share/ncarg && ncl -Q binary = nodes = 1 -- Gitee From a4a07e6147156a6eb799e1a2284a6acd6baf2794 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 11:52:34 +0800 Subject: [PATCH 34/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index c7faa32..f849acf 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -1,5 +1,5 @@ BootStrap: docker -From: openeuler/openeuler:20.03 +From: centos:8.2.2004 %environment source /etc/profile || true -- Gitee From 7a8499dd646c1fb84764d533fa013018d3df9640 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 15:07:27 +0800 Subject: [PATCH 35/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 28 ++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index f849acf..b6f2a68 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -7,8 +7,34 @@ From: centos:8.2.2004 source env.sh %post + #yum fix + cd /etc/yum.repo.d/ + mkdir backup + cp *.repo backup/ + sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* + sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-AppStream.repo + sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-AppStream.repo + sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Base.repo + sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Base.repo + sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-centosplus.repo + sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-centosplus.repo + sed -i '19 s/^/#/' /etc/yum.repos.d/CentOS-CR.repo + sed -i '20 s/^#//' /etc/yum.repos.d/CentOS-CR.repo + sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Devel.repo + sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Devel.repo + sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-Extras.repo + sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-Extras.repo + sed -i '5 s/^/#/' /etc/yum.repos.d/CentOS-fasttrack.repo + sed -i '6 s/^#//' /etc/yum.repos.d/CentOS-fasttrack.repo + sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-HA.repo + sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-HA.repo + sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo + sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo + sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo + yum install -y epel-release + cd / # Install the necessary development environment - yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel + yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel python3 # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package -- Gitee From 5418d2241a68ad7220e61c304ac66f5a57a001af Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 15:20:05 +0800 Subject: [PATCH 36/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 31 ++------------------- 1 file changed, 2 insertions(+), 29 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 86dfb44..f8128b9 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -9,33 +9,6 @@ NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Pa set -e set -x module purge -cd /etc/yum.repos.d/ -mkdir backup -cp *.repo backup/ -sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* -sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-AppStream.repo -sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-AppStream.repo -sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Base.repo -sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Base.repo -sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-centosplus.repo -sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-centosplus.repo -sed -i '19 s/^/#/' /etc/yum.repos.d/CentOS-CR.repo -sed -i '20 s/^#//' /etc/yum.repos.d/CentOS-CR.repo -sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Devel.repo -sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Devel.repo -sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-Extras.repo -sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-Extras.repo -sed -i '5 s/^/#/' /etc/yum.repos.d/CentOS-fasttrack.repo -sed -i '6 s/^#//' /etc/yum.repos.d/CentOS-fasttrack.repo -sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-HA.repo -sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-HA.repo -sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo -sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo -sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo - -yum install -y epel-release - -yum clean all && yum makecache yum install -y zlib zlib-devel rpm rpm-build rpmdevtools gzip expat expat-devel byacc cairo-devel tcsh gsl-devel imake libXaw-devel libjpeg-devel openblas-devel g2clib-static gdal-devel hdf-devel hdf-static netcdf-fortran-devel proj-devel udunits2-devel flex gcc-c++ make [ENV] @@ -49,8 +22,8 @@ export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS [APP] app_name = NCL build_dir = ${JARVIS_TMP}/ncl_6.6.2 -binary_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin -case_dir = ${JARVIS_LIBS}/bisheng2.3.0/ncl/usr/bin +binary_dir = /usr/bin +case_dir = [BUILD] cd ${JARVIS_TMP} -- Gitee From c773a66106a199005bd15b0e525ecfda93bf034f Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 15:22:53 +0800 Subject: [PATCH 37/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 1 + 1 file changed, 1 insertion(+) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index b6f2a68..fa0206c 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -33,6 +33,7 @@ From: centos:8.2.2004 sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum install -y epel-release cd / + yum makecache # Install the necessary development environment yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel python3 # Install base gcc -- Gitee From 253a6ede4477a761ea4a11071e35509945865100 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 20:16:22 +0800 Subject: [PATCH 38/55] fix ncl --- 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 f8128b9..ee1f2de 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -9,7 +9,7 @@ NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Pa set -e set -x module purge -yum install -y zlib zlib-devel rpm rpm-build rpmdevtools gzip expat expat-devel byacc cairo-devel tcsh gsl-devel imake libXaw-devel libjpeg-devel openblas-devel g2clib-static gdal-devel hdf-devel hdf-static netcdf-fortran-devel proj-devel udunits2-devel flex gcc-c++ make +yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel [ENV] module purge -- Gitee From 12d3285c969dcaa30d2ba9563f01c31d437fac7b Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Wed, 22 Mar 2023 20:30:04 +0800 Subject: [PATCH 39/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 28 ++++++++++++++++++++- 1 file changed, 27 insertions(+), 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 ee1f2de..2a4d2ea 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -9,7 +9,33 @@ NCL/6.6.2 https://download-ib01.fedoraproject.org/pub/epel/8/Everything/SRPMS/Pa set -e set -x module purge -yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel +cd /etc/yum.repos.d/ +mkdir -p backup +cp *.repo backup/ +sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-AppStream.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-AppStream.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Base.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Base.repo +sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-centosplus.repo +sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-centosplus.repo +sed -i '19 s/^/#/' /etc/yum.repos.d/CentOS-CR.repo +sed -i '20 s/^#//' /etc/yum.repos.d/CentOS-CR.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-Devel.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-Devel.repo +sed -i '16 s/^/#/' /etc/yum.repos.d/CentOS-Extras.repo +sed -i '17 s/^#//' /etc/yum.repos.d/CentOS-Extras.repo +sed -i '5 s/^/#/' /etc/yum.repos.d/CentOS-fasttrack.repo +sed -i '6 s/^#//' /etc/yum.repos.d/CentOS-fasttrack.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-HA.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-HA.repo +sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo +sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo +sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo + +yum install -y epel-release +yum clean all && yum makecache +yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel byacc cairo-devel flex gsl-devel openblas-devel [ENV] module purge -- Gitee From daaabf2d3b4b4c7842e640dd25e2b5c524ecfd64 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 08:58:31 +0800 Subject: [PATCH 40/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 4 ++-- 1 file changed, 2 insertions(+), 2 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 2a4d2ea..f53e98b 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -33,8 +33,8 @@ sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo -yum install -y epel-release yum clean all && yum makecache +yum install -y epel-release yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel byacc cairo-devel flex gsl-devel openblas-devel [ENV] @@ -48,7 +48,7 @@ export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS [APP] app_name = NCL build_dir = ${JARVIS_TMP}/ncl_6.6.2 -binary_dir = /usr/bin +binary_dir =/usr/bin case_dir = [BUILD] -- Gitee From d42a1c0982cb1aca5635e815f787418320821a6c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 08:59:18 +0800 Subject: [PATCH 41/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index fa0206c..afa8a7a 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -8,7 +8,7 @@ From: centos:8.2.2004 %post #yum fix - cd /etc/yum.repo.d/ + cd /etc/yum.repos.d/ mkdir backup cp *.repo backup/ sed -i -e 's|$releasever|8-stream|g' /etc/yum.repos.d/CentOS-* @@ -31,15 +31,18 @@ From: centos:8.2.2004 sed -i '15 s/^/#/' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo + yum makecache + yum install -y rpm-build yum install -y epel-release + sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* cd / - yum makecache + yum install -y tar # Install the necessary development environment yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel python3 # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package - yum install -y tcsh tcl lsof tk bc tar + yum install -y tcsh tcl lsof tk bc source /etc/profile || true git config --global http.sslVerify false git clone https://gitee.com/chenshaoheng/hpcrunner -- Gitee From 4e69ea0ff38f243cb701c4bbb689163bc391bfa2 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 09:40:49 +0800 Subject: [PATCH 42/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index afa8a7a..60e6d6e 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -33,12 +33,11 @@ From: centos:8.2.2004 sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum makecache yum install -y rpm-build - yum install -y epel-release sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* cd / yum install -y tar # Install the necessary development environment - yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel python3 + yum install -y environment-modules git dmidecode pciutils wget vim zlib expat-devel python3 cpio # Install base gcc yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran # install network package -- Gitee From a4d536ca374fc0f2242cb99fed9a847bcb898b88 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 09:44:55 +0800 Subject: [PATCH 43/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 1 - 1 file changed, 1 deletion(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index 60e6d6e..d77fb0a 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -33,7 +33,6 @@ From: centos:8.2.2004 sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum makecache yum install -y rpm-build - sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* cd / yum install -y tar # Install the necessary development environment -- Gitee From 7afb83762570bd3e74c4bd0853f99ed194451ecf Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 09:45:56 +0800 Subject: [PATCH 44/55] fix ncl config --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 ++ 1 file changed, 2 insertions(+) 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 f53e98b..8c2f9fe 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -35,8 +35,10 @@ sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum clean all && yum makecache yum install -y epel-release +sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel byacc cairo-devel flex gsl-devel openblas-devel + [ENV] module purge -- Gitee From 1d06f49bf9f65acb1c049aa2bb8d143eddf89fe3 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 11:51:05 +0800 Subject: [PATCH 45/55] fix ncl config --- 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 8c2f9fe..28dd5ee 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 @@ export CXXFLAGS=" -g -fsigned-char "$CXXFLAGS [APP] app_name = NCL build_dir = ${JARVIS_TMP}/ncl_6.6.2 -binary_dir =/usr/bin +binary_dir = case_dir = [BUILD] -- Gitee From 1e56195b4a462cf47f18fdad9a97472b22ade9ca Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 11:59:18 +0800 Subject: [PATCH 46/55] fix ncl .def --- container/ncl/data.NCL.arm.cpu.config.def | 2 -- 1 file changed, 2 deletions(-) diff --git a/container/ncl/data.NCL.arm.cpu.config.def b/container/ncl/data.NCL.arm.cpu.config.def index d77fb0a..bef1ba9 100644 --- a/container/ncl/data.NCL.arm.cpu.config.def +++ b/container/ncl/data.NCL.arm.cpu.config.def @@ -3,8 +3,6 @@ From: centos:8.2.2004 %environment source /etc/profile || true - cd /hpcrunner - source env.sh %post #yum fix -- Gitee From a49d71d1bfcaf3bd176c2a53328f8ba68fc35428 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 16:51:50 +0800 Subject: [PATCH 47/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 53 +++++++++++---------- 1 file changed, 28 insertions(+), 25 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 28dd5ee..7b91535 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -38,6 +38,8 @@ yum install -y epel-release sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel byacc cairo-devel flex gsl-devel openblas-devel +yum -y install xorg-x11-xauth xorg-x11-server-utils xorg-x11-server-Xnest libXtst + [ENV] module purge @@ -58,28 +60,16 @@ cd ${JARVIS_TMP} rm -rf ncl_6.6.2 mkdir ncl_6.6.2 cd ncl_6.6.2 - +#unzip src.rpm PWD rpm2cpio ${JARVIS_DOWNLOAD}/ncl-6.6.2-12.el8.src.rpm | cpio -div -sed -i "20a + case aarch64:" ncl-5.1.0-ppc64.patch -sed -i '21a + set model = $mach' ncl-5.1.0-ppc64.patch -sed -i '22a + set arch = $mach' ncl-5.1.0-ppc64.patch -sed -i "23a + set sysincs = LINUX" ncl-5.1.0-ppc64.patch -sed -i "24a + set vendor = ARM" ncl-5.1.0-ppc64.patch -sed -i "25a + breaksw" ncl-5.1.0-ppc64.patch -sed -i '3c @@ -372,19 +372,19 @@' ncl-5.1.0-ppc64.patch - -sed -i "9,10d" ncl-5.2.1-secondary.patch -sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch - cat << EOF > ~/.rpmmacros $a%_topdir %(echo $PWD) EOF - mkdir -p $PWD/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -cp ncl-6.6.2.tar.gz SOURCES/ -cd SOURCES/ -tar -zxvf ncl-6.6.2.tar.gz + +#fix tar.gz +tar zxvf ncl-6.6.2.tar.gz sed -i '61c EXCSRCS = bcopyswap.c logic32.c' ncl-6.6.2/common/src/libncarg_c/yMakefile sed -i '62c EXFSRCS = gbytes.f sbytes.f' ncl-6.6.2/common/src/libncarg_c/yMakefile sed -i '62a EXOBJS = bcopyswap.o sbytes.o gbytes.o logic32.o' ncl-6.6.2/common/src/libncarg_c/yMakefile @@ -97,19 +87,32 @@ sed -i "9791c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ncl-6.6.2/ni/src/ncl/yMakefile rm -rf ncl-6.6.2.tar.gz -tar -zcvf ncl-6.6.2.tar.gz ncl-6.6.2 +tar zcvf ncl-6.6.2.tar.gz ncl-6.6.2 rm -rf ncl-6.6.2 -cd .. -cp *.patch SOURCES/ -cp Site.local.ncl SOURCES/ -cp ncarg.csh SOURCES/ -cp ncarg.sh SOURCES/ -cp ncl.spec SPECS/ +#fix patch +sed -i "20a + case aarch64:" ncl-5.1.0-ppc64.patch +sed -i '21a + set model = $mach' ncl-5.1.0-ppc64.patch +sed -i '22a + set arch = $mach' ncl-5.1.0-ppc64.patch +sed -i "23a + set sysincs = LINUX" ncl-5.1.0-ppc64.patch +sed -i "24a + set vendor = ARM" ncl-5.1.0-ppc64.patch +sed -i "25a + breaksw" ncl-5.1.0-ppc64.patch +sed -i '3c @@ -372,19 +372,19 @@' ncl-5.1.0-ppc64.patch + +sed -i "9,10d" ncl-5.2.1-secondary.patch +sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch + +#mv file +mv ncl-6.6.2.tar.gz SOURCES/ +mv *.patch SOURCES/ +mv Site.local.ncl SOURCES/ +mv ncarg.csh SOURCES/ +mv ncarg.sh SOURCES/ +mv ncl.spec SPECS/ cd SPECS/ rpmbuild -ba ncl.spec -cd .. -cd ${JARVIS_TMP}/ncl_6.6.2/RPMS +#install rpm +cd ../RPMS cp noarch/* aarch64/ cd aarch64 yum localinstall ncl-6.6.2-12.el8.aarch64.rpm ncl-common-6.6.2-12.el8.noarch.rpm ncl-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-devel-6.6.2-12.el8.aarch64.rpm ncl-examples-6.6.2-12.el8.noarch.rpm -y -- Gitee From a03306a0f339ebbce477063204db438da61c131c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 19:15:59 +0800 Subject: [PATCH 48/55] fix ncl --- 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 7b91535..039b9b3 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -103,7 +103,7 @@ sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch #mv file mv ncl-6.6.2.tar.gz SOURCES/ -mv *.patch SOURCES/ +cp *.patch SOURCES/ mv Site.local.ncl SOURCES/ mv ncarg.csh SOURCES/ mv ncarg.sh SOURCES/ -- Gitee From ca5396b3ada75ddd76f2dd855db405fc0441cb9e Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 19:38:37 +0800 Subject: [PATCH 49/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 7b91535..db46732 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -34,12 +34,15 @@ sed -i '16 s/^#//' /etc/yum.repos.d/CentOS-PowerTools.repo sed -i '18c enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo yum clean all && yum makecache +yum remove epel-release -y yum install -y epel-release sed -i -e 's|$releasever|8|g' /etc/yum.repos.d/epel* yum install -y netcdf-fortran-devel hdf-static hdf-devel g2clib-static gdal-devel proj-devel imake libXaw-devel flex-static udunits2-devel byacc cairo-devel flex gsl-devel openblas-devel yum -y install xorg-x11-xauth xorg-x11-server-utils xorg-x11-server-Xnest libXtst - +yum install -y rpmbuild +yum install rpmdevtools -y +rpmdev-setuptree [ENV] module purge @@ -100,10 +103,12 @@ sed -i '3c @@ -372,19 +372,19 @@' ncl-5.1.0-ppc64.patch sed -i "9,10d" ncl-5.2.1-secondary.patch sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch +sed -i '8a + case arm*:' ncl-5.2.1-secondary.patch +sed -i '9a + case aarch64:' ncl-5.2.1-secondary.patch #mv file mv ncl-6.6.2.tar.gz SOURCES/ -mv *.patch SOURCES/ +cp *.patch SOURCES/ mv Site.local.ncl SOURCES/ mv ncarg.csh SOURCES/ mv ncarg.sh SOURCES/ @@ -115,7 +120,7 @@ rpmbuild -ba ncl.spec cd ../RPMS cp noarch/* aarch64/ cd aarch64 -yum localinstall ncl-6.6.2-12.el8.aarch64.rpm ncl-common-6.6.2-12.el8.noarch.rpm ncl-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-devel-6.6.2-12.el8.aarch64.rpm ncl-examples-6.6.2-12.el8.noarch.rpm -y +yum localinstall ncl-6.6.2-12.el8.aarch64.rpm ncl-common-6.6.2-12.el8.noarch.rpm ncl-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-debugsource-6.6.2-12.el8.aarch64.rpm ncl-devel-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-devel-6.6.2-12.el8.aarch64.rpm ncl-examples-6.6.2-12.el8.noarch.rpm -y -- Gitee From a796871a0bb8d2d084f9ebb6bcfcea44121fbabe Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 19:51:41 +0800 Subject: [PATCH 50/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 2 -- 1 file changed, 2 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 db46732..b6a862a 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -103,8 +103,6 @@ sed -i '3c @@ -372,19 +372,19 @@' ncl-5.1.0-ppc64.patch sed -i "9,10d" ncl-5.2.1-secondary.patch sed -i '3c @@ -373,6 +373,8 @@' ncl-5.2.1-secondary.patch -sed -i '8a + case arm*:' ncl-5.2.1-secondary.patch -sed -i '9a + case aarch64:' ncl-5.2.1-secondary.patch #mv file mv ncl-6.6.2.tar.gz SOURCES/ -- Gitee From 25cb8ddf0ce119690ef9e71627dd1faf05d4e8bb Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 19:58:54 +0800 Subject: [PATCH 51/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 3 +++ 1 file changed, 3 insertions(+) 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 b6a862a..1438ee9 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -85,6 +85,9 @@ sed -i '36c #define ArchRecIncSearch -I/usr/X11R6/include -I/usr/include' ncl sed -i "9660c IF ((CEX1(1:1).EQ.' ') .AND. (LCX1 .EQ. 1)) LCX1=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9662c IF ((CEX2(1:1).EQ.' ') .AND. (LCX2 .EQ. 1)) LCX2=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9969c DO (III=1,LBUF)" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9969a CBUF(III:III)=' '" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9970a END DO" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9791c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ncl-6.6.2/ni/src/ncl/yMakefile -- Gitee From 9d11de6467c4a64f2d27c69ee9d0d38e3ae1de8d Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 20:25:15 +0800 Subject: [PATCH 52/55] fix ncl --- templates/ncl/6.6.2/data.NCL.arm.cpu.config | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1438ee9..aa8ce7b 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -85,9 +85,9 @@ sed -i '36c #define ArchRecIncSearch -I/usr/X11R6/include -I/usr/include' ncl sed -i "9660c IF ((CEX1(1:1).EQ.' ') .AND. (LCX1 .EQ. 1)) LCX1=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9662c IF ((CEX2(1:1).EQ.' ') .AND. (LCX2 .EQ. 1)) LCX2=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran -sed -i "9969c DO (III=1,LBUF)" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran -sed -i "9969a CBUF(III:III)=' '" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran -sed -i "9970a END DO" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9669c DO (III=1,LBUF)" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9669a CBUF(III:III)=' '" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9670a END DO" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9791c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ncl-6.6.2/ni/src/ncl/yMakefile -- Gitee From 14e43aa5f97d5f518a0c82b55b1d16b5d752d8fa Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Thu, 23 Mar 2023 20:53:21 +0800 Subject: [PATCH 53/55] fix ncl --- 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 aa8ce7b..1f5394d 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -88,7 +88,7 @@ sed -i "9664c IF ((CEX3(1:1).EQ.' ') .AND. (LCX3 .EQ. 1)) LCX3=0" ncl-6.6.2/ncar sed -i "9669c DO (III=1,LBUF)" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9669a CBUF(III:III)=' '" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i "9670a END DO" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran -sed -i "9791c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran +sed -i "9793c CBUF(1:1)='0'" ncl-6.6.2/ncarg2d/src/libncarg/conpack/CodeIftran sed -i '46c EXTRA_CCOPTIONS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g -fsigned-char' ncl-6.6.2/ni/src/ncl/yMakefile -- Gitee From fbf69da1683e5e1f551574858f442d388685d8d8 Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 24 Mar 2023 09:06:40 +0800 Subject: [PATCH 54/55] fix nco --- 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 c0213ba..752e92b 100644 --- a/templates/nco/5.1.4/data.NCO.arm.cpu.config +++ b/templates/nco/5.1.4/data.NCO.arm.cpu.config @@ -23,7 +23,7 @@ CC=`which mpicc` module load hdf5-clang/1.12.0 ./jarvis -install hdf4/4.2.13 bisheng module load hdf4/4.2.13 -./jarvis -install hdf4/ bisheng +./jarvis -install hdf4/4.2.13 bisheng 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_CLANG_PATH}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_CLANG_PATH}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_CLANG_PATH}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_CLANG_PATH}/lib -L${PNETCDF_DIR}/lib -I${HDF5_CLANG_PATH}/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 096816e2b4d8166ca25187e5e7cf3fdbaf1a775c Mon Sep 17 00:00:00 2001 From: chenshaoheng Date: Fri, 24 Mar 2023 09:19:49 +0800 Subject: [PATCH 55/55] fix ncl --- 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 1f5394d..123de3a 100644 --- a/templates/ncl/6.6.2/data.NCL.arm.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm.cpu.config @@ -121,6 +121,7 @@ rpmbuild -ba ncl.spec cd ../RPMS cp noarch/* aarch64/ cd aarch64 +yum remove ncl -y yum localinstall ncl-6.6.2-12.el8.aarch64.rpm ncl-common-6.6.2-12.el8.noarch.rpm ncl-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-debugsource-6.6.2-12.el8.aarch64.rpm ncl-devel-debuginfo-6.6.2-12.el8.aarch64.rpm ncl-devel-6.6.2-12.el8.aarch64.rpm ncl-examples-6.6.2-12.el8.noarch.rpm -y -- Gitee