From de2f979be529c95eb5f6c143342e7cee03dc699b Mon Sep 17 00:00:00 2001
From: edoapra <edoardo.apra@gmail.com>
Date: Fri, 8 Oct 2021 18:24:32 -0700
Subject: [PATCH] fixes for nvidia cray env. detection of Zen cpus

---
 src/libext/openblas/build_openblas.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/libext/openblas/build_openblas.sh b/src/libext/openblas/build_openblas.sh
index 6b15162b70..322f479a06 100755
--- a/src/libext/openblas/build_openblas.sh
+++ b/src/libext/openblas/build_openblas.sh
@@ -36,10 +36,15 @@ fi
    GOTAVX=$(echo ${CPU_FLAGS}   | tr  'A-Z' 'a-z'| awk ' /avx/    {print "Y"}')
   GOTAVX2=$(echo ${CPU_FLAGS_2} | tr  'A-Z' 'a-z'| awk ' /avx2/   {print "Y"}')
 GOTAVX512=$(echo ${CPU_FLAGS}   | tr  'A-Z' 'a-z'| awk ' /avx512f/{print "Y"}')
+GOTCLZERO=$(echo ${CPU_FLAGS}   | tr  'A-Z' 'a-z'| awk ' /clzero/{print "Y"}')
 if [[ "${GOTAVX2}" == "Y" ]]; then
     echo "forcing Haswell target when AVX2 is available"
     FORCETARGET=" TARGET=HASWELL "
 fi
+if [[ "${GOTCLZERO}" == "Y" ]]; then
+    echo "forcing Zen target when CLZERO is available"
+    FORCETARGET=" TARGET=ZEN "
+fi
 if [[ "${GOTAVX512}" == "Y" ]]; then
     echo "forcing Haswell target on SkyLake"
     FORCETARGET=" TARGET=HASWELL "
@@ -65,6 +70,8 @@ fi
 #cray ftn wrapper
 if [[ ${FC} == ftn ]]; then
     FCORG=ftn
+    CRAY_ACCEL_TARGET_ORG=$CRAY_ACCEL_TARGET
+    unset CRAY_ACCEL_TARGET
     if [[ ${PE_ENV} == PGI ]]; then
           FC=pgf90
 #          _CC=pgcc
@@ -80,6 +87,9 @@ if [[ ${FC} == ftn ]]; then
     fi
     if [[ ${PE_ENV} == NVIDIA ]]; then
 	FC=nvfortran
+        FORCETARGET+=' CC=gcc '
+	CC=gcc
+	unset CPATH
     fi
     if [[ ${PE_ENV} == CRAY ]]; then
 #	echo ' '
@@ -186,3 +196,6 @@ fi
 if [[ -n ${CCORG} ]]; then
     CC=${CCORG}
 fi
+if [[ -n ${CRAY_ACCEL_TARGET_ORG} ]]; then
+    CRAY_ACCEL_TARGET=$CRAY_ACCEL_TARGET_ORG
+fi