Skip to content

Commit

Permalink
Bumped NeuroTS and diameter-synthesis versions
Browse files Browse the repository at this point in the history
  • Loading branch information
adrien-berchet committed Mar 31, 2022
1 parent 6bacd19 commit 872f8ec
Show file tree
Hide file tree
Showing 10 changed files with 179 additions and 184 deletions.
8 changes: 4 additions & 4 deletions requirements/base.pip
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
atlas_analysis>0.0.1
bluepy>=2.3,<3
bluepymm
bluepyparallel
bluepyparallel>=0.0.7
brainbuilder>=0.14
diameter_synthesis>=0.2.5,<1
diameter_synthesis>=0.4.1,<1
gitpython
jinja2
joblib
Expand All @@ -17,10 +17,10 @@ neurom>=3,<4
pandas
placement_algorithm>=2.2.0
PyYAML
region_grower>=0.2.2
region_grower>=0.3.1
scipy
seaborn
tmd
neurots>=3,<4
neurots>=3.1,<4
tqdm
voxcell>=3,<4
8 changes: 1 addition & 7 deletions src/synthesis_workflow/vacuum_synthesis.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"""Functions for synthesis in vacuum to be used by luigi tasks."""
from functools import partial

import matplotlib.pyplot as plt
import numpy as np
import pandas as pd
Expand Down Expand Up @@ -77,17 +75,13 @@ def grow_vacuum_morphologies(
otherwise 'M1-M5' from TNS are allowed.
"""
global_gid = 0
# vacuum_synth_morphs_df = pd.DataFrame()
rows = []
for mtype in tqdm(mtypes):
tmd_parameters[mtype]["diameter_params"]["method"] = diametrizer
tmd_distributions["mtypes"][mtype]["diameter"]["method"] = diametrizer

if diametrizer == "external":
external_diametrizer = partial(
_external_diametrizer,
diameter_params=tmd_parameters[mtype]["diameter_params"],
)
external_diametrizer = build_diameters.build
else:
external_diametrizer = None

Expand Down
60 changes: 30 additions & 30 deletions tests/data/in_small_O1/out/synthesis/apical_points.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@
216363698b529b4a97b750923ceb3ffd: null
4462ebfc5f915ef09cfbac6e7687a66e: null
48f165d57b00c7f4781ef86f5c8cc1ab:
- -15.582808494567871
- 195.38494873046875
- 11.951404571533203
- -0.4680538475513458
- 198.25662231445312
- -8.388245582580566
4dad2986ce8349606a06e9ab85a0bcc1:
- 13.810442924499512
- 178.62054443359375
- 1.2194585800170898
- -4.403373718261719
- 136.6024627685547
- -7.630804061889648
5bc8fbbcbde5c0994164d8399f767c45: null
6018366cf658f7a75ed34fe53a096533: null
6513270e269e0d37f2a74de452e6b438: null
72e63ac7a95383221f70d5dc2e675fc7:
- 16.279451370239258
- 192.1238250732422
- 10.410905838012695
- -2.708533525466919
- 199.09312438964844
- -7.201815605163574
7b89296c6dcbac5008577eb1924770d3:
- 9.738882064819336
- 194.98228454589844
- 1.6471529006958008
- -15.83535099029541
- 196.03489685058594
- 1.0543631315231323
8575062102fbcd4f357fbc5af71a1bfc:
- 7.897195816040039
- 137.59075927734375
- -9.309407234191895
- -4.238313674926758
- 139.07034301757812
- -6.794010162353516
87751d4ca8501e2c44dcda6a797d76de:
- 4.92702054977417
- 137.34397888183594
- -5.687285423278809
- 12.631799697875977
- 135.9075469970703
- -4.667287826538086
b8a1abcd1a6916c74da4f9fc3c6da5d7: null
c15521b1b3dca50a9daa37e51b591d75:
- 19.743297576904297
- 136.77197265625
- 1.860912561416626
- 14.715275764465332
- 132.83018493652344
- -13.455227851867676
cd613e30d8f16adf91b7584a2265b1f5: null
d95bafc8f2a4d27bdcf4bb99f4bea973: null
db5b5fab8f4d3e27dda1494c73cf256d:
- 27.901477813720703
- 193.4676513671875
- -4.444892406463623
- -5.762476921081543
- 196.08946228027344
- -0.19906087219715118
e3e70682c2094cac629f6fbed82c07cd: null
e539a78bc8eff3460b12ae6ead581e57:
- -14.492266654968262
- 136.18557739257812
- 17.23952865600586
- 0.6656373739242554
- 137.11642456054688
- -0.09093667566776276
e8d79f49af6d114c4a6f188a424e617b:
- -6.783214092254639
- 139.7744598388672
- 4.914680480957031
- -4.303969860076904
- 139.21133422851562
- 2.201572895050049
Loading

0 comments on commit 872f8ec

Please sign in to comment.