From f8916f4d48b8066ec9bd57c189d06342494366ab Mon Sep 17 00:00:00 2001
From: Tom Close <tom.g.close@gmail.com>
Date: Fri, 17 Nov 2017 11:51:11 +1100
Subject: [PATCH] moved mpi into utils sub-package

---
 examples/api/brunel.py                 | 2 +-
 pype9/simulate/common/cells/base.py    | 2 +-
 pype9/simulate/common/code_gen/base.py | 2 +-
 pype9/simulate/common/units.py         | 5 +----
 pype9/simulate/nest/code_gen/base.py   | 3 +--
 pype9/simulate/neuron/code_gen/base.py | 2 +-
 pype9/utils/arguments.py               | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/examples/api/brunel.py b/examples/api/brunel.py
index acadab85..bd5c05c8 100755
--- a/examples/api/brunel.py
+++ b/examples/api/brunel.py
@@ -15,7 +15,7 @@
 from pyNN.utility import SimulationProgressBar
 import sys
 argv = sys.argv[1:]
-from pype9.mpi import is_mpi_master  # @IgnorePep8
+from pype9.utils.mpi import is_mpi_master  # @IgnorePep8
 import pype9.utils.logging.handlers.sysout  # @UnusedImport @IgnorePep8
 
 
diff --git a/pype9/simulate/common/cells/base.py b/pype9/simulate/common/cells/base.py
index 8d397b8e..3e721668 100644
--- a/pype9/simulate/common/cells/base.py
+++ b/pype9/simulate/common/cells/base.py
@@ -20,7 +20,7 @@
 import nineml
 from nineml.abstraction import Dynamics, Regime
 from nineml.user import Property, Initial
-from pype9.mpi import mpi_comm, is_mpi_master
+from pype9.utils.mpi import mpi_comm, is_mpi_master
 from nineml.exceptions import NineMLNameError
 from pype9.annotations import PYPE9_NS
 from pype9.exceptions import (
diff --git a/pype9/simulate/common/code_gen/base.py b/pype9/simulate/common/code_gen/base.py
index 8073e2ac..f386c230 100644
--- a/pype9/simulate/common/code_gen/base.py
+++ b/pype9/simulate/common/code_gen/base.py
@@ -36,7 +36,7 @@
 from nineml.serialization import url_re
 import sysconfig
 from pype9 import __version__
-from pype9.utils import remove_ignore_missing
+from pype9.utils.paths import remove_ignore_missing
 from pype9.utils.logging import logger
 
 BASE_BUILD_DIR = os.path.join(
diff --git a/pype9/simulate/common/units.py b/pype9/simulate/common/units.py
index 68f17589..8af53f99 100644
--- a/pype9/simulate/common/units.py
+++ b/pype9/simulate/common/units.py
@@ -5,12 +5,9 @@
 from builtins import zip  # @IgnorePep8
 from builtins import str  # @IgnorePep8
 from past.builtins import basestring  # @IgnorePep8
-import os  # @IgnorePep8
-import logging  # @IgnorePep8
 import operator  # @IgnorePep8
 from itertools import chain  # @IgnorePep8
 from operator import xor  # @IgnorePep8
-import pickle as pkl  # @IgnorePep8
 from abc import ABCMeta, abstractmethod  # @IgnorePep8
 import sympy  # @IgnorePep8
 from sympy import sympify  # @IgnorePep8
@@ -24,7 +21,7 @@
 from nineml.abstraction.dynamics.visitors.queriers import (  # @IgnorePep8
     DynamicsDimensionResolver)
 from pype9.exceptions import Pype9RuntimeError  # @IgnorePep8
-from pype9.utils import classproperty  # @IgnorePep8
+from pype9.utils.misc import classproperty  # @IgnorePep8
 try:
     from math import gcd  # @IgnorePep8
 except ImportError:
diff --git a/pype9/simulate/nest/code_gen/base.py b/pype9/simulate/nest/code_gen/base.py
index 7f796b42..28f62d62 100644
--- a/pype9/simulate/nest/code_gen/base.py
+++ b/pype9/simulate/nest/code_gen/base.py
@@ -20,9 +20,8 @@
 import nest
 from pype9.simulate.nest.units import UnitHandler
 from pype9.simulate.common.code_gen import BaseCodeGenerator
-from pype9.utils import remove_ignore_missing
+from pype9.utils.paths import remove_ignore_missing, add_lib_path
 from pype9.exceptions import Pype9BuildError
-from pype9.utils import add_lib_path
 import pype9
 from pype9.utils.logging import logger
 
diff --git a/pype9/simulate/neuron/code_gen/base.py b/pype9/simulate/neuron/code_gen/base.py
index 6f367862..4352fb82 100644
--- a/pype9/simulate/neuron/code_gen/base.py
+++ b/pype9/simulate/neuron/code_gen/base.py
@@ -35,7 +35,7 @@
 from nineml.abstraction.dynamics.visitors.queriers import (
     DynamicsInterfaceInferer)
 from sympy.printing import ccode
-from pype9.mpi import is_mpi_master, mpi_comm
+from pype9.utils.mpi import is_mpi_master, mpi_comm
 from pype9.simulate.neuron.units import UnitHandler
 try:
     from nineml.extensions.kinetics import Kinetics  # @UnusedImport
diff --git a/pype9/utils/arguments.py b/pype9/utils/arguments.py
index 09759e9c..bb58a418 100644
--- a/pype9/utils/arguments.py
+++ b/pype9/utils/arguments.py
@@ -4,7 +4,7 @@
   License: This file is part of the "NineLine" package, which is released under
            the MIT Licence, see LICENSE for details.
 """
-# from pype9.mpi import mpi_comm
+# from pype9.utils.mpi import mpi_comm
 import os.path
 import nineml
 import ninemlcatalog