forked from nest/nest-simulator
-
Notifications
You must be signed in to change notification settings - Fork 1
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
Merge main into eprop_feature with fixes #28
Merged
akorgor
merged 142 commits into
jstapmanns:eprop_feature
from
heplesser:hep-eprop-merge-master
Nov 2, 2023
Merged
Merge main into eprop_feature with fixes #28
akorgor
merged 142 commits into
jstapmanns:eprop_feature
from
heplesser:hep-eprop-merge-master
Nov 2, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: models/CMakeLists.txt
Conflicts: models/CMakeLists.txt models/modelsmodule.cpp
…ma_generator Port sinusoidal generator tests (SLI-2-Py)
Port `test_setconnections_threads.sli` to Pytest
Co-authored-by: Hans Ekkehard Plesser <[email protected]>
Code re-organization for shorter build times (or taming the 96% troll)
Co-authored-by: janskaar <[email protected]>
Add `iaf_tum_2000`: a neuron model with integrated short-term plasticity synapse
Minor cleanup of code and comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@akorgor @JesusEV This PR merges main into the eprop_feature branch. More by mail.