Merge branch 'master' of github.com:eth-cscs/cell_algorithms into knl (d1ad4b38) · 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

d1ad4b38

Commit d1ad4b38 authored 8 years ago by

Benjamin Cumming

Downloads
- Plain Diff

Merge branch 'master' of github.com:eth-cscs/cell_algorithms into knl

* fix build errors in tests with TBB
* set default probe output to none in miniapp

parents 837fce43 6052e512

No related branches found

No related tags found

Changes 43

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
mechanisms/generate.sh 10 additions, 0 deletions

mechanisms/generate.sh
miniapp/io.cpp 216 additions, 64 deletions

miniapp/io.cpp
miniapp/io.hpp 8 additions, 1 deletion

miniapp/io.hpp
miniapp/miniapp.cpp 39 additions, 10 deletions

miniapp/miniapp.cpp
nrn/generate_validation.sh 7 additions, 5 deletions

nrn/generate_validation.sh
src/algorithms.hpp 4 additions, 3 deletions

src/algorithms.hpp
src/communication/communicator.hpp 6 additions, 1 deletion

src/communication/communicator.hpp
src/io/exporter.hpp 33 additions, 0 deletions

src/io/exporter.hpp
src/io/exporter_spike_file.hpp 102 additions, 0 deletions

src/io/exporter_spike_file.hpp
src/model.hpp 34 additions, 6 deletions

src/model.hpp
src/util/counter.hpp 95 additions, 0 deletions

src/util/counter.hpp
src/util/debug.cpp 12 additions, 4 deletions

src/util/debug.cpp
src/util/debug.hpp 12 additions, 2 deletions

src/util/debug.hpp
src/util/either.hpp 387 additions, 0 deletions

src/util/either.hpp
src/util/iterutil.hpp 178 additions, 0 deletions

src/util/iterutil.hpp
src/util/meta.hpp 121 additions, 2 deletions

src/util/meta.hpp
src/util/nop.hpp 35 additions, 0 deletions

src/util/nop.hpp
src/util/optional.hpp 65 additions, 65 deletions

src/util/optional.hpp
src/util/partition.hpp 165 additions, 0 deletions

src/util/partition.hpp

with 1530 additions and 163 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