wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-09 16:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change to new import standard for IPython Parallel.

Browse Source
This commit is contained in:
Brendan Smithyman
2015-08-24 11:09:17 -04:00
parent 3f02ce9073
commit ad99b24a82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Parallel.py
+4 -4
View File
@@ -1,4 +1,4 @@
from IPython.parallel import Client, parallel, Reference, require, depend, interactive
from ipyparallel import Client, parallel, Reference, require, depend, interactive
from SimPEG.Utils import CommonReducer
import numpy as np
import networkx
@@ -24,8 +24,8 @@ class SuperReference(object):
def __call__(self, *args, **kwargs):
from IPython.parallel import depend
from IPython.parallel.error import UnmetDependency
from ipyparallel import depend
from ipyparallel.error import UnmetDependency
if (self.rank is not None) and (globals().get('rank', None) not in self.rank):
raise UnmetDependency('Global \'rank\' does not satisfy requirements')
@@ -592,7 +592,7 @@ class RemoteInterface(object):
@interactive
def _reduceJob(worker, root, endpoint, key):
from IPython.parallel.error import UnmetDependency
from ipyparallel.error import UnmetDependency
if not rank == worker:
raise UnmetDependency