From 0db2d807aaffab7b8fcca0a4bb289671d7647375 Mon Sep 17 00:00:00 2001 From: edoapra Date: Wed, 26 Jul 2023 19:06:58 -0700 Subject: [PATCH] incomplete fixes for crayftn --- src/libext/openblas/build_openblas.sh | 36 ++++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/libext/openblas/build_openblas.sh b/src/libext/openblas/build_openblas.sh index dc92319a8f..66c374d4e7 100755 --- a/src/libext/openblas/build_openblas.sh +++ b/src/libext/openblas/build_openblas.sh @@ -111,20 +111,21 @@ if [[ ${FC} == ftn ]]; then # echo ' ' # echo 'openblas installation not ready for crayftn ' # echo ' ' - if ! [ -x "$(command -v gfortran)" ]; then - echo " please load the gcc module (not prgenv)" - echo " by executing" - echo " module load gcc " - echo " " - exit 1 - fi - FC=gfortran - CCORG=${CC} - CC=clang - export PATH=/opt/cray/pe/cce/default/cce-clang/x86_64/bin:$PATH - FORCETARGET+=' FC=gfortran CC=clang ' +# if ! [ -x "$(command -v gfortran)" ]; then +# echo " please load the gcc module (not prgenv)" +# echo " by executing" +# echo " module load gcc " +# echo " " +# exit 1 +# fi +# FC=gfortran +# CCORG=${CC} +# CC=clang +# export PATH=/opt/cray/pe/cce/default/cce-clang/x86_64/bin:$PATH +# FORCETARGET+=' FC=gfortran CC=clang ' # exit 1 -# exit 1 + # exit 1 + _FC=crayftn fi fi if [[ -n ${FC} ]] && [[ ${FC} == xlf ]] || [[ ${FC} == xlf_r ]] || [[ ${FC} == xlf90 ]]|| [[ ${FC} == xlf90_r ]]; then @@ -134,6 +135,9 @@ if [[ -n ${FC} ]] && [[ ${FC} == xlf ]] || [[ ${FC} == xlf_r ]] || [[ ${FC} == elif [[ -n ${FC} ]] && [[ "${FC}" == "flang" ]] || [[ "${FC}" == "amdflang" ]]; then FORCETARGET+=' F_COMPILER=FLANG ' LAPACK_FPFLAGS_VAL=" -O1 -g -Kieee" +elif [[ "${_FC}" == "crayftn" ]] ; then +# FORCETARGET+=' F_COMPILER=FLANG ' + LAPACK_FPFLAGS_VAL=" -s integer64" elif [[ -n ${FC} ]] && [[ "${FC}" == "pgf90" ]] || [[ "${FC}" == "nvfortran" ]]; then FORCETARGET+=' F_COMPILER=PGI ' if [[ "${FC}" == "nvfortran" ]]; then @@ -222,7 +226,7 @@ if [[ ! -z "${USE_OPENMP}" ]]; then fi GOTFREEBSD=$(uname -o 2>&1|awk ' /FreeBSD/ {print "1";exit}') MYMAKE=make -MAKEJ=" -j4" +MAKEJ=" -j3 " if [[ "${GOTFREEBSD}" == 1 ]]; then MAKEJ=" " MYMAKE=gmake @@ -240,7 +244,9 @@ else $MYMAKE FC=$FC CC=$CC HOSTCC=gcc $FORCETARGET LAPACK_FPFLAGS="$LAPACK_FPFLAGS_VAL" INTERFACE64="$sixty4_int" BINARY="$binary" NUM_THREADS=128 NO_CBLAS=1 NO_LAPACKE=1 DEBUG=0 USE_THREAD="$THREADOPT" libs netlib $MAKEJ >& openblas.log fi if [[ "$?" != "0" ]]; then - tail -500 openblas.log + echo error code '$?' + ls -l openblas.log + tail -n 500 openblas.log echo " " echo "OpenBLAS compilation failed" echo " "