From ff8373d5a0183e06c86e7c082ead693b075af206 Mon Sep 17 00:00:00 2001 From: edoapra Date: Wed, 26 Jul 2023 19:32:55 -0700 Subject: [PATCH] crayftn -ef option to create .mod --- src/libext/openblas/build_openblas.sh | 4 +++- src/libext/openblas/crayftn.patch | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/libext/openblas/crayftn.patch diff --git a/src/libext/openblas/build_openblas.sh b/src/libext/openblas/build_openblas.sh index ec21bea8b1..174a541534 100755 --- a/src/libext/openblas/build_openblas.sh +++ b/src/libext/openblas/build_openblas.sh @@ -26,6 +26,8 @@ patch -p0 -s -N < ../makesys.patch #patch -p0 -s -N < ../icc_avx512.patch # patch for pgi/nvfortran missing -march=armv8 patch -p0 -s -N < ../arm64_fopt.patch +patch -p1 -s -N < ../9402df5604e69f86f58953e3883f33f98c930baf.patch +patch -p0 -s -N < ../crayftn.patch if [[ -z "${FORCETARGET}" ]]; then FORCETARGET=" " UNAME_S=$(uname -s) @@ -136,7 +138,7 @@ elif [[ -n ${FC} ]] && [[ "${FC}" == "flang" ]] || [[ "${FC}" == "amdflang" ]]; LAPACK_FPFLAGS_VAL=" -O1 -g -Kieee" elif [[ "${_FC}" == "crayftn" ]] ; then # FORCETARGET+=' F_COMPILER=FLANG ' - LAPACK_FPFLAGS_VAL=" -s integer64" + LAPACK_FPFLAGS_VAL=" -s integer64 -ef " elif [[ -n ${FC} ]] && [[ "${FC}" == "pgf90" ]] || [[ "${FC}" == "nvfortran" ]]; then FORCETARGET+=' F_COMPILER=PGI ' if [[ "${FC}" == "nvfortran" ]]; then diff --git a/src/libext/openblas/crayftn.patch b/src/libext/openblas/crayftn.patch new file mode 100644 index 0000000000..9422ed7df7 --- /dev/null +++ b/src/libext/openblas/crayftn.patch @@ -0,0 +1,10 @@ +--- Makefile.system.org 2023-07-26 19:26:30.000000000 -0700 ++++ Makefile.system 2023-07-26 19:26:54.000000000 -0700 +@@ -1323,6 +1323,7 @@ + ifeq ($(F_COMPILER), CRAY) + CCOMMON_OPT += -DF_INTERFACE_INTEL + FCOMMON_OPT += -hnopattern ++FCOMMON_OPT += -ef + ifdef INTERFACE64 + ifneq ($(INTERFACE64), 0) + FCOMMON_OPT += -s integer64