Merge PoseyDevelopment into SharedDevelopment #798
Conversation
* Refactor model class to generalize the summation logic method and move implementation into neuron class * Implement new AllVertices method in 911 class * Fix last compile errors * Clean up commented out code * Resolve code format failure * Remove dynamic cast of vertices so model with work with non-neuron models * Add override keyword to integrateVertexInputs declaration * Fix formatting issue
* Rename edge index map device variable name * Rename method names to remove neuro context * Rename variables both in method signature and implementation * Fix formatting * Remove neuro from GPU model and generalize what we can * Remove summation point operation as it's now done in the neuro vertices base class * Revert formatting that breaks code style * Clean up comments, variable names, and includes * Move edge sum index into all spiking synapses and rename neuro GPU methods in both edges and vertices * Fix style violation * Make corresponding updates to documentation * Re add serialize method to documentation * Fix const representation * Add All911Edges to connections documentation * Update diagram images
NicolasJPosey
added
GPU
cleanup
refactor
NicolasJPosey
changed the title
NicolasJPosey
changed the title
|
@stiber this PR is to merge my PoseyDevelopment branch into SharedDevelopment. This will merge PRs 777 and 789 into SharedDevelopment. Per the above commits, it is now up-to-date with SharedDevelopment. I took a quick look through the file changes and it looks like it only contains the changes from the two PRs so should be a quick review. I ran both the CPU and GPU tests which all passed. |
|
OK, one thing we learn from this exercise is that git/GitHub doesn't track previously approved changes, so everything shows up here under "files changed". I think, given all of the changes have bee previously reviewed, the thing to examine here is that:
So, unless you can think of something else, I think I can approve this without detailed examination. |
|
@stiber I can't think of anything beyond your two points. I did a sanity check and confirmed that for at least one of the files that I changed, a change made to that same file that was in SharedDevelopment and not my branch was successfully merged in. So I think because there was no merge conflicts that needed to be resolved, the file changes post-merge are just the new changes that I am introducing to SharedDevelopment. |
Closes #745 #785
Description
Merge includes two PRs. PR 777 which moved the vertex integration logic that lived in the Edges class into the Vertices class and PR 789 which cleaned up neuro-specific references in the GPU and CPU models.
Checklist (Mandatory for new features)
Testing (Mandatory for all changes)
test-medium-connected.xmlPassedtest-large-long.xmlPassed