Skip to content

Commit

Permalink
Create distributions for axon according to https://bbpcode.epfl.ch/co…
Browse files Browse the repository at this point in the history
…de/\#/c/52107

Change-Id: I33b12698a15a84444038c00b8d502dc33192e219
  • Loading branch information
adrien-berchet committed Apr 20, 2021
1 parent 608b92f commit 8fa1ecc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
}


# pylint: disable=unused-argument
# pylint: disable=unused-argument,protected-access
def maybe_skip_member(app, what, name, obj, skip, options):
"""Skip and update documented objects."""
skip = None
Expand Down
2 changes: 1 addition & 1 deletion requirements.pip
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PyYAML
region_grower>=0.1.10
scipy
seaborn
tns>=2.2.7,<2.3
tns>=2.3.0
tmd
tqdm
voxcell>=3
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"bluepyefe",
"bluepyopt",
"bluepymm",
"diameter_synthesis>=0.1.7",
"diameter_synthesis>=0.1.8",
"gitpython",
"jinja2",
"joblib",
Expand All @@ -35,7 +35,7 @@
"pandas",
"placement_algorithm>=2.1.2",
"PyYAML",
"region_grower==0.1.11",
"region_grower>=0.1.11,<0.2",
"scipy",
"seaborn",
"tns>=2.3.3",
Expand Down
8 changes: 6 additions & 2 deletions src/synthesis_workflow/synthesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
def get_neurite_types(morphs_df, mtypes):
"""Get the neurite types to consider for PC or IN cells."""
return {
mtype: ["basal"]
mtype: ["basal", "axon"]
if morphs_df.loc[morphs_df.mtype == mtype, "morph_class"].tolist()[0] == "IN"
else ["basal", "apical"]
else ["basal", "apical", "axon"]
for mtype in mtypes
}

Expand Down Expand Up @@ -335,6 +335,8 @@ def run_synthesize_morphologies(kwargs, nb_jobs=-1, debug_scales_path=None):
"scaling-jitter-std",
"rotational-jitter-std",
"no-mpi",
"out-apical-NRN-sections",
"out-apical-sections",
]
]

Expand All @@ -352,6 +354,8 @@ def run_synthesize_morphologies(kwargs, nb_jobs=-1, debug_scales_path=None):
"scaling_jitter_std": None,
"rotational_jitter_std": None,
"seed": 0,
"out-apical-NRN-sections": None,
"out-apical-sections": None,
}

if kwargs.pop("apply_jitter", False):
Expand Down
2 changes: 2 additions & 0 deletions src/synthesis_workflow/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ def run_master(
handlers.add(i)

# shuffle ids to speed up computation with uneven cell complexities
if hasattr(args, "seed"):
np.random.seed(args.seed)
task_ids = np.random.permutation(master.task_ids)

# Run the worker
Expand Down

0 comments on commit 8fa1ecc

Please sign in to comment.