Merge pull request #3 from eth-cscs/master (d0b220a3) · Commits · arbor-sim / arbor · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

arbor
- Activity
- Members
- Releases
- Contributor analytics
- Repository analytics

Snippets Groups Projects

d0b220a3

Commit d0b220a3 authored 8 years ago by

w-klijn Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #3 from eth-cscs/master

Pull in upstream patches to local copy

parents 81c5da48 21f1e235

No related branches found

No related tags found

Changes 19

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 6 additions, 0 deletions

CMakeLists.txt
cmake/CompilerOptions.cmake 11 additions, 0 deletions

cmake/CompilerOptions.cmake
data/cells_small.json 20 additions, 20 deletions

data/cells_small.json
miniapp/io.cpp 50 additions, 2 deletions

miniapp/io.cpp
miniapp/io.hpp 6 additions, 0 deletions

miniapp/io.hpp
miniapp/miniapp.cpp 16 additions, 7 deletions

miniapp/miniapp.cpp
miniapp/miniapp_recipes.cpp 9 additions, 7 deletions

miniapp/miniapp_recipes.cpp
src/algorithms.hpp 20 additions, 27 deletions

src/algorithms.hpp
src/communication/communicator.hpp 38 additions, 78 deletions

src/communication/communicator.hpp
src/model.hpp 98 additions, 25 deletions

src/model.hpp
src/swcio.cpp 1 addition, 1 deletion

src/swcio.cpp
src/thread_private_spike_store.hpp 75 additions, 0 deletions

src/thread_private_spike_store.hpp
src/threading/serial.hpp 37 additions, 4 deletions

src/threading/serial.hpp
src/threading/tbb.hpp 2 additions, 0 deletions

src/threading/tbb.hpp
src/util/double_buffer.hpp 66 additions, 0 deletions

src/util/double_buffer.hpp
tests/unit/CMakeLists.txt 5 additions, 3 deletions

tests/unit/CMakeLists.txt
tests/unit/test_algorithms.cpp 20 additions, 7 deletions

tests/unit/test_algorithms.cpp
tests/unit/test_double_buffer.cpp 58 additions, 0 deletions

tests/unit/test_double_buffer.cpp
tests/unit/test_spike_store.cpp 84 additions, 0 deletions

tests/unit/test_spike_store.cpp

with 622 additions and 181 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment