Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
BluePyMM
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BlueBrain
BluePyMM
Commits
d09a5e45
Unverified
Commit
d09a5e45
authored
2 years ago
by
Werner Alfons Hilda Van Geit
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #258 from anilbey/pandas2.0
Pandas2.0 support
parents
a5419ed8
f4e0f898
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bluepymm/select_combos/reporting.py
+14
-5
14 additions, 5 deletions
bluepymm/select_combos/reporting.py
bluepymm/select_combos/table_processing.py
+1
-1
1 addition, 1 deletion
bluepymm/select_combos/table_processing.py
setup.py
+11
-2
11 additions, 2 deletions
setup.py
with
26 additions
and
8 deletions
bluepymm/select_combos/reporting.py
+
14
−
5
View file @
d09a5e45
...
...
@@ -374,12 +374,21 @@ def create_final_db_and_write_report(pdf_filename,
emodel_megate_passed_all
,
emodel_median_scores
,
\
emodel_passed_combos
=
\
emodel_info
ext_neurondb
=
ext_neurondb
.
append
(
emodel_ext_neurondb_rows
)
ext_neurondb
=
pandas
.
concat
(
[
ext_neurondb
,
emodel_ext_neurondb_rows
],
axis
=
0
).
reset_index
(
drop
=
True
)
megate_passed_all
=
megate_passed_all
.
append
(
emodel_megate_passed_all
)
median_scores
=
median_scores
.
append
(
emodel_median_scores
)
passed_combos
=
passed_combos
.
append
(
emodel_passed_combos
)
megate_passed_all
=
pandas
.
concat
(
[
megate_passed_all
,
emodel_megate_passed_all
],
axis
=
0
).
reset_index
(
drop
=
True
)
median_scores
=
pandas
.
concat
(
[
median_scores
,
emodel_median_scores
],
axis
=
0
).
reset_index
(
drop
=
True
)
passed_combos
=
pandas
.
concat
(
[
passed_combos
,
emodel_passed_combos
],
axis
=
0
).
reset_index
(
drop
=
True
)
# Reporting per e-model
add_plot_to_report
(
...
...
This diff is collapsed.
Click to expand it.
bluepymm/select_combos/table_processing.py
+
1
−
1
View file @
d09a5e45
...
...
@@ -377,7 +377,7 @@ def process_emodel(args):
emodel_mtype_etype_thresholds
[
'
megate_feature_threshold
'
]
=
None
print
(
'
Getting megating thresholds for emodel %s
'
%
emodel
)
emodel_mtype_etype_thresholds
.
apply
(
emodel_mtype_etype_thresholds
=
emodel_mtype_etype_thresholds
.
apply
(
lambda
row
:
row_threshold_transform
(
row
,
megate_patterns
),
axis
=
1
)
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
11
−
2
View file @
d09a5e45
...
...
@@ -27,8 +27,17 @@ setuptools.setup(
name
=
"
bluepymm
"
,
version
=
versioneer
.
get_version
(),
cmdclass
=
versioneer
.
get_cmdclass
(),
install_requires
=
[
'
sh
'
,
'
bluepyopt
'
,
'
matplotlib
'
,
'
pandas
'
,
'
numpy
'
,
'
ipyparallel
'
,
'
lxml
'
,
'
h5py
'
,
'
pyyaml
'
],
install_requires
=
[
"
sh
"
,
"
bluepyopt
"
,
"
matplotlib
"
,
"
pandas>=2.0.0
"
,
"
numpy
"
,
"
ipyparallel
"
,
"
lxml
"
,
"
h5py
"
,
"
pyyaml
"
,
],
packages
=
setuptools
.
find_packages
(
exclude
=
(
'
notebook
'
,)),
author
=
"
BlueBrain Project, EPFL
"
,
author_email
=
"
werner.vangeit@epfl.ch
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment