bluecellulab 1.2.5__py3-none-any.whl → 1.2.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of bluecellulab might be problematic. Click here for more details.
- bluecellulab/cell/template.py +25 -37
- bluecellulab/circuit/config/simulation_config.py +0 -5
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/METADATA +2 -2
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/RECORD +8 -8
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/AUTHORS.txt +0 -0
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/LICENSE +0 -0
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/WHEEL +0 -0
- {bluecellulab-1.2.5.dist-info → bluecellulab-1.2.7.dist-info}/top_level.txt +0 -0
bluecellulab/cell/template.py
CHANGED
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
|
|
16
16
|
from __future__ import annotations
|
|
17
17
|
|
|
18
|
-
import datetime
|
|
19
18
|
import hashlib
|
|
20
19
|
import os
|
|
21
20
|
from pathlib import Path
|
|
@@ -111,45 +110,34 @@ class NeuronTemplate:
|
|
|
111
110
|
match = re.search(r"begintemplate\s*(\S*)", template_content)
|
|
112
111
|
template_name = match.group(1) # type:ignore
|
|
113
112
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if template_name in cls.used_template_names:
|
|
127
|
-
new_template_name = template_name
|
|
128
|
-
while new_template_name in cls.used_template_names:
|
|
129
|
-
new_template_name = "%s_x" % new_template_name
|
|
130
|
-
new_template_name = get_neuron_compliant_template_name(
|
|
131
|
-
new_template_name
|
|
132
|
-
)
|
|
113
|
+
logger.info("This Neuron version supports renaming templates, enabling...")
|
|
114
|
+
# add bluecellulab to the template name, so that we don't interfere with
|
|
115
|
+
# templates load outside of bluecellulab
|
|
116
|
+
template_name = "%s_bluecellulab" % template_name
|
|
117
|
+
template_name = get_neuron_compliant_template_name(template_name)
|
|
118
|
+
if template_name in cls.used_template_names:
|
|
119
|
+
new_template_name = template_name
|
|
120
|
+
while new_template_name in cls.used_template_names:
|
|
121
|
+
new_template_name = "%s_x" % new_template_name
|
|
122
|
+
new_template_name = get_neuron_compliant_template_name(
|
|
123
|
+
new_template_name
|
|
124
|
+
)
|
|
133
125
|
|
|
134
|
-
|
|
126
|
+
template_name = new_template_name
|
|
135
127
|
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
128
|
+
cls.used_template_names.add(template_name)
|
|
129
|
+
template_content = re.sub(
|
|
130
|
+
r"begintemplate\s*(\S*)",
|
|
131
|
+
"begintemplate %s" % template_name,
|
|
132
|
+
template_content,
|
|
133
|
+
)
|
|
134
|
+
template_content = re.sub(
|
|
135
|
+
r"endtemplate\s*(\S*)",
|
|
136
|
+
"endtemplate %s" % template_name,
|
|
137
|
+
template_content,
|
|
138
|
+
)
|
|
147
139
|
|
|
148
|
-
|
|
149
|
-
else:
|
|
150
|
-
logger.info("This Neuron version doesn't support renaming "
|
|
151
|
-
"templates, disabling...")
|
|
152
|
-
bluecellulab.neuron.h.load_file(template_filename)
|
|
140
|
+
bluecellulab.neuron.h(template_content)
|
|
153
141
|
|
|
154
142
|
return template_name
|
|
155
143
|
|
|
@@ -25,7 +25,6 @@ if BLUEPY_AVAILABLE:
|
|
|
25
25
|
from bluepy_configfile.configfile import BlueConfig
|
|
26
26
|
from bluepy.utils import open_utf8
|
|
27
27
|
from bluepysnap import Simulation as SnapSimulation
|
|
28
|
-
from bluepysnap.circuit_validation import validate as validate_circuit
|
|
29
28
|
|
|
30
29
|
from bluecellulab.circuit.config.sections import Conditions, ConnectionOverrides
|
|
31
30
|
from bluecellulab.stimuli import Stimulus
|
|
@@ -308,10 +307,6 @@ class SonataSimulationConfig:
|
|
|
308
307
|
else:
|
|
309
308
|
raise TypeError("Invalid config type.")
|
|
310
309
|
|
|
311
|
-
# run snap's circuit validation to early detect errors
|
|
312
|
-
circuit_config_path = self.impl.config["network"]
|
|
313
|
-
validate_circuit(circuit_config_path, skip_slow=False, only_errors=True)
|
|
314
|
-
|
|
315
310
|
def get_all_projection_names(self) -> list[str]:
|
|
316
311
|
unique_names = {
|
|
317
312
|
n
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: bluecellulab
|
|
3
|
-
Version: 1.2.
|
|
3
|
+
Version: 1.2.7
|
|
4
4
|
Summary: The Pythonic Blue Brain simulator access
|
|
5
5
|
Home-page: https://github.com/BlueBrain/BlueCelluLab
|
|
6
6
|
Author: Blue Brain Project, EPFL
|
|
@@ -71,7 +71,7 @@ Main dependencies
|
|
|
71
71
|
=================
|
|
72
72
|
|
|
73
73
|
* `Python 3.8+ <https://www.python.org/downloads/release/python-380/>`_
|
|
74
|
-
* `Neuron
|
|
74
|
+
* `Neuron 8.0.2+ <https://pypi.org/project/NEURON/>`_
|
|
75
75
|
|
|
76
76
|
Installation
|
|
77
77
|
============
|
|
@@ -21,7 +21,7 @@ bluecellulab/cell/section_distance.py,sha256=ZgqFkN5gFfPxDEAIjEZEiLp_EpxLHxKWsQ_
|
|
|
21
21
|
bluecellulab/cell/serialized_sections.py,sha256=gKM_IaDV5fZ35v3AWYN5-lyEopYsBlEu0cSJerQMJyw,1403
|
|
22
22
|
bluecellulab/cell/sonata_proxy.py,sha256=NU2VxE0emQjd8HPpNgqPg4c7HD91PIME9lxXeLwfz0M,1529
|
|
23
23
|
bluecellulab/cell/stimuli_generator.py,sha256=jd4fQJ1Q6QvxR_nGLo6XKxkAs8ogamcUDWf1qCQbB3g,6508
|
|
24
|
-
bluecellulab/cell/template.py,sha256=
|
|
24
|
+
bluecellulab/cell/template.py,sha256=viNB__3NUUpb9DDkcG8LvLJU2duVogp3t69IUJKVffM,8318
|
|
25
25
|
bluecellulab/cell/ballstick/__init__.py,sha256=vywMSPAeTuCcK_E9gD8UX2XD1KfKbfCVFOFnFSgznzg,450
|
|
26
26
|
bluecellulab/cell/ballstick/emodel.hoc,sha256=PtgCphFV1LWc9bw9e3QMz-1ir1N5aZTM6TsYzfrS-UU,1746
|
|
27
27
|
bluecellulab/cell/ballstick/morphology.asc,sha256=EO0VIRilJAwpiDP2hIevwusfvYptNYhvsu1f5GgbSQo,190
|
|
@@ -35,7 +35,7 @@ bluecellulab/circuit/synapse_properties.py,sha256=mUQa1nEr7hjETFptX7W9EDlaDyPhlq
|
|
|
35
35
|
bluecellulab/circuit/validate.py,sha256=-h3PMrIyX51ZEd3NqaeTp-gWrQj_yt2dH3Jz0l6cZAQ,3593
|
|
36
36
|
bluecellulab/circuit/config/__init__.py,sha256=gv0VV47FtvVBWz8cmS6obRqELvFJPftyRbBnwB3PNdc,148
|
|
37
37
|
bluecellulab/circuit/config/sections.py,sha256=OG4yKQU6jhGx7waLyblZKZ93h9Gp00yAzaDz9nnB6BQ,6905
|
|
38
|
-
bluecellulab/circuit/config/simulation_config.py,sha256=
|
|
38
|
+
bluecellulab/circuit/config/simulation_config.py,sha256=EvGvRLYouHvjWejQEXkPpwK_M3wtVabcwI9E0DVRMKA,13437
|
|
39
39
|
bluecellulab/hoc/Cell.hoc,sha256=z77qRQG_-afj-RLX0xN6V-K6Duq3bR7vmlDrGWPdh4E,16435
|
|
40
40
|
bluecellulab/hoc/RNGSettings.hoc,sha256=wOtPxVMkCBTHsFLs5jPMKyverm1llXqaX8VKsAX43r8,1413
|
|
41
41
|
bluecellulab/hoc/TDistFunc.hoc,sha256=WKX-anvL83xGuGPH9g1oIORB17UM4Pi3-iIXzKO-pUQ,2663
|
|
@@ -48,9 +48,9 @@ bluecellulab/synapse/__init__.py,sha256=mgrricA5NRNxntsEJFzuJTScr9MKY1FUFxCoVe4J
|
|
|
48
48
|
bluecellulab/synapse/synapse_factory.py,sha256=SeDf5bK_yjbJzMEW7EQPPG6vyeaSt6MyzUgvu87kfrQ,3475
|
|
49
49
|
bluecellulab/synapse/synapse_params.py,sha256=eAnUmTQlcYOoa7o7obkaF8G04w2C8_-4fxc8Q6v335I,2276
|
|
50
50
|
bluecellulab/synapse/synapse_types.py,sha256=VZZU6SAhVpMbCk1HkZU2cZnq-h-Yxt2dMHmSawDapHw,17007
|
|
51
|
-
bluecellulab-1.2.
|
|
52
|
-
bluecellulab-1.2.
|
|
53
|
-
bluecellulab-1.2.
|
|
54
|
-
bluecellulab-1.2.
|
|
55
|
-
bluecellulab-1.2.
|
|
56
|
-
bluecellulab-1.2.
|
|
51
|
+
bluecellulab-1.2.7.dist-info/AUTHORS.txt,sha256=EDs3H-2HXBojbma10psixk3C2rFiOCTIREi2ZAbXYNQ,179
|
|
52
|
+
bluecellulab-1.2.7.dist-info/LICENSE,sha256=xOouu1gC1GGklDxkITlaVl60I9Ab860O-nZsFbWydvU,11749
|
|
53
|
+
bluecellulab-1.2.7.dist-info/METADATA,sha256=KLU_ek5VukRAxxwP5cX17S2-8Dnb2Jupd1qgZcKffQk,6065
|
|
54
|
+
bluecellulab-1.2.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
|
|
55
|
+
bluecellulab-1.2.7.dist-info/top_level.txt,sha256=VSyEP8w9l3pXdRkyP_goeMwiNA8KWwitfAqUkveJkdQ,13
|
|
56
|
+
bluecellulab-1.2.7.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|