Merge pull request #2061 from Ericgig/import_fixes

Clean some import

qutip/__init__.py

@@ -34,7 +34,7 @@
 from .core import *
 from .solver import *
 from .solve import nonmarkov
-from .solve.piqs import *
+import qutip.solve.piqs as piqs
 from .solve.stochastic import *
 
 # graphics
@@ -57,7 +57,6 @@
 
 
 # utilities
-from .parallel import *
 from .utilities import *
 from .fileio import *
 from .about import *

qutip/core/__init__.py

@@ -12,3 +12,5 @@
 from .subsystem_apply import *
 from .blochredfield import *
 from . import gates
+
+del cy  # File in cy are not public facing

qutip/solve/pdpsolve.py

@@ -8,7 +8,7 @@
 )
 from ..core import data as _data
 from .solver import Result, SolverOptions
-from ..parallel import serial_map
+from .parallel import serial_map
 from ..ui.progressbar import TextProgressBar
 from ..settings import settings
 debug = settings.debug

qutip/solve/stochastic.py

@@ -12,7 +12,7 @@
     GenericSSolver, Solvers
 )
 from .solver import Result, SolverOptions, _solver_safety_check
-from ..parallel import serial_map
+from .parallel import serial_map
 from ..ui.progressbar import TextProgressBar
 from qutip.core import data as _data
 

qutip/solver/__init__.py

@@ -14,3 +14,5 @@
 from .steadystate import *
 from .countstat import *
 from .brmesolve import *
+from .krylovsolve import *
+from .parallel import *

qutip/tests/solve/test_stochastic_me.py

@@ -4,8 +4,9 @@
 
 from qutip import (
     smesolve, mesolve, photocurrent_mesolve, liouvillian, QobjEvo, spre, spost,
-    destroy, coherent, parallel_map, qeye, fock_dm, general_stochastic, num,
+    destroy, coherent, qeye, fock_dm, general_stochastic, num,
 )
+from qutip.solve.parallel import parallel_map
 from qutip.core import data as _data
 def f(t, args):
     return args["a"] * t

qutip/tests/solve/test_stochastic_se.py

@@ -3,10 +3,10 @@
 from numpy.testing import assert_
 
 from qutip import (
-    ssesolve, destroy, coherent, mesolve, fock, qeye, parallel_map,
+    ssesolve, destroy, coherent, mesolve, fock, qeye,
     photocurrent_sesolve, num,
 )
-
+from qutip.solve.parallel import parallel_map
 
 def f(t, args):
     return args["a"] * t

qutip/wigner.py

@@ -16,7 +16,7 @@
 
 import qutip
 from qutip import Qobj, ket2dm, jmat
-from .parallel import parfor
+from .solver.parallel import parallel_map
 from .utilities import clebsch
 from .core import data as _data
 from .core.data.eigen import eigh
@@ -322,7 +322,7 @@ def _wigner_laguerre(rho, xvec, yvec, g, parallel):
         if parallel:
             iterator = (
                 (m, rho, A, B) for m in range(len(rho.data.indptr) - 1))
-            W1_out = parfor(_par_wig_eval, iterator)
+            W1_out = parallel_map(_par_wig_eval, iterator)
             W += sum(W1_out)
         else:
             for m in range(len(rho.data.indptr) - 1):