summaryrefslogtreecommitdiff
path: root/lib/sbin
diff options
context:
space:
mode:
authoreschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-07-21 10:35:11 +0000
committereschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-07-21 10:35:11 +0000
commit1a381dc3c09bee6d5a6e4845e5e19ebf08260968 (patch)
tree90ca5abe727e28fe338ea6d7d404ede2ce9a714e /lib/sbin
parent3aa8a812527b1b9a18146a6fa9ee5ff66557838c (diff)
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
Diffstat (limited to 'lib/sbin')
-rw-r--r--lib/sbin/RunTestUtils.pl16
1 files changed, 15 insertions, 1 deletions
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;
}