bluecellulab 2.6.4__tar.gz → 2.6.5__tar.gz

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bluecellulab
-Version: 2.6.4
+Version: 2.6.5
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0
@@ -26,6 +26,7 @@ Requires-Dist: bluepysnap<4.0.0,>=3.0.0
 Requires-Dist: pydantic<3.0.0,>=2.5.2
 Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: networkx>=3.1
+Requires-Dist: h5py>=3.11.0
 
 |banner|
 

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/bluecellulab/circuit/simulation_access.py

@@ -18,6 +18,7 @@ import logging
 from pathlib import Path
 from typing import Optional, Protocol
 
+import h5py
 import pandas as pd
 
 from bluecellulab.circuit.config import SimulationConfig, SonataSimulationConfig
@@ -172,12 +173,14 @@ class SonataSimulationAccess:
 
 def get_synapse_replay_spikes(f_name: str) -> dict:
     """Read the .dat file containing the spike replays."""
-    data = np.genfromtxt(f_name, skip_header=1)
-    spikes = pd.DataFrame(data=data, columns=["t", "node_id"]).astype({"node_id": int})
-    # subtract 1 from all node_ids to make them 0-based
-    # source: https://sonata-extension.readthedocs.io/
-    # en/latest/blueconfig-projection-example.html#dat-spike-files
-    spikes["node_id"] -= 1
+    with h5py.File(f_name, 'r') as f:
+        # Access the timestamps and node_ids datasets
+        timestamps = f['/spikes/All/timestamps'][:]
+        node_ids = f['/spikes/All/node_ids'][:]
+
+        spikes = pd.DataFrame(data={'t': timestamps, 'node_id': node_ids})
+        spikes = spikes.astype({"node_id": int})
+
     if (spikes["t"] < 0).any():
         logger.warning("Found negative spike times... Clipping them to 0")
         spikes["t"].clip(lower=0., inplace=True)

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/bluecellulab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bluecellulab
-Version: 2.6.4
+Version: 2.6.5
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0
@@ -26,6 +26,7 @@ Requires-Dist: bluepysnap<4.0.0,>=3.0.0
 Requires-Dist: pydantic<3.0.0,>=2.5.2
 Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: networkx>=3.1
+Requires-Dist: h5py>=3.11.0
 
 |banner|
 

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/bluecellulab.egg-info/SOURCES.txt

@@ -210,7 +210,7 @@ tests/test_tools.py
 tests/test_ttx.py
 tests/test_utils.py
 tests/test_verbosity.py
-tests/data/synapse_replay_file/spikes.dat
+tests/data/synapse_replay_file/spikes.h5
 tests/examples/ballstick_cell/analytic_expsyn.txt
 tests/examples/ballstick_cell/ballstick.asc
 tests/examples/ballstick_cell/ballstick.hoc
@@ -345,7 +345,7 @@ tests/examples/sonata_unit_test_sims/projections/output_sonata/soma.h5
 tests/examples/sonata_unit_test_sims/synapse_replay/circuit_config.json
 tests/examples/sonata_unit_test_sims/synapse_replay/node_sets.json
 tests/examples/sonata_unit_test_sims/synapse_replay/simulation_config.json
-tests/examples/sonata_unit_test_sims/synapse_replay/synapse_replay.dat
+tests/examples/sonata_unit_test_sims/synapse_replay/synapse_replay.h5
 tests/examples/tapertest_cells/notaper_cell.hoc
 tests/examples/tapertest_cells/taper_cell.hoc
 tests/examples/tapertest_cells/test_cell.asc

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/bluecellulab.egg-info/requires.txt

@@ -6,3 +6,4 @@ bluepysnap<4.0.0,>=3.0.0
 pydantic<3.0.0,>=2.5.2
 typing-extensions>=4.8.0
 networkx>=3.1
+h5py>=3.11.0

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/pyproject.toml

@@ -36,6 +36,7 @@ dependencies = [
     "pydantic>=2.5.2,<3.0.0",
     "typing-extensions>=4.8.0",
     "networkx>=3.1",
+    "h5py>=3.11.0",
 ]
 requires-python = ">=3.8"
 

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/tests/examples/sonata_unit_test_sims/synapse_replay/simulation_config.json

@@ -25,7 +25,7 @@
       "delay": 0.0,
       "duration": 300.0,
       "module": "synapse_replay",
-      "spike_file": "tests/examples/sonata_unit_test_sims/synapse_replay/synapse_replay.dat"
+      "spike_file": "tests/examples/sonata_unit_test_sims/synapse_replay/synapse_replay.h5"
       }
   },
   "connection_overrides": [

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/tests/test_circuit/test_simulation_access.py

@@ -85,7 +85,7 @@ class TestSonataSimulationAccess:
 def test_get_synapse_replay_spikes():
     """.Test get_synapse_replay_spikes."""
     res = get_synapse_replay_spikes(
-        parent_dir / "data" / "synapse_replay_file" / "spikes.dat"
+        parent_dir / "data" / "synapse_replay_file" / "spikes.h5"
     )
     assert set(res.keys()) == {5382}
     assert res[5382].tolist() == [1500.0, 2000.0, 2500.0]

{bluecellulab-2.6.4 → bluecellulab-2.6.5}/tox.ini

@@ -15,7 +15,6 @@ deps =
     pytest-timeout>=2.1.0
     pytest-xdist>=3.3.1  # multiprocessing
     pytest-forked>=1.6.0  # isolation
-    libsonata<=0.1.25  # 0.1.26 supports h5 synapse_replay only, some of our tests atm use .dat
 download = true
 allowlist_externals =
     make

bluecellulab-2.6.4/tests/data/synapse_replay_file/spikes.dat

@@ -1,4 +0,0 @@
-/scatter
-1500.0 5383
-2000.0 5383
-2500.0 5383

bluecellulab-2.6.4/tests/examples/sonata_unit_test_sims/synapse_replay/synapse_replay.dat

@@ -1,16 +0,0 @@
-/scatter
-15.0 1
-20.0 1
-45.0 1
-16.0 2
-22.0 2
-48.0 2
-15.0 3
-20.0 3
-45.0 3
-15.0 4
-20.0 4
-45.0 4
-15.0 5
-20.0 5
-45.0 5