diff --git a/package/lapack/3.10.1/bisheng/install.sh b/package/lapack/3.10.1/bisheng/install.sh index d536f54065b3e902a9a8c0b73281cd79c1d4d3ac..b6577f95385999c057252ddea8504665f94c0796 100755 --- a/package/lapack/3.10.1/bisheng/install.sh +++ b/package/lapack/3.10.1/bisheng/install.sh @@ -21,3 +21,7 @@ cmake ../ -DCMAKE_INSTALL_PREFIX=$1 -DBUILD_SHARED_LIBS=ON make -j $(nproc) make install ln -s $1/lib64 $1/lib + +cd .. +sed -i "s|\$(TOPSRCDIR)|$1/lib64|g" make.inc +make -j $(nproc) blaslib \ No newline at end of file diff --git a/package/scalapack/2.1.0/clang/install.sh b/package/scalapack/2.1.0/clang/install.sh index f135520a75ab9b036c690af79d9de91681f5aa8a..4e2ea4faf78546ddb0e1443a06043720c3da804a 100755 --- a/package/scalapack/2.1.0/clang/install.sh +++ b/package/scalapack/2.1.0/clang/install.sh @@ -11,6 +11,7 @@ if ! [ -z ${LAPACK_BISHENG_PATH} ]; then else echo "Need to set environment var LAPACK_BISHENG_PATH" && exit 1; fi +sed -i "33s/$/ -Wno-implicit-function-declaration -Wno-implicit-int/g" ./SLmake.inc sed -i "58s/-lblas//g" ./SLmake.inc sed -i "59s/-llapack//g" ./SLmake.inc sed -i "58s%$%${LAPACK_BISHENG_PATH}/lib/librefblas.a%g" ./SLmake.inc diff --git a/templates/CP2K/7.1/bisheng/data.CP2K.arm-opt.cpu.config b/templates/CP2K/7.1/bisheng/data.CP2K.arm-opt.cpu.config index d96d2e8c0e43bab4479c26d63fcb22c8b02d64b5..28c78e066f820b81458c5188e3595511bc6295b6 100644 --- a/templates/CP2K/7.1/bisheng/data.CP2K.arm-opt.cpu.config +++ b/templates/CP2K/7.1/bisheng/data.CP2K.arm-opt.cpu.config @@ -18,7 +18,7 @@ export CC=clang CXX=clang++ FC=flang ./jarvis -install hmpi/2.4.2 clang ./jarvis -install kml/2.4.0/bisheng clang ./jarvis -install gmp/6.2.0 clang -./jarvis -install boost/1.72.0 clang +./jarvis -install boost/1.72.0/clang clang ./jarvis -install spglib/1.16.0 clang ./jarvis -install libxc/4.3.4 clang ./jarvis -install gsl/2.6 clang @@ -28,7 +28,7 @@ module load kml-bisheng/2.4.0 module load gsl/2.6 module load hmpi/2.4.2 module load gmp/6.2.0 -module load boost/1.72.0 +module load boost-clang/1.72.0 export CC=mpicc CXX=mpicxx FC=mpifort ./jarvis -install libint/2.6.0 clang+mpi @@ -74,4 +74,4 @@ make -j 128 ARCH=Linux-arm-clang-opt VERSION=psmp clean [RUN] run = numactl -C 0-63 mpirun --allow-run-as-root -np 64 -x OMP_NUM_THREADS=1 binary = cp2k.psmp H2O-256.inp -nodes = 1 \ No newline at end of file +nodes = 1