Skip to content

Commit 2bcec7f

Browse files
committed
do not set frozen flags for the parameters for running purposes
1 parent 70aaacb commit 2bcec7f

File tree

7 files changed

+0
-49
lines changed

7 files changed

+0
-49
lines changed

emodelrunner/GUI_utils/simulator.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ def load_synapse_display_data(self):
491491

492492
def instantiate(self):
493493
"""Instantiate cell, simulation & protocol."""
494-
self.cell.freeze(self.release_params)
495494
self.cell.instantiate(sim=self.sim)
496495
self.protocol.instantiate(sim=self.sim, cell_model=self.cell)
497496
self.sim.neuron.h.tstop = self.protocol.total_duration
@@ -501,7 +500,6 @@ def destroy(self):
501500
"""Destroy cell & protocol."""
502501
self.protocol.destroy(sim=self.sim)
503502
self.cell.destroy(sim=self.sim)
504-
self.cell.unfreeze(self.release_params.keys())
505503

506504
def get_voltage(self):
507505
"""Returns voltage response.

emodelrunner/cell.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,6 @@ def get_replace_axon(self):
9999

100100
return replace_axon
101101

102-
def freeze_params(self, param_values):
103-
"""Freeze params and return list of params to unfreze afterwards.
104-
105-
Args:
106-
param_values (dict): contains values of the optimized parameters
107-
108-
Returns:
109-
list: names of the newly frozen parameters
110-
"""
111-
to_unfreeze = []
112-
for param in self.params.values():
113-
if not param.frozen:
114-
param.freeze(param_values[param.name])
115-
to_unfreeze.append(param.name)
116-
117-
return to_unfreeze
118-
119102
def remove_point_process_mechs(self):
120103
"""Return mechanisms without point process mechanisms.
121104
@@ -157,8 +140,6 @@ def create_custom_hoc(
157140
str: hoc script describing this cell model
158141
"""
159142
# pylint: disable=too-many-arguments
160-
to_unfreeze = self.freeze_params(param_values)
161-
162143
replace_axon = self.get_replace_axon()
163144

164145
mechs = self.remove_point_process_mechs()
@@ -176,9 +157,6 @@ def create_custom_hoc(
176157
syn_hoc_filename=syn_hoc_filename,
177158
syn_dir=syn_dir,
178159
)
179-
180-
self.unfreeze(to_unfreeze)
181-
182160
return ret
183161

184162
@staticmethod

emodelrunner/load.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,8 @@ def load_unoptimized_parameters(params_path, v_init, celsius):
210210
param_name = param_config["name"]
211211

212212
if isinstance(param_config["val"], (list, tuple)):
213-
is_frozen = False
214213
value = None
215-
216214
else:
217-
is_frozen = True
218215
value = param_config["val"]
219216

220217
if is_global:
@@ -227,7 +224,6 @@ def load_unoptimized_parameters(params_path, v_init, celsius):
227224
ephys.parameters.NrnGlobalParameter(
228225
name=param_name,
229226
param_name=param_name,
230-
frozen=is_frozen,
231227
value=value,
232228
)
233229
)
@@ -237,7 +233,6 @@ def load_unoptimized_parameters(params_path, v_init, celsius):
237233
name=f"{param_name}.{sectionlist}",
238234
obj=dist,
239235
attr_name=param_name,
240-
frozen=is_frozen,
241236
value=value,
242237
)
243238
)
@@ -257,7 +252,6 @@ def load_unoptimized_parameters(params_path, v_init, celsius):
257252
param_name=param_name,
258253
value_scaler=dist,
259254
value=value,
260-
frozen=is_frozen,
261255
locations=seclist_locs,
262256
)
263257
)
@@ -268,7 +262,6 @@ def load_unoptimized_parameters(params_path, v_init, celsius):
268262
param_name=param_name,
269263
value_scaler=dist,
270264
value=value,
271-
frozen=is_frozen,
272265
locations=seclist_locs,
273266
)
274267
)

emodelrunner/protocols/sscx_protocols.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ def run(self, cell_model, param_values, sim=None, isolate=None):
166166
# pylint: disable=unused-argument
167167
responses = collections.OrderedDict()
168168

169-
cell_model.freeze(param_values)
170-
171169
# Find resting membrane potential
172170
rmp_response = self.rmp_protocol.run(cell_model, {}, sim=sim)
173171
responses.update(rmp_response)
@@ -194,8 +192,6 @@ def run(self, cell_model, param_values, sim=None, isolate=None):
194192
self.run_pre_protocols(responses, cell_model, sim)
195193
self.run_other_protocols(responses, cell_model, sim)
196194

197-
cell_model.unfreeze(param_values.keys())
198-
199195
return responses
200196

201197
def generate_current(self, threshold_current=None, holding_current=None, dt=0.1):

emodelrunner/protocols/synplas_protocols.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def _run_func(self, cell_model, param_values, sim=None):
106106
"""
107107
# pylint: disable=raise-missing-from
108108
try:
109-
cell_model.freeze(param_values)
110109
cell_model.instantiate(sim=sim)
111110

112111
self.instantiate(sim=sim, cell_model=cell_model)
@@ -135,8 +134,6 @@ def _run_func(self, cell_model, param_values, sim=None):
135134

136135
cell_model.destroy(sim=sim)
137136

138-
cell_model.unfreeze(param_values.keys())
139-
140137
return responses
141138
except BaseException:
142139
raise RuntimeError("".join(traceback.format_exception(*sys.exc_info())))
@@ -252,10 +249,8 @@ def _run_func(
252249
"""
253250
# pylint: disable=raise-missing-from
254251
try:
255-
precell_model.freeze(pre_param_values)
256252
precell_model.instantiate(sim=sim)
257253

258-
postcell_model.freeze(post_param_values)
259254
postcell_model.instantiate(sim=sim)
260255

261256
self.instantiate(
@@ -293,9 +288,6 @@ def _run_func(
293288
precell_model.destroy(sim=sim)
294289
postcell_model.destroy(sim=sim)
295290

296-
precell_model.unfreeze(pre_param_values.keys())
297-
postcell_model.unfreeze(post_param_values.keys())
298-
299291
return responses
300292
except BaseException:
301293
raise RuntimeError("".join(traceback.format_exception(*sys.exc_info())))

emodelrunner/protocols/thalamus_protocols.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ def run(self, cell_model, param_values, sim=None, isolate=None):
123123
# pylint: disable=unused-argument
124124
responses = collections.OrderedDict()
125125

126-
cell_model.freeze(param_values)
127-
128126
# Find resting membrane potential
129127
logger.info("Running RMP protocol")
130128
rmp_response = self.rmp_protocol.run(cell_model, {}, sim=sim)
@@ -181,8 +179,6 @@ def run(self, cell_model, param_values, sim=None, isolate=None):
181179
self._run_pre_protocols(cell_model, sim, responses)
182180
self._run_other_protocols(cell_model, sim, responses)
183181

184-
cell_model.unfreeze(param_values.keys())
185-
186182
return responses
187183

188184
def _run_pre_protocols(self, cell_model, sim, responses):

tests/unit_tests/test_GUI_simulator_class.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ def test_load_synapse_display_data(self):
9898
with cwd(example_dir):
9999
self.simulator.load_cell_sim()
100100
self.simulator.sim.mechanisms_directory = "./"
101-
self.simulator.cell.freeze(self.simulator.release_params)
102101
self.simulator.cell.instantiate(sim=self.simulator.sim)
103102

104103
assert self.simulator.syn_display_data is None
@@ -114,4 +113,3 @@ def test_load_synapse_display_data(self):
114113

115114
# destroy cell
116115
self.simulator.cell.destroy(sim=self.simulator.sim)
117-
self.simulator.cell.unfreeze(self.simulator.release_params.keys())

0 commit comments

Comments
 (0)