Changeset 336

Timestamp:

Jul 8, 2011 8:21:50 PM (12 years ago)

Author:

toby

Message:

Make MKL optional

File:

• trunk/GSASII.py (modified) (2 diffs)

trunk/GSASII.py

@@ -21 +21 @@
 import wx
 import matplotlib as mpl
-import mkl
 
 # load the GSAS routines
@@ -42 +41 @@
 print "scipy:      ",sp.__version__
 print "OpenGL:     ",ogl.__version__
-print "Max threads ",mkl.get_max_threads()
-
+try:
+    import mkl
+    print "Max threads ",mkl.get_max_threads()
+except:
+    print "MKL module not present"
 __version__ = '0.1.5'