Merge remote-tracking branch 'upstream/master' into feature/fvm-multicell (6821d6cf) · 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

6821d6cf

Commit 6821d6cf authored 8 years ago by

Sam Yates

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into feature/fvm-multicell

parents 01b538a9 6122b739

No related branches found

No related tags found

No related merge requests found

Changes 29

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
CMakeLists.txt 36 additions, 16 deletions

CMakeLists.txt
README.md 144 additions, 0 deletions

README.md
cmake/CompilerOptions.cmake 4 additions, 1 deletion

cmake/CompilerOptions.cmake
external/vector 1 addition, 1 deletion

external/vector
mechanisms/CMakeLists.txt 22 additions, 5 deletions

mechanisms/CMakeLists.txt
miniapp/io.cpp 2 additions, 2 deletions

miniapp/io.cpp
miniapp/miniapp.cpp 19 additions, 5 deletions

miniapp/miniapp.cpp
src/cell_group.hpp 19 additions, 2 deletions

src/cell_group.hpp
src/communication/communicator.hpp 22 additions, 22 deletions

src/communication/communicator.hpp
src/communication/gathered_vector.hpp 52 additions, 0 deletions

src/communication/gathered_vector.hpp
src/communication/mpi.hpp 34 additions, 0 deletions

src/communication/mpi.hpp
src/communication/mpi_global_policy.hpp 10 additions, 4 deletions

src/communication/mpi_global_policy.hpp
src/communication/serial_global_policy.hpp 10 additions, 4 deletions

src/communication/serial_global_policy.hpp
src/model.hpp 38 additions, 11 deletions

src/model.hpp
src/profiling/profiler.cpp 43 additions, 10 deletions

src/profiling/profiler.cpp
src/profiling/profiler.hpp 14 additions, 2 deletions

src/profiling/profiler.hpp
src/thread_private_spike_store.hpp 12 additions, 0 deletions

src/thread_private_spike_store.hpp
src/threading/serial.hpp 25 additions, 10 deletions

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

src/threading/tbb.hpp

with 524 additions and 95 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