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

Convnet prep #133

Merged
merged 11 commits into from Nov 29, 2018

Conversation

Projects
None yet
4 participants
@hunse
Copy link
Contributor

hunse commented Oct 30, 2018

I realized that there's a number of fixes as part of the convnet stuff that are useful by themselves, and would be helpful for the work I'm doing now. Since it still could be a little while before the actual convnet PR is merged, I figured that this could be a separate PR. A lot of it is not directly related to convnets, it's just bugs I found or things I needed to fix as part of doing that work.

@hunse hunse requested a review from tcstewar Oct 30, 2018

@hunse hunse removed the request for review from tcstewar Oct 30, 2018

@hunse

This comment has been minimized.

Copy link
Contributor Author

hunse commented Oct 30, 2018

I was going to ask @tcstewar for a review, but I realized that @drasmuss didn't actually work on any of these commits, so he could review too. So I assigned you both, and you can decide who wants to do it :)

@hunse hunse referenced this pull request Nov 1, 2018

Merged

Close sub-simulators on close #121

1 of 1 task complete

@tbekolay tbekolay assigned tbekolay and unassigned drasmuss and tcstewar Nov 2, 2018

@tbekolay tbekolay self-requested a review Nov 2, 2018

@tbekolay

This comment has been minimized.

Copy link
Member

tbekolay commented Nov 2, 2018

Since it seems like having this in before #121 makes sense, I'm looking at this now. Going to fixup the fixups commits first because the full diff history is not useful, have to go commit by commit.

@tbekolay tbekolay force-pushed the conv2d-prep branch from dc3af4a to 6faf600 Nov 2, 2018

@hunse hunse referenced this pull request Nov 2, 2018

Merged

Communication refactoring #137

@tbekolay
Copy link
Member

tbekolay left a comment

A few questions and suggestions made inline. Also, I'm going to merge #135 soon so please remove 8820e6d too.

Show resolved Hide resolved nengo_loihi/loihi_cx.py
Show resolved Hide resolved nengo_loihi/loihi_api.py Outdated
Show resolved Hide resolved nengo_loihi/loihi_api.py
Show resolved Hide resolved nengo_loihi/simulator.py Outdated
Show resolved Hide resolved nengo_loihi/loihi_cx.py Outdated
Show resolved Hide resolved nengo_loihi/loihi_cx.py Outdated

@hunse hunse force-pushed the conv2d-prep branch from 1e00ea4 to e0996dd Nov 6, 2018

@tbekolay tbekolay force-pushed the master branch from 701f997 to 1fe237c Nov 11, 2018

@hunse hunse force-pushed the conv2d-prep branch from e0996dd to e64ca63 Nov 12, 2018

@hunse

This comment has been minimized.

Copy link
Contributor Author

hunse commented Nov 12, 2018

This is ready for re-review.

@tbekolay tbekolay force-pushed the conv2d-prep branch from e64ca63 to 7215cc2 Nov 29, 2018

@tbekolay tbekolay referenced this pull request Nov 29, 2018

Merged

Convnets everywhere #81

@tbekolay tbekolay force-pushed the conv2d-prep branch from 7215cc2 to c22edea Nov 29, 2018

@tbekolay
Copy link
Member

tbekolay left a comment

I made e612a2f and 818417c to address my prior comments, and a2f7861 to fix some docstrings. With those commits, this looks good to me. Let me know if you're ok with those fixups @hunse; I'll merge on your ok.

Edit: I also made c22edea to fix a TravisCI failure we were getting.

@tbekolay tbekolay assigned hunse and unassigned tbekolay Nov 29, 2018

Show resolved Hide resolved .ci/test.sh Outdated
Show resolved Hide resolved nengo_loihi/loihi_interface.py Outdated
@tbekolay

This comment has been minimized.

Copy link
Member

tbekolay commented Nov 29, 2018

After some discussion, we settled on keeping it close to what it was before with additional documentation, which I added in 46a2db4. Let me know if that looks good @hunse

@hunse

This comment has been minimized.

Copy link
Contributor Author

hunse commented Nov 29, 2018

LGTM!

hunse and others added some commits Sep 27, 2018

Snip probes accommodate different keys
Used to assume we were probing the voltage.
Added CxGroup validation function
- Also added a check for number of output axons
- Also added a check for number of compartments

Ultimately, this will be something that we will get rid of when we
have allocators that can split Groups across cores. For now, though,
it's helpful to be aware of these limits.
Add instructions for increasing max spikes
This is likely to be a common thing that needs to be done for
deep learning networks, so documentation is needed.
Emulator tracks spikes individually
Will be required to allow population spikes (atoms).
Add Loihi neuron classes
These classes can be used to imitate Loihi neurons in core Nengo.
Temporarily require older pytest
Nengo's `plt` fixture needs to be updated for pytest 4.

@tbekolay tbekolay force-pushed the conv2d-prep branch from 1c123d7 to 95a97b8 Nov 29, 2018

@tbekolay tbekolay merged commit 95a97b8 into master Nov 29, 2018

1 check passed

codecov/patch 87.59% of diff hit (target 77.56%)
Details

@tbekolay tbekolay deleted the conv2d-prep branch Dec 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.