Skip to content

Commit

Permalink
rebase and flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
cjayb committed Nov 12, 2020
1 parent 5c8a800 commit 2ec1d51
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions hnn_core/network_builder.py
Expand Up @@ -10,7 +10,6 @@
from .cell import _ArtificialCell
from .pyramidal import L2Pyr, L5Pyr
from .basket import L2Basket, L5Basket
from .params import create_pext

# a few globals
_PC = None
Expand Down Expand Up @@ -309,13 +308,13 @@ def _build(self):

# Create a h.Vector() with size 1xself.N_t, zero'd
self.current = {
'L5_pyramidal_soma': h.Vector(self.net.n_times, 0),
'L2_pyramidal_soma': h.Vector(self.net.n_times, 0),
'L5_pyramidal_soma': h.Vector(n_times, 0),
'L2_pyramidal_soma': h.Vector(n_times, 0),
}

self.dipoles = {
'L5_pyramidal': h.Vector(self.net.n_times, 0),
'L2_pyramidal': h.Vector(self.net.n_times, 0),
'L5_pyramidal': h.Vector(n_times, 0),
'L2_pyramidal': h.Vector(n_times, 0),
}

self._gid_assign()
Expand Down
4 changes: 2 additions & 2 deletions hnn_core/tests/test_parallel_backends.py
Expand Up @@ -31,8 +31,8 @@ def run_hnn_core(backend=None, n_procs=None, n_jobs=1, reduced=False):
'N_trials': 2})
net = Network(params)

# two trials simulated
assert len(net_reduced.trial_event_times) == params_reduced['N_trials']
# number of trials simulated
assert len(net.trial_event_times) == params['N_trials']

if backend == 'mpi':
with MPIBackend(n_procs=n_procs, mpi_cmd='mpiexec'):
Expand Down

0 comments on commit 2ec1d51

Please sign in to comment.