From b79037fb71991c6e71c13b0d983ef7c860d722b7 Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Fri, 10 Feb 2023 08:49:22 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20templates/qmcpack/3.13.0/data.qmcp?= =?UTF-8?q?ack.arm.cpu.config.=20=E6=9B=B4=E6=94=B9qmcpack=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=AE=89=E8=A3=85zlib=E7=89=88=E6=9C=AC=E4=B8=BA12=20?= =?UTF-8?q?=E5=9B=A0=E5=AE=89=E8=A3=85package/zlib=E5=86=85=E6=97=A01.2.11?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=94=E8=8E=B7=E5=8F=9611=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=BD=91=E5=9D=80=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config index a9bec6c..c14ee25 100644 --- a/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config +++ b/templates/qmcpack/3.13.0/data.qmcpack.arm.cpu.config @@ -19,8 +19,8 @@ module load cmake/3.23.1 ./jarvis -install openblas/0.3.18 clang ./jarvis -install boost/1.72.0/clang clang module load boost-clang/1.72.0 -./jarvis -install zlib/1.2.11 clang -module load zlib/1.2.11 +./jarvis -install zlib/1.2.12 clang +module load zlib/1.2.12 ./jarvis -install libxml2/2.10.1 clang module load libxml2/2.10.1 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort @@ -37,7 +37,7 @@ module use ${JARVIS_ROOT}/software/modulefiles module load bisheng/2.1.0 module load hmpi/1.1.1 module load cmake/3.23.1 openblas/0.3.18 libxml2/2.10.1 -module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.11 +module load hdf5-clang/1.10.1 fftw/3.3.8 zlib/1.2.12 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort [APP] @@ -51,7 +51,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${JARVIS_LIBS}/qmcpack-3.13.0 \ -DLIBXML2_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/libxml2/2.10.1/lib/libxml2.so \ --DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.11/lib/libz.so \ +-DZLIB_LIBRARY=${JARVIS_LIBS}/bisheng2.1.0/zlib/1.2.12/lib/libz.so \ -DFFTW_HOME=${JARVIS_LIBS}/bisheng2.1.0/hmpi1.1.1/fftw/3.3.8 \ -DBOOST_ROOT=${JARVIS_LIBS}/bisheng2.1.0/boost-clang/1.72.0 \ ../ -- Gitee From 2dd6f449f878b4aa002f39ca3001b2d3441c11a8 Mon Sep 17 00:00:00 2001 From: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> Date: Fri, 10 Feb 2023 09:59:45 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9zlib=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E8=AE=BF=E9=97=AE=E7=BD=91=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshaoheng <12344440+chenshaoheng@user.noreply.gitee.com> --- package/zlib/1.2.12/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zlib/1.2.12/install.sh b/package/zlib/1.2.12/install.sh index 3b77899..9e3c1c6 100644 --- a/package/zlib/1.2.12/install.sh +++ b/package/zlib/1.2.12/install.sh @@ -2,7 +2,7 @@ set -x set -e zlib_ver='1.2.12' -. ${DOWNLOAD_TOOL} -u https://zlib.net/zlib-${zlib_ver}.tar.gz +. ${DOWNLOAD_TOOL} -u https://zlib.net/fossils/zlib-${zlib_ver}.tar.gz cd ${JARVIS_TMP} rm -rf zlib-${zlib_ver} tar -xvf ${JARVIS_DOWNLOAD}/zlib-${zlib_ver}.tar.gz -- Gitee