Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for graph operations #355

Open
wants to merge 72 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
a7dd1a7
add: add to_graph method
jnsbck Apr 25, 2024
6b30160
add: add from_graph method
jnsbck Apr 25, 2024
258a850
fix: isort and rm obs import
jnsbck Apr 26, 2024
57cafee
doc: added more comments
jnsbck Apr 26, 2024
1f038a9
wip: started adding new swc import function
jnsbck Apr 29, 2024
f707662
wip: save dev wip
jnsbck Apr 29, 2024
453ed41
add: implement graph2jaxley method, that imposes branch structure on …
jnsbck May 1, 2024
5406636
fix: small fixes
jnsbck May 1, 2024
e6338a0
enh: add prelim version of xyzr
jnsbck May 2, 2024
5cc0a19
wip: save wip
jnsbck May 2, 2024
6e78838
enh: refactor of swc->graph->jaxley->module pipeline
jnsbck May 3, 2024
d5d727c
enh: cleanup
jnsbck May 3, 2024
77dafd8
fix: small fix, now from graph runs on compartmentalized morphology
jnsbck May 3, 2024
850cc87
doc: add docstrings and type hints
jnsbck May 6, 2024
3e6065c
doc: more comments added
jnsbck May 6, 2024
1b0cd33
fix: small fixes.
jnsbck May 6, 2024
768ffce
fix: rm undefined from groups at import
jnsbck May 6, 2024
41a4d18
wip: save wip
jnsbck May 6, 2024
152b899
wip: save wip
jnsbck May 6, 2024
bea9760
rm: remove dev notebook from tracking
jnsbck May 6, 2024
0e4526c
add: add tests for graph functionalities
jnsbck May 7, 2024
422a769
fix: added more tests and they are now passing
jnsbck May 7, 2024
37dd9aa
fix: test fixes
jnsbck May 7, 2024
35d59a9
wip: save wip working on graph and swc io
jnsbck May 27, 2024
c8a21ae
fix: radius import fixed
jnsbck Jun 3, 2024
4e91b6b
wip: save wip
jnsbck Jun 10, 2024
bdd2df6
enh: massive overhaul complete of graph pipeline compared to before. …
jnsbck Jun 10, 2024
103fe5d
wip: save wip
jnsbck Jun 16, 2024
171891d
wip: save wip
jnsbck Jun 16, 2024
d6c55f3
fix: some fixes added
jnsbck Jun 17, 2024
6488219
wip: save wip
jnsbck Jun 18, 2024
729161e
wip: save wip tests
jnsbck Jun 19, 2024
c112e8d
wip: test look better than before.
jnsbck Jul 12, 2024
8065c93
wip: remove complexity and improve test MSE. still not there though
jnsbck Jul 12, 2024
70d801a
wip: save wip.
jnsbck Aug 15, 2024
5b3bd17
rm: rm notebooks from pr
jnsbck Aug 15, 2024
50ff7de
wip: save wip
jnsbck Aug 23, 2024
a2ece4d
enh: small refactor of swc -> initial graph pipe
jnsbck Aug 23, 2024
6a839fd
enh: massive overhaul auf graph pipe. add documentation. passes tests…
jnsbck Aug 23, 2024
29ebd87
wip: start adding tests.
jnsbck Aug 23, 2024
eba2df7
enh: incl graphIO in tutorial
jnsbck Aug 23, 2024
5bf1cf3
wip: progress on tests and tutorial
jnsbck Aug 27, 2024
ca684cd
wip: tests are passing. except for voltages, which only passes in not…
jnsbck Aug 27, 2024
9fc844b
rm: dev notebook removed
jnsbck Aug 27, 2024
8f2652c
fix: tests passing for non-single soma morpho
jnsbck Aug 27, 2024
a06e4c9
enh: Tests are finally passing
jnsbck Aug 30, 2024
ffd58a3
fix: add misssing kwarg in simulate_trace_error
jnsbck Aug 30, 2024
9686410
fix: fix diff with main
jnsbck Aug 30, 2024
cd4bf32
fix: rm diff in modules/base
jnsbck Sep 2, 2024
222cb83
fix: add __eq__ back in for comparisons of cells attr in net and fix …
jnsbck Sep 2, 2024
967a675
chore: ran black
jnsbck Sep 2, 2024
fa4b13c
fix: change read_swc to io imports
jnsbck Sep 2, 2024
264af74
chore: add license header
jnsbck Sep 2, 2024
a68f1f5
enh: fixup of wording
jnsbck Sep 2, 2024
33cfecc
fix: fix merge artefact
jnsbck Dec 18, 2024
26dde89
rm: rm tutorials left from rebase
jnsbck Dec 18, 2024
b14f9d6
wip: swc pipe now works up until module import
jnsbck Dec 20, 2024
492135e
wip: in/out pipeline working for morphology, but w.o. attrs like reco…
jnsbck Dec 20, 2024
cfca73d
fix: update tutorial
jnsbck Dec 21, 2024
8a6110c
fix: fix tutorial and synapses and input output
jnsbck Dec 21, 2024
c4ac903
fix: add networkx as dep
jnsbck Dec 22, 2024
8fc0e8a
fix rebase io/swc.py to main
jnsbck Dec 22, 2024
96941ae
doc: add more function documentation
jnsbck Dec 22, 2024
da2141b
wip: step 1 on getting tests to pass
jnsbck Dec 22, 2024
ed277a0
fix: reduce diff
jnsbck Dec 22, 2024
0ef7686
fix: ammend last commit
jnsbck Dec 22, 2024
a4adc29
fix: pop l when converting graph
jnsbck Jan 13, 2025
b0d9f58
wip: working on tests
jnsbck Jan 13, 2025
c0607bb
wip: all but one test passing, working on import export cycle validation
jnsbck Jan 14, 2025
8236196
fix: finished import export tests and all tests are passing
jnsbck Jan 14, 2025
c082b2e
fix: speed up tests and add docs
jnsbck Jan 14, 2025
794f982
chore: edit changelog
jnsbck Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ net.vis()

- changelog added to CI (#537, #558, @jnsbck)

- Add `jaxley.io.graph` for exporting and importing of jaxley modules to and from `networkx` graph objects.
- Adds a new (and improved) SWC reader, which is more flexible and should also be easier to extend in the future.
```python
from jaxley.io.graph import swc_to_graph, from_graph
graph = swc_to_graph(fname)
# do something to the swc graph, i.e. prune it
pruned_graph = do_something_to_graph(graph)
cell = from_graph(pruned_graph, ncomp=4)
```
- Adds a new `to_graph` method for jaxley modules, which exports a module to a `networkX` graph. This allows to seamlessly work with `networkX`'s graph manipulation or visualization functions.
- See [the improved SWC reader tutorial](https://jaxley.readthedocs.io/en/latest/tutorials/08_importing_morphologies.html) for more details.

# 0.5.0

### API changes
Expand Down
282 changes: 269 additions & 13 deletions docs/tutorials/08_importing_morphologies.ipynb

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions jaxley/io/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This file is part of Jaxley, a differentiable neuroscience simulator. Jaxley is
# licensed under the Apache License Version 2.0, see <https://www.apache.org/licenses/>

# from jaxley.io.graph import from_graph, to_graph # Leads to circular import
from jaxley.io.swc import read_swc
Loading