From 1a381dc3c09bee6d5a6e4845e5e19ebf08260968 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Sat, 21 Jul 2012 10:35:11 +0000
Subject: Move MPI support from flesh to a thorn

Move MPI support from flesh to thorn ExternalLibraries/MPI. This also
requires thorns that call MPI directly to declare this in their
configuration.ccl. Existing configurations using MPI need to include
ExternalLibraries/MPI into their thorn list.

* Declare that the flesh optionally uses MPI (because it needs to call
  MPI_Init)
* Update test case mechanism to find out whether MPI is used
* Handle configuration bindings for flesh
* Don't special-case Crays any more when configuring Linux


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4847 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/make/known-architectures/linux |  8 --------
 lib/make/make.thornlib             |  6 ++----
 lib/sbin/RunTestUtils.pl           | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux
index f79f9662..29a36188 100644
--- a/lib/make/known-architectures/linux
+++ b/lib/make/known-architectures/linux
@@ -9,12 +9,6 @@
 #   @version   $Header$
 # @@*/
 
-if test -e "/usr/bin/aprun" ; then
- echo "This is probably a Cray XT4 series system."
- echo "Using known-architectures xt4-cray-linux"
- . $srcdir/known-architectures/xt4-cray-linux
-else
-
 
 if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
 
@@ -611,5 +605,3 @@ else
 # This is caught by lib/make/extras/MPI/NATIVE then.
 
 fi
-
-fi
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib
index 2a174598..f6f640ee 100644
--- a/lib/make/make.thornlib
+++ b/lib/make/make.thornlib
@@ -22,17 +22,15 @@ endif
 
 # Include the main make definitions for this configuration
 include $(CONFIG)/make.config.defn
- 
+
 BINDINGS_DIR=$(TOP)/bindings
 
 # Include the configuration make.THORN_NAME.defn for the thorn
-# if it is not Cactus or CactusBindings
+# if it is not CactusBindings
 INC_DIRS = 
 ifneq ($(THORN), CactusBindings)
-ifneq ($(THORN), Cactus)
 -include $(BINDINGS_DIR)/Configuration/Thorns/make.$(THORN).defn
 endif
-endif
 
 # Add appropriate include lines
 INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements $(BINDINGS_DIR)/Configuration/Thorns $(BINDINGS_DIR)/include/$(THORN)
diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index 1ec5760a..0fc50920 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -512,13 +512,14 @@ sub defprompt
 sub ParseExtras
 {
   my($config_data) = @_;
-  my($mpi,$dir,$sep,$extradir);
+  my($mpi,$dir,$sep,$extradir,$capabilitydir);
 
   $dir = $config_data->{"CCTK_DIR"};
   $sep = $config_data->{"SEPARATOR"};
   $config = $config_data->{"CONFIG"};
 
   $extradir = "$dir${sep}configs${sep}$config${sep}config-data${sep}cctk_Extradefs.h";
+  $capabilitydir = "$dir${sep}configs${sep}$config${sep}bindings${sep}Configuration${sep}Capabilities${sep}cctki_MPI.h";
 
   $mpi = 0;
 
@@ -535,6 +536,19 @@ sub ParseExtras
     close(EXTRA);
   }
 
+  if (-e "$capabilitydir")
+  {
+    open(CAP,"<$capabilitydir");
+    while(<CAP>)
+    {
+      if (/\#define CCTK_MPI/)
+      {
+        $mpi = 1;
+      }
+    }
+    close(CAP);
+  }
+
   return $mpi;
 }
 
-- 
cgit v1.2.3