|
 |
758fea8 |
From f6b6f1aab96893d6dab7be94cbcedd5ff913b2cb Mon Sep 17 00:00:00 2001
|
|
|
a7318bc |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
|
a7318bc |
Date: Fri, 2 Oct 2020 23:32:15 +0100
|
|
|
a7318bc |
Subject: [PATCH 1/5] Disable sysguess
|
|
|
a7318bc |
|
|
|
a7318bc |
---
|
|
|
a7318bc |
configure.ac | 73 ----------------------------------------------------
|
|
|
a7318bc |
1 file changed, 73 deletions(-)
|
|
|
a7318bc |
|
|
|
a7318bc |
diff --git a/configure.ac b/configure.ac
|
|
|
758fea8 |
index 14e0f7f..77e8dfd 100644
|
|
|
a7318bc |
--- a/configure.ac
|
|
|
a7318bc |
+++ b/configure.ac
|
|
|
a7318bc |
@@ -11,79 +11,6 @@ fi
|
|
|
a7318bc |
AC_PROG_CXX([mpiCC mpixlcxx mpixlcxx_r mpicxx CC])
|
|
|
a7318bc |
MPI_CXX="$CXX"
|
|
|
a7318bc |
|
|
|
a7318bc |
-AC_MSG_CHECKING([which MPI system we think we are using])
|
|
|
a7318bc |
-case "$MPI_CXX" in
|
|
|
a7318bc |
- mpiCC)
|
|
|
a7318bc |
- changequote({, })
|
|
|
a7318bc |
- MPI_C=mpicc
|
|
|
a7318bc |
- if $MPI_CXX -compile_info >/dev/null 2>/dev/null; then
|
|
|
a7318bc |
- SYSGUESS=mpich
|
|
|
a7318bc |
- CXX="`$MPI_CXX -compile_info | sed -e 's/^\([^ ]*\).*/\1/'`"
|
|
|
a7318bc |
- else
|
|
|
a7318bc |
- # mpiCC can be a C compiler under OpenMPI
|
|
|
a7318bc |
- if mpicxx -showme >/dev/null 2>/dev/null; then
|
|
|
a7318bc |
- SYSGUESS=openmpi
|
|
|
a7318bc |
- CXX="`mpicxx -showme | sed -e 's/^\([^ ]*\).*/\1/'`"
|
|
|
a7318bc |
- else
|
|
|
758fea8 |
- changequote([, ])
|
|
|
a7318bc |
- AC_MSG_ERROR([
|
|
|
a7318bc |
-Confused when trying to determine MPI_CXX, MPI_CXXFLAGS etc.
|
|
|
a7318bc |
-Please set them manually.])
|
|
|
a7318bc |
- changequote({, })
|
|
|
a7318bc |
- fi
|
|
|
a7318bc |
- fi
|
|
|
a7318bc |
- LAUNCHSTYLE=_mpirun
|
|
|
a7318bc |
- TESTDIR=testsuite
|
|
|
a7318bc |
- EXTRAS=extras
|
|
|
a7318bc |
- changequote([, ])
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
- mpixlcxx_r)
|
|
|
a7318bc |
- MPI_C=mpixlc_r
|
|
|
a7318bc |
- SYSGUESS=bgp
|
|
|
a7318bc |
- CXX="$MPI_CXX"
|
|
|
a7318bc |
- #CC="`echo $MPI_CXX | sed -e 's/xlcxx$/xlc/;s/cxx$/cc/'`"
|
|
|
a7318bc |
- CC="$MPI_C"
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
- mpixlcxx)
|
|
|
a7318bc |
- MPI_C=mpixlc
|
|
|
a7318bc |
- SYSGUESS=bgq
|
|
|
a7318bc |
- CXX="$MPI_CXX"
|
|
|
a7318bc |
- #CC="`echo $MPI_CXX | sed -e 's/xlcxx$/xlc/;s/cxx$/cc/'`"
|
|
|
a7318bc |
- CC="$MPI_C"
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
- mpicxx)
|
|
|
a7318bc |
- MPI_C=mpicc
|
|
|
a7318bc |
- CC="$MPI_C"
|
|
|
a7318bc |
- CXX="$MPI_CXX"
|
|
|
a7318bc |
- if mpich2version >/dev/null 2>/dev/null; then
|
|
|
a7318bc |
- SYSGUESS=mpich2
|
|
|
a7318bc |
- AC_DEFINE(HAVE_MPICH2, 1, [Define to 1 if you have MPICH2.])
|
|
|
a7318bc |
- else
|
|
|
a7318bc |
- SYSGUESS=bgl
|
|
|
a7318bc |
- fi
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
- CC)
|
|
|
a7318bc |
- # We should be checking MPI version but for the Cray we do it differently
|
|
|
a7318bc |
- if uname -r | grep -q cray_gem_s; then
|
|
|
a7318bc |
- SYSGUESS=cray_xe6
|
|
|
a7318bc |
- AC_DEFINE(CRAY_XE6, 1, [Define if this is a Cray XE6 system.])
|
|
|
a7318bc |
- CC=cc
|
|
|
a7318bc |
- CXX=CC
|
|
|
a7318bc |
- else
|
|
|
a7318bc |
- SYSGUESS=unknown
|
|
|
a7318bc |
- fi
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
- xlC)
|
|
|
a7318bc |
- MPI_C=xlc
|
|
|
a7318bc |
- SYSGUESS=bgq_seq
|
|
|
a7318bc |
- CXX="$MPI_CXX"
|
|
|
a7318bc |
- CC="$MPI_C"
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
-
|
|
|
a7318bc |
- *)
|
|
|
a7318bc |
- SYSGUESS=unknown
|
|
|
a7318bc |
- ;;
|
|
|
a7318bc |
-esac
|
|
|
a7318bc |
echo "SYSGUESS=$SYSGUESS"
|
|
|
a7318bc |
|
|
|
a7318bc |
AC_MSG_CHECKING(MPI_CXXFLAGS)
|
|
|
a7318bc |
--
|
|
|
758fea8 |
2.31.1
|
|
|
a7318bc |
|