Avoiding the need to propagate global variables in python

elemental · Nov 23, 2016 · 1ae0369 · 1ae0369
1 parent cfd5e58
commit 1ae0369
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/python/__init__.py b/python/__init__.py
@@ -6,27 +6,6 @@
 #  which can be found in the LICENSE file in the root directory, or at 
 #  http://opensource.org/licenses/BSD-2-Clause
 #
-
-# Attempt to import matplotlib.pyplot and save whether or not this succeeded
-try:
-  import numpy as np
-  import matplotlib as mpl
-  import matplotlib.pyplot as plt
-  havePyPlot=True
-except:
-  havePyPlot=False 
-  print 'Could not import matplotlib.pyplot'
-
-if havePyPlot:
-  try:
-    import networkx as nx
-    haveNetworkX = True
-  except:
-    haveNetworkX = False 
-    print 'Could not import networkx'
-else:
-  haveNetworkX = False
-
 from core          import *
 from blas_like     import *
 from io            import *

diff --git a/python/io.py b/python/io.py
@@ -9,6 +9,26 @@
 from El.core import *
 from El.blas_like import Copy, CopyFromRoot, CopyFromNonRoot, RealPart, ImagPart
 
+# Attempt to import matplotlib.pyplot and save whether or not this succeeded
+try:
+  import numpy as np
+  import matplotlib as mpl
+  import matplotlib.pyplot as plt
+  havePyPlot=True
+except:
+  havePyPlot=False
+  print 'Could not import matplotlib.pyplot'
+
+if havePyPlot:
+  try:
+    import networkx as nx
+    haveNetworkX = True
+  except:
+    haveNetworkX = False
+    print 'Could not import networkx'
+else:
+  haveNetworkX = False
+
 # Input/Output
 # ************