diff --git a/package/hmpi/1.1.1/install.sh b/package/hmpi/1.1.1/install.sh index 5e4c152862083444a28436b3e821b0172d83c0f9..666258ee9e7323d87513421eb7b611d6cc3fc072 100755 --- a/package/hmpi/1.1.1/install.sh +++ b/package/hmpi/1.1.1/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -x set -e - +hmpi_version='1.1.1' if [[ $UseGitee -eq 1 ]]; then . ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/hucx-1.1.1-huawei.zip -f hucx-1.1.1-huawei.zip . ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/xucg-1.1.1-huawei.zip -f xucg-1.1.1-huawei.zip @@ -14,4 +14,21 @@ fi cd ${JARVIS_TMP} . $CHECK_ROOT && yum install -y perl-Data-Dumper autoconf automake libtool binutils flex -rm -rf hmpi-1.1.1-huawei hucx-1.1.1-huawei xucg-1.1.1-huawei \ No newline at end of file +rm -rf hmpi-${hmpi_version}-huawei hucx-${hmpi_version}-huawei xucg-${hmpi_version}-huawei +unzip ${JARVIS_DOWNLOAD}/hucx-${hmpi_version}-huawei.zip +unzip ${JARVIS_DOWNLOAD}/xucg-${hmpi_version}-huawei.zip +unzip ${JARVIS_DOWNLOAD}/hmpi-${hmpi_version}-huawei.zip +\cp -rf xucg-${hmpi_version}-huawei/* hucx-${hmpi_version}-huawei/src/ucg/ +sleep 3 +cd hucx-${hmpi_version}-huawei +./autogen.sh +./contrib/configure-opt --prefix=$1/hucx CFLAGS="-DHAVE___CLEAR_CACHE=1" --disable-numa --without-java +for file in `find . -name Makefile`;do sed -i "s/-Werror//g" $file;done +for file in `find . -name Makefile`;do sed -i "s/-implicit-function-declaration//g" $file;done +make -j64 +make install +cd ../hmpi-${hmpi_version}-huawei +./autogen.pl +./configure --prefix=$1 --with-platform=contrib/platform/mellanox/optimized --enable-mpi1-compatibility --with-ucx=$1/hucx +make -j64 +make install diff --git a/package/netcdf/4.7.0/install.sh b/package/netcdf/4.7.0/install.sh index 99c56aaf5c54bb93d97e21043bbf064297f42a4a..4c7f7e6181616d8805634ed2340323693856f9d1 100755 --- a/package/netcdf/4.7.0/install.sh +++ b/package/netcdf/4.7.0/install.sh @@ -23,7 +23,7 @@ export LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH export NETCDF=${1} cd ../netcdf-fortran-4.4.5 -./configure --prefix=$1 --build=aarch64-unknown-linux-gnu --enable-shared --with-pic --disable-doxygen --enable-largefile --enable-static CPPFLAGS="-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="-L${HDF5_DIR}/HDF5/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" CXXFLAGS="-L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" FCFLAGS="-L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" +./configure --prefix=$1 --build=aarch64-unknown-linux-gnu --enable-shared --with-pic --disable-doxygen --enable-largefile --enable-static CPPFLAGS="-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="-L${HDF5_DIR}/HDF5/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" CXXFLAGS="-L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" FCFLAGS="-fallow-argument-mismatch -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" sed -i '11838c wl="-Wl,"' libtool make -j16 make install diff --git a/package/netcdf/4.7.4/install.sh b/package/netcdf/4.7.4/install.sh index 4454ed13336288be99a4b2778e373a87be3d75b3..0ce1fd08c1dac265120c3dd0c904b566c5e24486 100755 --- a/package/netcdf/4.7.4/install.sh +++ b/package/netcdf/4.7.4/install.sh @@ -31,11 +31,11 @@ export LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH export NETCDF=${1} cd ../netcdf-fortran-${netcdf_f_version} -./configure --prefix=$1 ${build_type} --disable-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}/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" +./configure --prefix=$1 ${build_type} --disable-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}/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="-fallow-argument-mismatch -O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" make -j16 make install cd ../netcdf-cxx-${netcdf_cxx_version} -./configure --prefix=$1 ${build_type} --enable-shared --with-pic --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}/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" +./configure --prefix=$1 ${build_type} --enable-shared --with-pic --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}/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="-fallow-argument-mismatch -O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" make -j16 make install \ No newline at end of file diff --git a/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/install.sh index 61cd7540c08425544877d8773d3fa462b7fa8f62..e281cea50b61cd56f463e647c01552bee85c2a46 100755 --- a/package/pnetcdf/1.11.2/install.sh +++ b/package/pnetcdf/1.11.2/install.sh @@ -8,6 +8,6 @@ cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_ver}.tar.gz cd pnetcdf-${pnetcdf_ver} -./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test +./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" make -j16 make install diff --git a/package/pnetcdf/1.12.1/install.sh b/package/pnetcdf/1.12.1/install.sh index 1e79057980385dc552bb568f395bc3313f257d07..86deafa8bbc5d0837fb67b8a7848ede004833647 100755 --- a/package/pnetcdf/1.12.1/install.sh +++ b/package/pnetcdf/1.12.1/install.sh @@ -7,6 +7,6 @@ cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_version} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz cd pnetcdf-${pnetcdf_version} -./configure --prefix=$1 --build=aarch64-linux --enable-shared --enable-fortran --enable-large-file-test +./configure --prefix=$1 --build=aarch64-linux --enable-shared --enable-fortran --enable-large-file-test FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" make -j16 make install diff --git a/package/pnetcdf/1.12.3/install.sh b/package/pnetcdf/1.12.3/install.sh index 19e5c317b12e321703a963119218cef2b7f7c725..4ef2f59d7bc0a8776bdf48fd4a47e579008a23c9 100755 --- a/package/pnetcdf/1.12.3/install.sh +++ b/package/pnetcdf/1.12.3/install.sh @@ -6,6 +6,6 @@ pnetcdf_version='1.12.3' cd ${JARVIS_TMP} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz cd pnetcdf-${pnetcdf_version} -./configure --prefix=$1 --build=aarch64-linux --enable-shared --enable-fortran --enable-large-file-test CFLAGS="-fPIC -DPIC" CXXFLAGS="-fPIC -DPIC" FCFLAGS="-fPIC" FFLAGS="-fPIC" CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort +./configure --prefix=$1 --build=aarch64-linux --enable-shared --enable-fortran --enable-large-file-test CFLAGS="-fPIC -DPIC" CXXFLAGS="-fPIC -DPIC" FCFLAGS="-fPIC" FFLAGS="-fPIC" CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" make -j16 make install diff --git a/package/pnetcdf/1.9.0/install.sh b/package/pnetcdf/1.9.0/install.sh index 4a07f42d35826198adf92f2b7357219ec166b65f..c3f8cd14ae45e7020ab67ec479d465cff36a72f5 100644 --- a/package/pnetcdf/1.9.0/install.sh +++ b/package/pnetcdf/1.9.0/install.sh @@ -8,6 +8,6 @@ cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/parallel-netcdf-1.9.0.tar.gz cd parallel-netcdf-1.9.0 -./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test +./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" make -j16 make install \ No newline at end of file diff --git a/templates/abinit/8.10.3/data.abinit.arm.gpu.config b/templates/abinit/8.10.3/data.abinit.arm.gpu.config index 4a82d86eae2af4090ace376eb8223e992bf80a36..12af84ece440746dc969eac1c913241cd920a1dd 100644 --- a/templates/abinit/8.10.3/data.abinit.arm.gpu.config +++ b/templates/abinit/8.10.3/data.abinit.arm.gpu.config @@ -10,16 +10,19 @@ wannier90/2.0.1.1 http://forge.abinit.org/fallbacks/wannier90-2.0.1.1.tar.gz abinit_package $JARVIS_PROXY/abinit/abinit/files/3586400/0001-Patching-m_polynomial_coeff.F90-for-ability-to-compi.patch.txt abinit_patch-8.10.3.patch [DEPENDENCY] -module use ./software/modulefiles module purge -./jarvis -install kgcc/9.3.1 com -module load kgcc/9.3.1 +module use ./software/modulefiles +./jarvis -install kgcc/10.3.1 com +module load ./software/modulefiles/kgcc/10.3.1 export CC=gcc CXX=g++ FC=gfortran + ./jarvis -install hmpi/1.1.1 gcc -module load hmpi/1.1.1 +module load ./software/moduledeps/kgcc10.3.1/hmpi/1.1.1 + export CC=mpicc CXX=mpicxx FC=mpifort -./jarvis -install package/hdf5/1.10.1 gcc+mpi -./jarvis -install package/pnetcdf/1.11.2 gcc+mpi +./jarvis -install hdf5/1.10.1 gcc+mpi +./jarvis -install package/pnetcdf/1.9.0 gcc+mpi +module load ./software/moduledeps/gcc10.3.1-hmpi1.1.1/pnetcdf/1.9.0 ./jarvis -install package/netcdf/4.7.0 gcc+mpi ./jarvis -install package/openblas/0.3.18 gcc @@ -27,11 +30,11 @@ export CC=mpicc CXX=mpicxx FC=mpifort [ENV] module use ./software/modulefiles module purge -module load kgcc/9.3.1 +module load kgcc/10.3.1 #module load bisheng/2.1.0 module load hmpi/1.1.1 module load hdf5/1.10.1 -module load pnetcdf/1.11.2 +module load pnetcdf/1.9.0 module load netcdf/4.7.0 module load openblas/0.3.18 export CC=mpicc CXX=mpicxx FC=mpifort diff --git a/templates/wrf/4.2/data.wrf.arm.cpu.config b/templates/wrf/4.2/data.wrf.arm.cpu.config index b4a5ba14bb67e742a402efb7b9b692bd04296155..668dee2090a945f639ff33c6b1fd25d9b9725b3c 100644 --- a/templates/wrf/4.2/data.wrf.arm.cpu.config +++ b/templates/wrf/4.2/data.wrf.arm.cpu.config @@ -7,15 +7,17 @@ wrf/4.2 $JARVIS_PROXY/wrf-model/WRF/archive/refs/tags/v4.2.tar.gz wrf-4.2.tar.gz [DEPENDENCY] module purge module use ./software/modulefiles -./jarvis -install kgcc/9.3.1 com -module load kgcc/9.3.1 +./jarvis -install kgcc/10.3.1 com +module load ./software/modulefiles/kgcc/10.3.1 export CC=gcc CXX=g++ FC=gfortran ./jarvis -install hmpi/1.1.1 gcc -module load hmpi/1.1.1 +module load ./software/moduledeps/kgcc10.3.1/hmpi/1.1.1 + export CC=mpicc CXX=mpicxx FC=mpifort ./jarvis -install hdf5/1.10.1 gcc+mpi -./jarvis -install package/pnetcdf/1.11.2 gcc+mpi +./jarvis -install package/pnetcdf/1.9.0 gcc+mpi +module load ./software/moduledeps/gcc10.3.1-hmpi1.1.1/pnetcdf/1.9.0 ./jarvis -install package/netcdf/4.7.0 gcc+mpi ./jarvis -install optimized-routines/20.02 gcc+mpi cd ${JARVIS_TMP} @@ -24,10 +26,10 @@ tar -zxvf $JARVIS_DOWNLOAD/wrf-4.2.tar.gz [ENV] module purge module use ./software/modulefiles -module load kgcc/9.3.1 +module load kgcc/10.3.1 module load hmpi/1.1.1 export CC=mpicc CXX=mpicxx FC=mpifort -module load pnetcdf/1.11.2 +module load pnetcdf/1.9.0 module load netcdf/4.7.0 module load optimized-routines/20.02 diff --git a/templates/wrf/4.3.3/wrf.4.3.config b/templates/wrf/4.3.3/wrf.4.3.config index 40d7ea780b698792a0ede211191c9b3d587e0ed2..57dab85581cc4fe919a490d205dd57befc751ae0 100644 --- a/templates/wrf/4.3.3/wrf.4.3.config +++ b/templates/wrf/4.3.3/wrf.4.3.config @@ -8,18 +8,19 @@ wrf/4.3.3 $JARVIS_PROXY/wrf-model/WRF/archive/refs/tags/v4.3.3.tar.gz wrf-4.3.3. module purge module use ./software/modulefiles -./jarvis -install kgcc/9.3.1 com -module load kgcc/9.3.1 +./jarvis -install kgcc/10.3.1 com +module load ./software/modulefiles/kgcc/10.3.1 export CC=gcc CXX=g++ FC=gfortran ./jarvis -install hmpi/1.1.1 gcc -module load hmpi/1.1.1 +module load ./software/moduledeps/kgcc10.3.1/hmpi/1.1.1 + export CC=mpicc CXX=mpicxx FC=mpifort -module load hdf5/1.10.1 -./jarvis -install hdf5/1.10.1 gcc -./jarvis -install package/pnetcdf/1.11.2 gcc -module load pnetcdf/1.11.2 -./jarvis -install package/netcdf/4.7.0 gcc +./jarvis -install hdf5/1.10.1 gcc+mpi +./jarvis -install package/pnetcdf/1.9.0 gcc+mpi +module load ./software/moduledeps/gcc10.3.1-hmpi1.1.1/pnetcdf/1.9.0 +./jarvis -install package/netcdf/4.7.0 gcc+mpi + ./jarvis -install optimized-routines/20.02 gcc cd ${JARVIS_TMP} @@ -28,10 +29,10 @@ tar -zxvf $JARVIS_DOWNLOAD/wrf-4.3.3.tar.gz [ENV] module purge module use ./software/modulefiles -module load kgcc/9.3.1 +module load kgcc/10.3.1 module load hmpi/1.1.1 export CC=mpicc CXX=mpicxx FC=mpifort -module load pnetcdf/1.11.2 +module load pnetcdf/1.9.0 module load netcdf/4.7.0 module load optimized-routines/20.02 diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index b986a9651e4953760263ac3a50135e79ec2c4ef0..a122559b882fdd4c6845e7b600fe46ddb5a82377 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -6,21 +6,21 @@ wrf/4.6.1 https://codeload.github.com/wrf-model/WRF/tar.gz/refs/tags/v4.6.1 wrf- [DEPENDENCY] - module purge module use ./software/modulefiles -./jarvis -install kgcc/9.3.1 com -module load kgcc/9.3.1 +./jarvis -install kgcc/10.3.1 com +module load ./software/modulefiles/kgcc/10.3.1 export CC=gcc CXX=g++ FC=gfortran ./jarvis -install hmpi/1.1.1 gcc -module load hmpi/1.1.1 +module load ./software/moduledeps/kgcc10.3.1/hmpi/1.1.1 + export CC=mpicc CXX=mpicxx FC=mpifort -module load hdf5/1.10.1 -./jarvis -install hdf5/1.10.1 gcc -./jarvis -install package/pnetcdf/1.11.2 gcc -module load pnetcdf/1.11.2 -./jarvis -install package/netcdf/4.7.0 gcc +./jarvis -install hdf5/1.10.1 gcc+mpi +./jarvis -install package/pnetcdf/1.9.0 gcc+mpi +module load ./software/moduledeps/gcc10.3.1-hmpi1.1.1/pnetcdf/1.9.0 +./jarvis -install package/netcdf/4.7.0 gcc+mpi + ./jarvis -install optimized-routines/20.02 gcc cd ${JARVIS_TMP} @@ -29,10 +29,10 @@ tar -zxvf $JARVIS_DOWNLOAD/wrf-4.6.1.tar.gz [ENV] module purge module use ./software/modulefiles -module load kgcc/9.3.1 +module load kgcc/10.3.1 module load hmpi/1.1.1 export CC=mpicc CXX=mpicxx FC=mpifort -module load pnetcdf/1.11.2 +module load pnetcdf/1.9.0 module load netcdf/4.7.0 module load optimized-routines/20.02