bsb-arbor 0.0.0b0__py2.py3-none-any.whl → 0.0.0b1__py2.py3-none-any.whl

bsb_arbor/__init__.py

@@ -3,9 +3,10 @@ Arbor simulation adapter for the BSB framework
 """
 
 from bsb.simulation import SimulationBackendPlugin
-from .simulation import ArborSimulation
-from .adapter import ArborAdapter
+
 from . import devices
+from .adapter import ArborAdapter
+from .simulation import ArborSimulation
 
-__version__ = "0.0.0b0"
+__version__ = "0.0.0b1"
 __plugin__ = SimulationBackendPlugin(Simulation=ArborSimulation, Adapter=ArborAdapter)

bsb_arbor/adapter.py

@@ -1,14 +1,13 @@
 import itertools
+import itertools as it
+import time
 import typing
 
-from bsb.reporting import report, warn
+import arbor
 from bsb.exceptions import AdapterError, UnknownGIDError
+from bsb.reporting import report, warn
 from bsb.services import MPI
 from bsb.simulation.adapter import SimulationData, SimulatorAdapter
-import itertools as it
-import time
-import arbor
-
 from bsb.storage import Chunk
 
 if typing.TYPE_CHECKING:
@@ -79,7 +78,9 @@ class Population:
         return ranges
 
     def __iter__(self):
-        yield from itertools.chain.from_iterable(range(r[0], r[1]) for r in self._ranges)
+        yield from itertools.chain.from_iterable(
+            range(r[0], r[1]) for r in self._ranges
+        )
 
 
 class GIDManager:
@@ -266,7 +267,12 @@ class ArborAdapter(SimulatorAdapter):
         for device in simulation.devices.values():
             device.prepare_samples(simdata)
 
-    def run(self, simulation):
+    def run(self, *simulations):
+        if len(simulations) != 1:
+            raise RuntimeError(
+                "Can not run multiple simultaneous simulations. Composition not implemented."
+            )
+        simulation = simulations[0]
         try:
             simdata = self.simdata[simulation]
             arbor_sim = simdata.arbor_sim
@@ -285,7 +291,7 @@ class ArborAdapter(SimulatorAdapter):
             if simulation.profiling and arbor.config()["profiling"]:
                 report("printing profiler summary", level=2)
                 report(arbor.profiler_summary(), level=1)
-            return simdata.result
+            return [simdata.result]
         finally:
             del self.simdata[simulation]
 

bsb_arbor/cell.py

@@ -1,11 +1,11 @@
 import abc
 import typing
 
+import arbor
 from bsb import config
 from bsb.config import types
 from bsb.exceptions import ConfigurationError
 from bsb.simulation.cell import CellModel
-import arbor
 
 from .adapter import SingleReceiverCollection
 

bsb_arbor/connection.py

@@ -1,8 +1,7 @@
+import arbor
 import tqdm
-
 from bsb import config
 from bsb.simulation.connection import ConnectionModel
-import arbor
 
 
 class Receiver:
@@ -63,5 +62,7 @@ class ArborConnection(ConnectionModel):
 
     def gap_junction(self, conn):
         l = arbor.cell_local_label(f"gap_{conn.to_compartment.id}")
-        g = arbor.cell_global_label(int(conn.from_id), f"gap_{conn.from_compartment.id}")
+        g = arbor.cell_global_label(
+            int(conn.from_id), f"gap_{conn.from_compartment.id}"
+        )
         return arbor.gap_junction_connection(g, l, self.weight)

bsb_arbor/device.py

@@ -1,12 +1,11 @@
 import abc
 
+import arbor
 from bsb import config
 from bsb.config import types
 from bsb.simulation.device import DeviceModel
 from bsb.simulation.targetting import Targetting
 
-import arbor
-
 
 @config.dynamic(attr_name="device", auto_classmap=True, classmap_entry=None)
 class ArborDevice(DeviceModel):

bsb_arbor/devices/__init__.py

@@ -1,3 +1,3 @@
 from .poisson_generator import PoissonGenerator
-from .spike_recorder import SpikeRecorder
 from .probe import Probe
+from .spike_recorder import SpikeRecorder

bsb_arbor/devices/poisson_generator.py

@@ -1,7 +1,8 @@
+import arbor
 from bsb import config
+
 from ..connection import Receiver
 from ..device import ArborDevice
-import arbor
 
 
 @config.node

bsb_arbor/devices/probe.py

@@ -1,6 +1,7 @@
-from ..device import ArborDevice
-from bsb.exceptions import ConfigurationError
 import arbor
+from bsb.exceptions import ConfigurationError
+
+from ..device import ArborDevice
 
 
 class Probe(ArborDevice):

bsb_arbor/devices/spike_recorder.py

@@ -1,7 +1,7 @@
 import neo
-
 from bsb import config
 from bsb.services import MPI
+
 from ..device import ArborDevice
 
 

bsb_arbor/simulation.py

@@ -2,6 +2,7 @@ import psutil
 from bsb import config
 from bsb.config import types
 from bsb.simulation.simulation import Simulation
+
 from .cell import ArborCell
 from .connection import ArborConnection
 from .device import ArborDevice

{bsb_arbor-0.0.0b0.dist-info → bsb_arbor-0.0.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bsb-arbor
-Version: 0.0.0b0
+Version: 0.0.0b1
 Summary: Arbor simulation adapter for the BSB framework
 Author-email: Robin De Schepper <robingilbert.deschepper@unipv.it>
 Description-Content-Type: text/markdown
@@ -8,7 +8,9 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Requires-Dist: bsb-core>=4.0.0b0,<=4.0.0b9999
 Requires-Dist: arbor~=0.9
 Requires-Dist: arborize[arbor]>=4.0.0b1
+Requires-Dist: bsb-core[parallel] ; extra == "test"
 Requires-Dist: bsb-test>=0.0.0b0 ; extra == "test"
+Requires-Dist: coverage~=7.0 ; extra == "test"
 Provides-Extra: test
 
 # bsb-arbor

bsb_arbor-0.0.0b1.dist-info/RECORD

@@ -0,0 +1,15 @@
+bsb_arbor/__init__.py,sha256=Yv0mb912WIOOdwQlrHykIgU_olkGCyL85G9Bis7En_c,316
+bsb_arbor/adapter.py,sha256=qJBT7BY8JIWtpK6e_SpTdrHHc72b_6tV-sWY70rCmGw,13512
+bsb_arbor/cell.py,sha256=xMtSVJTx20hxT-MgqsTeGR0hieWNxI4EXOlCEPz8a8U,2176
+bsb_arbor/connection.py,sha256=ZKz9qbMXpVHnqgzY3d0DevLZ1G0iaZMm2JEUF8DHFug,2285
+bsb_arbor/device.py,sha256=QCoUyAtT0RtgqoGa5O69RHp1kmm1Uj3DYh_M91_8cHU,1527
+bsb_arbor/simulation.py,sha256=iwFxCPFFGI7_K_Tcxd0ZJjvegJgbjSTbzx20MMeM45g,788
+bsb_arbor/devices/__init__.py,sha256=2kKiJZr9ZVXM9ZmR8GsVLnx_ZzFKYZd7pxLL238_EQc,115
+bsb_arbor/devices/poisson_generator.py,sha256=noBN5bjF8C_2ja_znJwvFx3kjrxDr1V_RUFjTgUvyz4,727
+bsb_arbor/devices/probe.py,sha256=3S0ztYAgsjX2CNLw7-wku5J8ku6diKWKLBq4MI9F-nM,1707
+bsb_arbor/devices/spike_recorder.py,sha256=WWyHPq8_Me9XEdqxpHPY6Gv17lv5m1UENQZDYQ_lEu0,1332
+bsb_arbor-0.0.0b1.dist-info/entry_points.txt,sha256=8z5oyflKGOBD2smUKyrUit-_2JqBs85g8rm5YOM8SYg,43
+bsb_arbor-0.0.0b1.dist-info/LICENSE,sha256=0SAgqCl8RI6Vm7Rv5YC6CPyLA2MXedQM9tq17WMXl-o,33041
+bsb_arbor-0.0.0b1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+bsb_arbor-0.0.0b1.dist-info/METADATA,sha256=-N8LwRL_yT2L6RLOO2FwUEuY9-qJ8q7LBhUg8VuULYI,602
+bsb_arbor-0.0.0b1.dist-info/RECORD,,

bsb_arbor-0.0.0b0.dist-info/RECORD

@@ -1,15 +0,0 @@
-bsb_arbor/__init__.py,sha256=LqDOo29O6WXtFllX71ql5jw-xQvSD0Hxy5WODSiy1QI,315
-bsb_arbor/adapter.py,sha256=Y8XD9FyT3Lksq81Absd54IS9h1fPDWlh3R6PxbxNtIc,13277
-bsb_arbor/cell.py,sha256=3MGxv1q54oOvBxr_q2-RIoSjKA9us7lbyJY8U6i57xA,2176
-bsb_arbor/connection.py,sha256=KBuBAVZ06_25Oe4cd1Eiq3EoDaNUDk7MuuEWPfy4O0Y,2264
-bsb_arbor/device.py,sha256=uy8ZAdWcCuDJyPg-LnblsGIT4sCLVpYL1mjRNbfo6y0,1528
-bsb_arbor/simulation.py,sha256=D1cACVVABHqhbuTJYP1CizAC271Ii3GpCShfJlxI5Go,787
-bsb_arbor/devices/__init__.py,sha256=2nRCOpgKognnAyjlTBp6Kh8MYhH6FBeDaN_G636W8o8,115
-bsb_arbor/devices/poisson_generator.py,sha256=yvCtDY_uyqpzGNC_s9i0opXi0Eoshm81hShifaEm_QM,726
-bsb_arbor/devices/probe.py,sha256=5Pu8oCLdXuoiVNxqHUNpfLSlud3wvUZDzrY7OgJkxoU,1706
-bsb_arbor/devices/spike_recorder.py,sha256=D-TURub9v83g2B8nxa4akqM8BUcUIi_dzK63WWtLl0U,1332
-bsb_arbor-0.0.0b0.dist-info/entry_points.txt,sha256=8z5oyflKGOBD2smUKyrUit-_2JqBs85g8rm5YOM8SYg,43
-bsb_arbor-0.0.0b0.dist-info/LICENSE,sha256=0SAgqCl8RI6Vm7Rv5YC6CPyLA2MXedQM9tq17WMXl-o,33041
-bsb_arbor-0.0.0b0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-bsb_arbor-0.0.0b0.dist-info/METADATA,sha256=63Pjj_lklIFqdwHuVU-RXB01_HPRdrEfVG-c-bjPerI,503
-bsb_arbor-0.0.0b0.dist-info/RECORD,,