r15458 - in /branches/frame_order_testing: ./ multi/mpi4py_processor.py -- March 07, 2012 - 16:46

Author: bugman
Date: Wed Mar  7 16:46:04 2012
New Revision: 15458

URL: http://svn.gna.org/viewcvs/relax?rev=15458&view=rev
Log:
Merged revisions 15457 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r15457 | bugman | 2012-03-07 16:45:24 +0100 (Wed, 07 Mar 2012) | 7 lines
  
  Removal of another relax dependency from the multi-processor package and 
elimination of "^[[1034h".
  
  This should hopefully be the last relax dependency removed.  This import of 
dep_check was the source
  of the "^[[1034h" character being printed at the start of the relax stdout 
stream, though the reason
  for it's existence is unclear!
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/multi/mpi4py_processor.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar  7 16:46:04 2012
@@ -1,1 +1,1 @@
-/1.3:1-15455
+/1.3:1-15457

Modified: branches/frame_order_testing/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/mpi4py_processor.py?rev=15458&r1=15457&r2=15458&view=diff
==============================================================================
--- branches/frame_order_testing/multi/mpi4py_processor.py (original)
+++ branches/frame_order_testing/multi/mpi4py_processor.py Wed Mar  7 
16:46:04 2012
@@ -28,12 +28,11 @@
 # TODO: clone communicators & resize
 # TODO: check exceptions on master
 
-# Dependency check module.
-import dep_check
-
 # Python module imports.
-if dep_check.mpi4py_module:
+try:
     from mpi4py import MPI
+except ImportError:
+    MPI = None
 import os
 import sys
 import textwrap