From 8e82ec1947a3a6d84452969d1d628b2292654319 Mon Sep 17 00:00:00 2001 From: Brent Huisman Date: Tue, 15 Nov 2022 16:19:19 +0100 Subject: [PATCH] v0.8 (#2028) - Correct `.gitmodules` - Update all git submodules to latest released versions, except google-benchmark - Have CHANGELOG - Breaking changes since v0.7: - A change in API: `arbor.cable_cell` has the labels and decor arguments swapped. I.e.: `(tree, labels, decor)` -> `(tree, decor, label)`. Labels are now optional. - Mechanism ABI version is bumped to 0.3.1. https://github.com/arbor-sim/arbor/pull/1884 - Remove the `generate-catalogue` script. `modcc` accepts now a list of NMODL files and is able to spit out a catalogue.cpp file - Rename spike detector -> threshold detector - Remove access to time `t` in NMODL. - Major dependency version bumps: - GCC: 9 and up - CUDA: 11 and up - Clang: 10 and up --- .gitmodules | 7 +- ATTRIBUTIONS.md | 30 ++ CHANGELOG.md | 604 ++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- doc/contrib/pr.rst | 22 +- doc/contrib/release.rst | 23 +- ext/fmt | 2 +- ext/json | 2 +- ext/pybind11 | 2 +- spack/package.py | 11 +- 10 files changed, 677 insertions(+), 28 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.gitmodules b/.gitmodules index 60848fb2e9..ca46a262d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "google-benchmark"] path = ext/google-benchmark - url = https://github.com/google/benchmark + url = https://github.com/google/benchmark.git branch = main [submodule "ext/fmt"] path = ext/fmt @@ -8,7 +8,7 @@ branch = master [submodule "ext/random123"] path = ext/random123 - url = https://github.com/DEShawResearch/random123 + url = https://github.com/DEShawResearch/random123.git branch = main [submodule "ext/json"] path = ext/json @@ -17,8 +17,9 @@ [submodule "ext/pybind11"] path = ext/pybind11 url = https://github.com/pybind/pybind11.git + branch = master [submodule "ext/googletest"] path = ext/googletest url = https://github.com/google/googletest.git - branch = release-1.12.1 + branch = main diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index a0e046835f..1f7b99e1df 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -1,5 +1,23 @@ Arbor includes code from the open source community. Thank you! +## fmt + +{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams. + +https://github.com/fmtlib/fmt + +## google-benchmark + +A library to benchmark code snippets, similar to unit tests. + +https://github.com/google/benchmark + +## GoogleTest + +GoogleTest is Google’s C++ testing and mocking framework. + +https://github.com/google/googletest + ## JSON for Modern C++ A header only C++11 json library, written by Niels Lohmann (GitHub user nlohmann). @@ -7,6 +25,18 @@ MIT license. https://github.com/nlohmann/json +## pybind11 + +pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. + +https://github.com/pybind/pybind11 + +## random123 + +The Random123 library is a collection of counter-based random number generators ("CBRNGs") for CPUs (C and C++) and GPUs (CUDA and OpenCL). + +https://github.com/DEShawResearch/random123 + ## tinyopt A header only C++ library for command line argument parsing, written by Stuart Yates. diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..537d089b5d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,604 @@ +# v0.8 + +** 2022 11 15 ** + +Welcome to another installment of the Arbor simulator! + +In this release we add a CHANGELOG, where major new features and breaking changes will be mentioned specifically. + +## Major new features + +- Stochastic Differential Equations. Introduces sources of white noise to arbor (and nmodl). Both point and density mechanisms may now use white noise as part of the state updates, turning the ODEs effectively into SDEs. The noise sources are provided per connection end point (point mech.) or control volume (density mech.) and are uncorrelated (spatially, temporally and across different mechanism instantiations). https://github.com/arbor-sim/arbor/pull/1884 +- Mutable connection table. Add functionality, docs, and examples on editing the connection table. This is a first, small PR +on the topic, further functionality will come as requested. https://github.com/arbor-sim/arbor/pull/1919 +- Allow editing morphologies. Supported operations: join_at, split_at, equivalence, equality, apply isometry. https://github.com/arbor-sim/arbor/pull/1957 +- Arbor cable cell exporter and backend support in BluePyOpt. https://github.com/arbor-sim/arbor/pull/1959 +- Make LIF cells probeable. https://github.com/arbor-sim/arbor/pull/2021 + +## Breaking changes since v0.7: + +- A change in decor API: `arbor.cable_cell` has the labels and decor arguments swapped. I.e.: `(tree, labels, decor)` +-> `(tree, decor, label)`. Labels are now optional. https://github.com/arbor-sim/arbor/pull/1978 +- Remove the `generate-catalogue` script. `modcc` accepts now a list of NMODL files and is able to spit out a catalogue.cpp file. https://github.com/arbor-sim/arbor/pull/1975 +- Mechanism ABI version is bumped to 0.3.1. https://github.com/arbor-sim/arbor/pull/1884 +- Rename spike detector -> threshold detector. https://github.com/arbor-sim/arbor/pull/1976 +- Remove access to time `t` in NMODL. https://github.com/arbor-sim/arbor/pull/1967 +- Major dependency version bumps: + - GCC: 9 and up + - CUDA: 11 and up + - Clang: 10 and up + +## Full commit log + +### Neuroscience, documentation + +* Convenience: shorter code to build decor. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1903 +* Fix doc error. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1934 +* probe id -> probeset id, and clarification in docs by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1898 +* Elaborate on mpi4py. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1940 +* Add all_closest to place_pwlin. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1952 +* Add more visibility to decor. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1953 +* add spike source docs. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1939 +* 🦑 Excise `time` by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1967 +* 🐍 Rename spike detector -> threshold detector by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1976 +* Mutable connection table by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1919 +* Allow multiple schedules per source_cell. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1963 +* Allow editing morphologies by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1957 +* generate-catalogue is gone by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1975 +* SDE by @boeschf in https://github.com/arbor-sim/arbor/pull/1884 +* Discuss q10 pattern in NMODL docs. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1995 + +### Core + +* modcc: Allow redundant, but correct READ declaration. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1936 +* Deny WATCH statements. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1942 +* Excise fvm type aliases by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1938 +* Add stack information to `arbor_exception` by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1945 +* Expose find_private_gpu to python by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1943 +* Make `mpoint`s hashable. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1950 +* Arborio reads from Stream objects now. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1937 +* Remove explicit generator by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1962 +* Clean up plasticity by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1985 +* Heaviside step by @llandsmeer in https://github.com/arbor-sim/arbor/pull/1989 +* Do not restrict SWC record identifier by @schmitts in https://github.com/arbor-sim/arbor/pull/1996 +* Make decor mandatory and labels optional. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1978 +* Add virtual dtors to recipe components by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2000 +* cleanup documentation by @boeschf in https://github.com/arbor-sim/arbor/pull/2007 +* Arbor cable cell exporter and backend support in BluePyOpt by @lukasgd in https://github.com/arbor-sim/arbor/pull/1959 +* Add a plethora of config options to a-b-c. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1958 +* Make LIF cells probeable. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2021 +* Added fixture dev docs. Made fixtures more robust. by @Helveg in https://github.com/arbor-sim/arbor/pull/2025 +* Make LIF cells LIF cells again. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2026 +* update cray documentation by @boeschf in https://github.com/arbor-sim/arbor/pull/2022 + +### Build, testing, CI + +* Spack cache change, bump versions by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1926 +* Expand docs on testing. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1944 +* Fix cmake paths so we can use Arbor as a sub-project. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1948 +* bump pybind11 for py3.11 compat by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1955 +* Add spike counts to pre-commit tests. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1965 +* Move pybind11 to `/ext` by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1968 +* Add black config to pyproject.toml. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1971 +* Bump CI workflow and GoogleTest by @boeschf in https://github.com/arbor-sim/arbor/pull/2003 +* Remove cscs-ci badges by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1999 +* fix cmake: ninja + ExternalProject by @boeschf in https://github.com/arbor-sim/arbor/pull/2008 +* Use HTTPS access instead of ssh/git for gtest. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2009 +* Add memory sanitizer by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2013 +* Try to use OpenMPI as of brew/apt. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2016 +* Bump versions by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2017 +* Include ubenches into CI by @boeschf in https://github.com/arbor-sim/arbor/pull/2014 +* Speed up CI by @boeschf in https://github.com/arbor-sim/arbor/pull/2019 +* Update pyproject.toml for Py3.11 by @brenthuisman in https://github.com/arbor-sim/arbor/pull/2018 +* Check internal invariants in CI by @thorstenhater in https://github.com/arbor-sim/arbor/pull/2023 + +### Fixes, optimization + +* Disable inconsistent rule. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1928 +* Action must change `VERSION` except on version tag. by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1931 +* NMDOL: default catalogue clean up by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1935 +* PANIC! Forgot to fix fvm type in GPU!!!. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1946 +* Remove abuse of arg_v. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1954 +* Catch symdiff errors. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1964 +* Bug fix: point mechs applying weights to ionic concentrations by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1960 +* Fix some issues found by PVS Studio. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1974 +* load_asc Python fix by @lukasgd in https://github.com/arbor-sim/arbor/pull/1977 +* Ensure proper Pybind11 is found. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1961 +* missing std namespace by @boeschf in https://github.com/arbor-sim/arbor/pull/1994 +* Optimize CPU-side solvers by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1992 +* 🦑 modcc now generates GPU mechs again. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1988 +* 🦑 Never call a procedure again. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1972 +* compiler warnings by @boeschf in https://github.com/arbor-sim/arbor/pull/2006 +* guard for zero random variables by @boeschf in https://github.com/arbor-sim/arbor/pull/2031 +* fix some compiler warning by @boeschf in https://github.com/arbor-sim/arbor/pull/2034 + +## New Contributors +* @lukasgd made their first contribution in https://github.com/arbor-sim/arbor/pull/1977 + +**Full Changelog**: https://github.com/arbor-sim/arbor/compare/v0.7...v0.8-rc + + + +# v0.7 + +** 2022 07 20 ** + +## What's Changed + +### Neuroscience/documentation +* prep extracellular potentials tutorial. Updated corresponding example by @espenhgn in https://github.com/arbor-sim/arbor/pull/1825 +* Add documentation on faster NMODL. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1840 +* Add tstop doc in recipe API doc by @schmitts in https://github.com/arbor-sim/arbor/pull/1852 +* Use list comprehension to speed up creation of connections by @schmitts in https://github.com/arbor-sim/arbor/pull/1864 +* Support markers in neurolucida ascii files by @bcumming in https://github.com/arbor-sim/arbor/pull/1867 +* simplified `create_polygon` function in lfpykit example by @espenhgn in https://github.com/arbor-sim/arbor/pull/1881 +* Better key for the `lfpykit` intersphinx mapping by @Helveg in https://github.com/arbor-sim/arbor/pull/1878 +* Sort (in python) the mechanism names (for convenience). by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1882 +* Always emit weight expression. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1875 +* Add support for epoch callbacks by @bcumming in https://github.com/arbor-sim/arbor/pull/1873 +* Add introspection for global properties. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1890 +* Add point probes to demo by @schmitts in https://github.com/arbor-sim/arbor/pull/1891 +* Tut/use avail threads by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1900 +* Allen tutorial by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1781 +* New policy 'round_robin_halt' by @jlubo in https://github.com/arbor-sim/arbor/pull/1868 +* Axial Diffusion by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1729 +* Add some convenience to simulation creation. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1904 +* Predefine SWC Regions. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1911 +* Diffusion Example Improvements (and a bit of clean-up) by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1914 +* Inhomogeneous parameters by @AdhocMan in https://github.com/arbor-sim/arbor/pull/1887 +* Fix line numbers in tutorials and assorted doc corrections by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1917 + +### Core +* 🐍 Be more lenient when accepting args to file I/O by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1819 +* modcc: generate missing `node_index` read needed for reading time `t` in the mechanisms by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1866 +* Add Developer Documentation by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1639 +* Isolate external catalogues from libarbor.a. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1837 + +### Build, testing, CI +* Build Python 3.10 binary wheels. Add v0.6 to spackfile. by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1817 +* export API by @boeschf in https://github.com/arbor-sim/arbor/pull/1824 +* export doc by @boeschf in https://github.com/arbor-sim/arbor/pull/1849 +* Include CMAKE+CUDA iff NVCC is needed. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1855 +* Bit more on Spack, fix in tutorial by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1838 +* json submodule added by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1871 +* Fix a bug where Debian/Ubuntu's Python malfunctions by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1894 +* Have dependency version policy by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1865 +* random123 submodule added by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1872 +* Fix tool installation paths. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1905 +* Adopt Black for Python. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1906 +* add cmake checks for non-bundled random123 by @bcumming in https://github.com/arbor-sim/arbor/pull/1907 +* Temporarily disable A64FX CI by @bcumming in https://github.com/arbor-sim/arbor/pull/1910 +* Adopt flake8 by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1908 +* Move Python build to `pyproject.toml`, bump Python minver to 3.7, fix macos wheel generation by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1916 +* Weekly CI Python wheel build pushes to Test.PyPI.org by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1921 + +### Fixes, optimization +* Users may not give dt < 0. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1821 +* Fix `ubenches` compilation errors by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1828 +* death test: wrong signal by @boeschf in https://github.com/arbor-sim/arbor/pull/1858 +* Make brunel.py setup faster. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1854 +* add a better error. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1846 +* Fix load_component for label-dict by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1859 +* Found out the hard way that this is still needed :/ by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1860 +* Elide memcpy where not needed by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1863 +* Bug fix: Fix voltage vector size in threshold_watcher contstructor by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1820 +* remove test statements for move ctor by @boeschf in https://github.com/arbor-sim/arbor/pull/1899 +* Code Quality: PVS Studio Finds by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1901 +* Two context decomp swaps were forgotten by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1912 + +## New Contributors +* @jlubo made their first contribution in https://github.com/arbor-sim/arbor/pull/1868 +* @AdhocMan made their first contribution in https://github.com/arbor-sim/arbor/pull/1887 + +**Full Changelog**: https://github.com/arbor-sim/arbor/compare/v0.6...v0.7 + + + +## v0.6 + +** 2022 01 26 ** + +## What's Changed + +Core API: + +* Add S-Exp for CV Policies by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1511 +* Clean-up and extend mech cat iterator interface. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1564 +* Mech ABI: The final step. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1452 +* Add `dim3` to gridDim constructor in generated mechanism code by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1630 +* Added an empty catalogue by @Helveg in https://github.com/arbor-sim/arbor/pull/1677 +* Allow to limit Poisson schedule with a stop time (closes #1617) by @schmitts in https://github.com/arbor-sim/arbor/pull/1684 +* Expose profiler to Python by @Helveg in https://github.com/arbor-sim/arbor/pull/1688 +* Added a debug mode to `build-catalogue` by @Helveg in https://github.com/arbor-sim/arbor/pull/1686 +* Write build-catalogue (c)make errors to `stdout` and `stderr` by @Helveg in https://github.com/arbor-sim/arbor/pull/1679 +* Makejobs arg by @Helveg in https://github.com/arbor-sim/arbor/pull/1673 +* Feature/python clean memory by @max9901 in https://github.com/arbor-sim/arbor/pull/1670 +* Feature/label dict by @apeyser in https://github.com/arbor-sim/arbor/pull/1711 +* Add locset expressions for proximal and distal translation of locations by @bcumming in https://github.com/arbor-sim/arbor/pull/1671 +* Gap Junction mechanisms by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1682 +* Solve non-linear systems that are not kinetic schemes. by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1724 +* Add cos and sin SVE implementations by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1744 +* Deal with zero radius points in a morphology by @halfflat in https://github.com/arbor-sim/arbor/pull/1719 +* Simplify default proc_allocation generation. by @halfflat in https://github.com/arbor-sim/arbor/pull/1725 +* Find morphology location from a coordinate by @bcumming in https://github.com/arbor-sim/arbor/pull/1751 +* resurrect lmorpho by @schmitts in https://github.com/arbor-sim/arbor/pull/1746 +* Expose information about the CV discretization to the public inteface by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1758 +* Allow the use of string s-expression CV-policies in pyarb by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1799 +* Construct `domain_decomposition` given a list of `group_descriptions`. by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1788 +* Profile externally loaded mechanisms by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1691 +* Have option to set thread count to local maximum by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1716 + +CI/build/testing: + +* Python unit test clean-up by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1595 +* Add CI for the in-repo Spack package by @schmitts in https://github.com/arbor-sim/arbor/pull/1544 +* Ci/sanitize by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1521 +* Update spack package to include fmt for arbor@0.5.3: by @bcumming in https://github.com/arbor-sim/arbor/pull/1609 +* Cache Spack for GHA by @schmitts in https://github.com/arbor-sim/arbor/pull/1619 +* Run examples via scripts (closes #1566) by @schmitts in https://github.com/arbor-sim/arbor/pull/1631 +* Build a catalogue in CI by @schmitts in https://github.com/arbor-sim/arbor/pull/1632 +* Switch to PyPA's `cibuildwheel` action repo's. by @Helveg in https://github.com/arbor-sim/arbor/pull/1703 +* Automatic test discovery sans boilerplate by @Helveg in https://github.com/arbor-sim/arbor/pull/1693 +* build external mechanism catalogues in release mode by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1713 +* `make VERBOSE=1` in verbose mode by @Helveg in https://github.com/arbor-sim/arbor/pull/1715 +* Bump pybind to 2.8.1 by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1742 +* Better error reporting in python context interface by @bcumming in https://github.com/arbor-sim/arbor/pull/1732 +* Better error diagnostic in python when invalid cell properties are provided. by @bcumming in https://github.com/arbor-sim/arbor/pull/1743 +* Test separately built catalogues by @bcumming in https://github.com/arbor-sim/arbor/pull/1748 +* Weekly cron job checking for submodule updates by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1741 +* Added local Python testsuite instructions by @Helveg in https://github.com/arbor-sim/arbor/pull/1809 +* CMake CUDA clean-up. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1804 +* Add dry run benchmark cell model for testing communication scaling by @bcumming in https://github.com/arbor-sim/arbor/pull/1627 +* v0.6-rc by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1814 +* More robust build-catalogue by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1784 + +Documentation: + +* `arbor.mechanism_catalogue.extend()` documentation added. by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1597 +* zenodo 0.5.2 entry by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1598 +* mpi.py updated for new synapse labelling by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1602 +* Tutorial structure: remove deduplication, includify by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1575 +* Docs mechabi by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1610 +* Improved documentation about weights by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1620 +* Adapt to changes in Pandas requiring unique indices by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1625 +* Add implies default license by @kanzl in https://github.com/arbor-sim/arbor/pull/1635 +* Update Slack to Gitter by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1637 +* Better Python installation instructions by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1622 +* Add example based on LFPykit example Example_Arbor_swc.ipynb by @espenhgn in https://github.com/arbor-sim/arbor/pull/1652 +* Name and describe arguments to constructors where ambiguous. by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1678 +* improved Github Issue templates by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1698 +* Add some comments about units to network ring examples by @schmitts in https://github.com/arbor-sim/arbor/pull/1697 +* Fix link (closes #1664) by @schmitts in https://github.com/arbor-sim/arbor/pull/1701 +* Fix class members in cable example by @schmitts in https://github.com/arbor-sim/arbor/pull/1641 +* Correctify and seabornize dendrite tutorial by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1706 +* Polish GJ example readme by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1726 +* Completed the docs with more `config()` flags by @Helveg in https://github.com/arbor-sim/arbor/pull/1708 +* Make connectivity example more complete by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1721 +* Add description of arbor and NEURON's `nernst` application rules to the docs. by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1638 +* Show docs version info more prominently on RTD by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1737 +* Update/fix tinyopt README.md by @halfflat in https://github.com/arbor-sim/arbor/pull/1747 +* Add python gap junction example by @kanzl in https://github.com/arbor-sim/arbor/pull/1750 +* Documentation: add expected nmodl units by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1756 +* Fixed broken link from `get_probes` to `probes` by @Helveg in https://github.com/arbor-sim/arbor/pull/1763 +* Removed double preposition by @Helveg in https://github.com/arbor-sim/arbor/pull/1762 +* Fixed MD to RST typo by @Helveg in https://github.com/arbor-sim/arbor/pull/1760 +* Fix broken links in `probe_sample.rst` by @Helveg in https://github.com/arbor-sim/arbor/pull/1761 +* Docs/contrib updates by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1736 +* Add Release procedure to docs by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1738 +* Example and tutorial for two cells connected via a gap junction by @schmitts in https://github.com/arbor-sim/arbor/pull/1771 +* Have single source for citation info, compatible with Github citation UI by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1791 +* Advertise GH Discussions for modelling by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1793 +* Add release cycle info to docs by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1798 +* Added a warning when users are reading latest docs. by @Helveg in https://github.com/arbor-sim/arbor/pull/1800 + +Fixes/optimization: + +* Fix GPU compile. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1601 +* Compile all arbor source files with `-fvisibility=hidden` by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1599 +* Bug/assorted static analysis by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1615 +* Fix ambiguous Region/Locset expressions by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1629 +* Clean-up AVX routine and global def [EOM] by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1618 +* Categorise ASSIGNED RANGE variables as STATE-ish. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1624 +* Check that mechanisms have the right kind by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1633 +* Resolve uninitialised values. by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1616 +* Correctly parse diameter in ASCII files by @bcumming in https://github.com/arbor-sim/arbor/pull/1640 +* Attempt fixing a64fx build by @bcumming in https://github.com/arbor-sim/arbor/pull/1636 +* Fix simulation::add_sampler cell_group dispatch by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1654 +* Fix on-components on empty cable bug by @halfflat in https://github.com/arbor-sim/arbor/pull/1658 +* Fix cv_policy parse and write in ACC by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1665 +* Fixed MRO and code duplication in `setup.py` by @Helveg in https://github.com/arbor-sim/arbor/pull/1672 +* Rephrase exception message in case of missing segment by @schmitts in https://github.com/arbor-sim/arbor/pull/1659 +* Fix modcc simd generation by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1681 +* Segfault on instantiating mechanisms on empty regions by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1657 +* Add missing closing bracket to mechanism repr (closes #1667) by @schmitts in https://github.com/arbor-sim/arbor/pull/1699 +* Better handling of errors during dynamic catalogue loading by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1702 +* Swap && and || operator precedence in modcc by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1710 +* Remove use of removed INSTRUMENT_MALLOC symbols from Glibc 2.34 by @brenthuisman in https://github.com/arbor-sim/arbor/pull/1730 +* Generate correct simd code for reading `peer_index` and `v_peer` by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1735 +* fixes for non-standard code by @boeschf in https://github.com/arbor-sim/arbor/pull/1769 +* Modcc: Forward declare procedure kernels in generated GPU code by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1787 +* modcc: exit solvers early if errors encountered. by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1755 +* Fix cmake configuration of out-of-core fmt library by @bcumming in https://github.com/arbor-sim/arbor/pull/1796 +* Bug fix: properly partition networks containing one-sided gap-junction connections by @noraabiakar in https://github.com/arbor-sim/arbor/pull/1774 +* Remove footgun: Catalogue Lifetimes by @thorstenhater in https://github.com/arbor-sim/arbor/pull/1807 + + +## New Contributors +* @kanzl made their first contribution in https://github.com/arbor-sim/arbor/pull/1635 +* @max9901 made their first contribution in https://github.com/arbor-sim/arbor/pull/1670 +* @boeschf made their first contribution in https://github.com/arbor-sim/arbor/pull/1769 + +**Full Changelog**: https://github.com/arbor-sim/arbor/compare/v0.5.2...v0.6 + + + +# v0.5.2 + +** 2021 06 24 ** + +This release fixes an error in the CI generated Python wheels, which are as of this release available on PyPI. Other than those fixes, this release is identical to v0.5.1. + + + +# v0.5.1 + +** 2021 06 22 ** + +Since v0.5 there have been some major features, and many small fixes and improvements. + +Core API features: + +* [C++/Python] Labels instead of indices for placeable item identification. +* [C++/Python] Morphology file format support: Arbor Cable-Cell Format. +* [C++/Python] Morphology file format support: Neurolucida ASCII format. +* [C++/Python] Morphology file format improvements: SWC. +* [C++/Python] Simplified connections and junctions. +* [C++/Python] Enable simulation resume/restart. +* [C++/Python] Add post events functionality to support models with STDP synapses +* [C++/Python] Allow dynamically creating and loading of mechanism catalogue + +Documentation: + +* Documentation URL changed to docs.arbor-sim.org +* New Python examples and tutorials +* Ever more complete documentation +* Added Code of Conduct + +Build / CI: + +* Spack distribution +* CI generated binary Python wheels +* Apple M1 compatibility +* CI moved from Travis to Github Actions +* Improved Python and C++ unit testing +* ARM CI +* Sanitizer CI + +Contributions by, in no specific order, @haampie, @clinssen, @espenhgn, @Helveg, @brenthuisman, @noraabiakar, +@thorstenhater, @halfflat, @schmitts and @bcumming + + + +# v0.5 + +** 2021 01 07 ** + +Since v0.4 there have been some major features, and many small fixes and improvements. + +Core API features: +* [C++/Python] Numerous small bug fixes, optimizations and improvements. +* [C++/Python] Refactor cable cell interface to be read only, and be constructed from + descriptions of morphology, labels, and decorations. +* [C++/Python]Expose diverse probes and rich interface for describing where and + what to sample on cable cells. +* [C++/Python] Support for querying names in mechanism catalogues +* [Python] Wrapper for existing C++ `pw_lin` functionality +* [C++] Improved validation of recipe definitions during model building + +Documentation: +* Added new Python examples +* Many small fixes for links, spelling, grammar and clarity. +* Add extensive guide for contributions and coding polices. + +Build: +* Allow CMake configuration to use system copies of C++ dependencies + (nlohmann/json and pybind11), and makes this the default option. +* Added GitHub Actions support for automated testing of a wider range of tests + and features than are run on our Travis CI (which will be removed soon) +* More robust Python detection and consistent use of the same Python + interpreter in CMake configure and build steps. + +Contributions by, in no specific order, @brenthuisman, @noraabiakar, +@thorstenhater, @halfflat, @schmitts and @bcumming + + + +# v0.4 + +** 2019 10 15 ** + +## Release notes + +### Library +* Moved from C++14 to C++17 + * Removed our hand-rolled versions of `any`, `optional` and `variant`. +* Added `std::expected` equivalent for error handling. + +### Features +* Added mechanism catalogues with mechanisms used by Allen and BBP models. +* Removed support for spherical segments at the root of cable morphologies, and + replaced the sample-based representation with a segment-based representation: + * Morphologies are defined in terms of two-point segments. + * Gaps are allowed between segments anywhere in a morphology. +* Exposed the current `time` inside mechanisms. +* Added support for NeuroML2 morphology descriptions. +* Added a "stitch" morphology builder for constructing morphologies with + cable sections that can connect to any location on their parent cable. +* Replaced recipe probe API with more flexible API that allows for sampling + not only voltages at single locations, but currents, ion species properties, + and mechanism state variables at single locations or across an entire cell. +* Added support for querying probe metadata from the simulation object. +* Added new 'place_pwlin' C++ API for cell geometry queries. +* Added support for loading Allen SDK cell model morphologies from SWC. +* Added support for composing policies for creating compartments over sub-regions. + +### Documentation +* Restructured documentation to have cleaner separation between high level descriptions + of concepts and the C++ and Python APIs. +* Added high level documentation for morphology descriptions, labels and cable cell + construction. + +### Optimizations +* Implemented memory optimizations for GPU matrix solver. +* Added support for ARM SVE intrinsics in the vectorized CPU back end. + +### Bug Fixes +* Fixed various modcc code generation errors. + + + +# v0.3 + +** 2020 04 01 ** + +**Arbor** library **version 0.3**, tagged as `v0.3` + +Arbor is a library for implementing performance portable network simulations of multi-compartment neuron models. + +An installation guide and library documentation are available online at [Read the Docs](https://arbor.readthedocs.io/en/latest/). + +[Submit a ticket](https://github.com/eth-cscs/arbor) if you have any questions or want help. + +## Change Log + +Changes since [v0.2](https://github.com/arbor-sim/arbor/releases/tag/v0.2): + +* Python wrapper with pip installation. +* Replace the morphology specification API for more flexible cell building. +* Flat descriptions of ion channel distribution and synapse placement. +* Multi-compartment back end support for sub-branch mechanism distributions. +* Improved NMODL support: + * nonlinear kinetic schemes + * linear system solution in initial conditions + * many small features and bug fixes +* Generic ion species. +* Many optimizations and bug fixes. + + + +# v0.2.1 + +** 2019 08 26 ** + +**Arbor** library **version 0.2.1**, tagged as `v0.2.1` + +Arbor is a library for implementing performance portable network simulations of multi-compartment neuron models. + +An installation guide and library documentation are available online at [Read the Docs](https://arbor.readthedocs.io/en/latest/). + +[Submit a ticket](https://github.com/eth-cscs/arbor) if you have any questions or want help. + +### Release Notes. + +Minor Update. + + + +# v0.2 + +** 2019 03 04 ** + +**Arbor** library **version 0.2**, tagged as `v0.2` + +Arbor is a library for implementing performance portable network simulations of multi-compartment neuron models. + +An installation guide and library documentation are available online at [Read the Docs](https://arbor.readthedocs.io/en/latest/). + +[Submit a ticket](https://github.com/eth-cscs/arbor) if you have any questions or want help. + + +Some key features include: + + * Optimized back ends for CUDA, KNL, AVX2, ARM NEON intrinsics. + * Asynchronous spike exchange that overlaps compute and communication. + * Efficient sampling of voltage and current on all back ends. + * Efficient implementation of all features on GPU. + * Reporting of memory and energy consumption (when available on platform). + * An API for addition of new cell types, e.g. LIF and Poisson spike generators. + +## Change Log + +Changes since [v0.1](https://github.com/arbor-sim/arbor/releases/tag/v0.1): + + * A new Hines matrix solver back end for the GPU that parallelises over cell + branches, not cells, to increase the amount of parallelism. See #631. + * Support for describing and simulating electrical gap junctions. See #661 #686. + * An additional library `libarborenv` is now installed with useful + helper functionality for managing the environment (e.g. detecting the number of available CPU cores). See #679. + * Detection and allocation of GPUs to MPI ranks on systems with more than one GPU per node in `libarborenv`. See #659 and #654. + * The miniapp example was removed and replaced with a simple single cell model that shows how to use morphologies. See #703 and #710. + * Support for ARM NEON intrinsics. See #698. + * Basic Python support. Full Python support is slated for v0.3. See #668. + +### Contributors + +Nora Abi Akar +John Biddiscombe +Benjamin Cumming +Felix Huber +Marko Kabic +Vasileios Karakasis +Wouter Klijn +Anne Küsters +Alexander Peyser +Stuart Yates + +## Citation + +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2583709.svg)](https://doi.org/10.5281/zenodo.2583709) + +Nora Abi Akar, John Biddiscombe, Benjamin Cumming, Felix Huber, Marko Kabic, Vasileios Karakasis, Wouter Klijn, Anne Küsters, Alexander Peyser, Stuart Yates. (2019, March 4). arbor-sim/arbor: Arbor Library v0.2 (Version v0.2). Zenodo. http://doi.org/10.5281/zenodo.2583709 + + + +# v0.1 + +** 2018 10 18 ** + +## Arbor Library + +**Arbor** library **version 0.1**, tagged as `v0.1` + +Arbor is a library for implementing performance portable network simulations of multi-compartment neuron models. + +An installation guide and library documentation are available online at [Read the Docs](http://arbor.readthedocs.io/en/v0.1/). + +[Submit a ticket](https://github.com/eth-cscs/arbor) if you have any questions or want help. + + +Some key features include: + + * Optimized back ends for CUDA, KNL and AVX2 intrinsics. + * Asynchronous spike exchange that overlaps compute and communication. + * Efficient sampling of voltage and current on all back ends. + * Efficient implementation of all features on GPU. + * Reporting of memory and energy consumption (when available on platform). + * An API for addition of new cell types, e.g. LIF and Poisson spike generators. + * Validation tests against numeric/analytic models and NEURON. + +### Contributors +Nora Abi Akar +John Biddiscombe +Benjamin Cumming +Marko Kabic +Vasileios Karakasis +Wouter Klijn +Anne Küsters +Ivan Martinez +Alexander Peyser +Stuart Yates + +## Citation +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1459679.svg)](https://doi.org/10.5281/zenodo.1459679) + +If you use this version of Arbor, please cite it as **Nora Abi Akar, John Biddiscombe, Benjamin Cumming, Marko Kabic, Vasileios Karakasis, Wouter Klijn, Anne Küsters, Ivan Martinez, Alexander Peyser, Stuart Yates. (2018, October 12). arbor-sim/arbor: Version 0.1: First release (Version v0.1). Zenodo. http://doi.org/10.5281/zenodo.1459679**. The full citation is available in different formats on [Zenodo]( http://doi.org/10.5281/zenodo.1459679). diff --git a/VERSION b/VERSION index c0ab427224..a3df0a6959 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.1-dev +0.8.0 diff --git a/doc/contrib/pr.rst b/doc/contrib/pr.rst index a47539ecb7..eaa731af51 100644 --- a/doc/contrib/pr.rst +++ b/doc/contrib/pr.rst @@ -33,16 +33,18 @@ the workflow is as follows: 3. Make a pull request (PR) and refer to the issue(s) that the PR addresses. Some tips on how to write a good PR description: - - You can use labels to categorize your PR. For very large PRs, it - is likely the reviewer will have many questions and comments. It - can be helpful to reach out on Gitter, Github Discussions or by email - beforehand if you’ve big things planned for Arbor! - - Commit logical units with clear commit messages. - - Add a change summary to the PR message. If you remembered to commit - logical units, this could simply be a bulleted list of all commit - messages in the PR. If during the review process you make changes - to the features in the PR, keep the PR description updated. - - Use text like `fixes #123` in the description to refer to an issue. + - You can use labels to categorize your PR. For very large PRs, it + is likely the reviewer will have many questions and comments. It + can be helpful to reach out on Gitter, Github Discussions or by email + beforehand if you’ve big things planned for Arbor! + - Commit logical units with clear commit messages. + - Add a change summary to the PR message. If you remembered to commit + logical units, this could simply be a bulleted list of all commit + messages in the PR. If during the review process you make changes + to the features in the PR, keep the PR description updated. + - Use text like `fixes #123` in the description to refer to an issue. + - Prefix your PR title with BUGFIX, BREAKING, FEATURE if it fixes a bug, introduces + a breaking change or introduces a (major) new feature respectively. 4. We will accept contributions licensed with the same `BSD 3-Clause "New" or "Revised" License `_, diff --git a/doc/contrib/release.rst b/doc/contrib/release.rst index fec49ee60d..0b599e08b2 100644 --- a/doc/contrib/release.rst +++ b/doc/contrib/release.rst @@ -40,7 +40,7 @@ Update tags/versions and test #. Check if some files are up to date - - README.md, ATTRIBUTIONS.md, CONTRIBUTING.md, RELEASE_NOTES.md + - README.md, ATTRIBUTIONS.md, CONTRIBUTING.md, CHANGELOG.md - Verify MANIFEST.in (required for PyPI sdist) - Double check that all examples/tutorials/etc are covered by CI - Check Python/pip/PyPi metadata and scripts, e.g. ``setup.py``, ``pyproject.toml`` @@ -51,9 +51,16 @@ Update tags/versions and test - See also :ref:`dev-version` - Append ``-rc``. (Make sure there's no ``-dev``) -#. Run all tests. +#. Create a draft PR. Tag and push with ``-rc``. E.g. ``v0.6-rc`` - - ``ciwheel.yml`` triggers when you push a branch called ``ciwheel``, and on new Git tags. Since we've not tagged the release yet, run ``git push origin HEAD:ciwheel``. Make sure the tests pass. + - on cmdline: ``git tag -a TAGNAME`` + - ``git push upstream refs/tags/TAGNAME`` + - Githubs autogenerated release notes can only be generated on a tag. Use this ``-rc`` tag to do so, and add the commit to the draft PR. Ensure Github takes the previous release as base. + +#. Run and pass all tests. + + - They should run automatically based on the draft PR. Pushing the tag kicks of ``ciwheel``. + - In case you want to test ``ciwheel.yml`` manually on your local repo ``origin``, push to a branch called ``ciwheel``, e.g. ``git push origin HEAD:ciwheel``. - ``ciwheel.yml`` pushes automatically to `Test.PyPI.org `_. This only passes if ran as branch of the main ``arbor-sim`` repo (as that's where the PyPI secret lives). On your own repo, the upload will fail (the rest should pass). If you want to test uploading, then force push to the _upstream_ ``ciwheel`` branch, e.g. ``git push upstream HEAD:ciwheel --force``. @@ -63,7 +70,7 @@ Update tags/versions and test python -m venv env && source env/bin/activate pip install numpy - pip install -i https://test.pypi.org/simple/ arbor #should select the latest build, but doublecheck + pip install -i https://test.pypi.org/simple/ arbor #should select the latest build, otherwise e.g. arbor==0.8rc0 python -c 'import arbor; print(arbor.__config__)' - Use build flags to test the source package: :ref:`in_python_adv` @@ -79,9 +86,11 @@ Release #. Tag - - commit and open a PR for the above changes. - - on cmdline: ``git tag -a TAGNAME`` - - ``git push upstream TAGNAME`` + - commit and either reuse the draft PR for the RC, or open a new one. + - once merged, make and push tag. + + - on cmdline: ``git tag -a TAGNAME`` + - ``git push upstream TAGNAME`` #. Upload to pypi & verify diff --git a/ext/fmt b/ext/fmt index 9cb347b4b2..a33701196a 160000 --- a/ext/fmt +++ b/ext/fmt @@ -1 +1 @@ -Subproject commit 9cb347b4b2e80fc9fbf57b8621746663c3f870f6 +Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50 diff --git a/ext/json b/ext/json index db78ac1d77..bc889afb4c 160000 --- a/ext/json +++ b/ext/json @@ -1 +1 @@ -Subproject commit db78ac1d7716f56fc9f1b030b715f872f93964e4 +Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d diff --git a/ext/pybind11 b/ext/pybind11 index aa304c9c7d..80dc998efc 160000 --- a/ext/pybind11 +++ b/ext/pybind11 @@ -1 +1 @@ -Subproject commit aa304c9c7d725ffb9d10af08a3b34cb372307020 +Subproject commit 80dc998efced8ceb2be59756668a7e90e8bef917 diff --git a/spack/package.py b/spack/package.py index 1a998936cd..d988eaf9d9 100644 --- a/spack/package.py +++ b/spack/package.py @@ -53,8 +53,8 @@ class Arbor(CMakePackage, CudaPackage): ) # https://docs.arbor-sim.org/en/latest/install/build_install.html#compilers - conflicts("%gcc@:8.3") - conflicts("%clang@:7") + conflicts("%gcc@:8") + conflicts("%clang@:9") # Cray compiler v9.2 and later is Clang-based. conflicts("%cce@:9.1") conflicts("%intel") @@ -63,10 +63,13 @@ class Arbor(CMakePackage, CudaPackage): # misc dependencies depends_on("fmt@7.1:", when="@0.5.3:") # required by the modcc compiler + depends_on("fmt@9.1:", when="@0.7.1:") depends_on("nlohmann-json") depends_on("random123") - depends_on("cuda@10:", when="+cuda") depends_on("libxml2", when="+neuroml") + with when("+cuda"): + depends_on("cuda@10:") + depends_on("cuda@11:", when="@0.7.1:") # mpi depends_on("mpi", when="+mpi") @@ -79,7 +82,7 @@ class Arbor(CMakePackage, CudaPackage): with when("+python"): depends_on("py-pybind11@2.6:", type=("build")) depends_on("py-pybind11@2.8.1:", when="@0.5.3:", type=("build")) - depends_on("py-pybind11@2.10.0:", when="@0.7.1:", type=("build")) + depends_on("py-pybind11@2.10.1:", when="@0.7.1:", type=("build")) # sphinx based documentation depends_on("python@3.7:", when="+doc", type="build")