From ad99b24a82ec0a6527061802f6fa4a41a9e10c7d Mon Sep 17 00:00:00 2001 From: Brendan Smithyman Date: Mon, 24 Aug 2015 11:09:17 -0400 Subject: [PATCH] Change to new import standard for IPython Parallel. --- SimPEG/Parallel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SimPEG/Parallel.py b/SimPEG/Parallel.py index b4407608..c12069ba 100644 --- a/SimPEG/Parallel.py +++ b/SimPEG/Parallel.py @@ -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