[cig-commits] [commit] QA: build: Error if config with ADIOS but without MPI. (75a36e4)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Jan 20 07:11:51 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/4359ed56c14ef8f87387f46c8b705a1d395a40ba...8e7fca259d3e520c105549cfacfb92b6c83f8971
>---------------------------------------------------------------
commit 75a36e4edb2074c270ebfd58426155653956a5db
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sun Jan 19 17:45:17 2014 -0500
build: Error if config with ADIOS but without MPI.
The documentation for ADIOS suggests it can be compiled in serial
instead of with MPI. However, it seems that this requires some fake
replacement constants to replace MPI stuff. Unfortunately, the dummy
wrappers that ADIOS provides don't appear to be available from Fortran,
so I'm just going to not allow it for now.
>---------------------------------------------------------------
75a36e4edb2074c270ebfd58426155653956a5db
configure | 3 +++
configure.ac | 3 +++
2 files changed, 6 insertions(+)
diff --git a/configure b/configure
index f800e56..76a5335 100755
--- a/configure
+++ b/configure
@@ -7084,6 +7084,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "$want_adios" = yes; then
+ if test "$want_mpi" != yes; then
+ as_fn_error $? "Cannot compile with ADIOS but without MPI." "$LINENO" 5
+ fi
# Extract the first word of "adios_config", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
index 8f2550e..92e8168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,6 +298,9 @@ if test "$want_pyre" = yes; then
fi
if test "$want_adios" = yes; then
+ if test "$want_mpi" != yes; then
+ AC_MSG_ERROR([Cannot compile with ADIOS but without MPI.])
+ fi
CIT_ADIOS_CONFIG
fi
More information about the CIG-COMMITS
mailing list