Delay import of rapidjson to allow for pytest execution with importlib

Author: langmm

tests/communication/transforms/test_TransformBase.py

@@ -96,7 +96,9 @@ def test_send_comm(self, class_name, python_class, testing_options,
             send_comm = new_comm('test_send', reverse_names=True,
                                  direction='send', use_async=False,
                                  transform=[python_class(**x.get('kwargs', {}))])
-            recv_comm = new_comm('test_recv', **send_comm.opp_comm_kwargs())
+            recv_comm_kwargs = send_comm.opp_comm_kwargs()
+            recv_comm_kwargs.pop('name')
+            recv_comm = new_comm('test_recv', **recv_comm_kwargs)
             if isinstance(msg_in, collections.abc.Iterator):
                 msg_out_list = list(msg_out)
                 msg_out = iter(msg_out_list)
@@ -148,6 +150,7 @@ def test_recv_comm(self, class_name, python_class, testing_options,
                                  direction='send', use_async=False)
             recv_kwargs = send_comm.opp_comm_kwargs()
             recv_kwargs['transform'] = [python_class(**x.get('kwargs', {}))]
+            recv_kwargs.pop('name')
             recv_comm = new_comm('test_recv', **recv_kwargs)
             if isinstance(msg_in, collections.abc.Iterator):
                 msg_out_list = list(msg_out)

yggdrasil/__init__.py

@@ -4,7 +4,6 @@
 import sys
 import shutil
 from yggdrasil import platform, config
-from yggdrasil.runner import YggFunction
 _test_package_name = None
 _test_package = None
 config.cfg_logging()
@@ -51,6 +50,7 @@ def import_as_function(model_yaml, service_address=None, **kwargs):
         YggFunction: Callable wrapper for model.
 
     """
+    from yggdrasil.runner import YggFunction
     return YggFunction(model_yaml, service_address=service_address, **kwargs)
 
 

yggdrasil/runner.py

@@ -16,7 +16,6 @@
 from yggdrasil.components import import_component
 from yggdrasil.multitasking import init_mpi, YggTaskLoop, AsyncResult
 from yggdrasil.drivers.DuplicatedModelDriver import DuplicatedModelDriver
-from yggdrasil.drivers.ModelDriver import ModelDriver
 from yggdrasil.broker import YggBroker
 
 
@@ -1245,6 +1244,7 @@ def distribute_mpi(self):
         size = self.mpi_comm.Get_size()
         if self.rank == 0:
             from yggdrasil.communication.MPIComm import MPIComm
+            from yggdrasil.drivers.ModelDriver import ModelDriver
             self.expand_duplicates()
             # Set the rank and index for each model
             for i, v in enumerate(self.modeldrivers.values()):