Port recent changes from Brian 2 #164
Merged
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
This does not properly implement support for additional compilation keywords, it only avoids that Brian2CUDA is unusable due to an error about an unexpected argument.
|
I added another commit to deal with the changes introduced by brian-team/brian2#1047 |
|
Oh woops. I guess I need to clean up my github notifications, this got totally lost. Thanks @mstimberg. Merging :). |
denisalevi
added a commit
that referenced
this pull request
Apr 17, 2019
This reverts the merge of PR #164 since it breaks the statemonitor.
denisalevi
added a commit
that referenced
this pull request
Jun 10, 2021
Port recent changes from Brian 2
denisalevi
added a commit
that referenced
this pull request
Jun 10, 2021
This reverts the merge of PR #164 since it breaks the statemonitor.
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.
This minor change is necessary for compatibility with latest Brian 2 master (after the merge of brian-team/brian2#1022). Changes were necessary to fix brian-team/brian2#1017, the details are explained there but I don't think it is necessary to understand them fully.
All that is important is that the changes proposed with this PR should not change anything for earlier versions of Brian 2 and will prevent weird failures when you update to latest Brian 2 master :)