Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

neuron: add 9.0.a9 including SoA data #2051

Merged
merged 2 commits into from
Jun 20, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bluebrain/deployment/environments/applications_hpc.yaml
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@ spack:
^petsc+complex: '{name}-complex/{version}'
specs:
- neuron+tests+coreneuron
- neuron+tests+nmodl+sympy+coreneuron
- neuron+tests+coreneuron+sympy
- neuron%nvhpc+caliper+coreneuron+gpu+tests+openmp
- neuron%nvhpc+caliper+coreneuron+gpu+tests~openmp+nmodl
- neuron%nvhpc+caliper+coreneuron+gpu+tests+openmp+nmodl+sympy
- neuron%nvhpc+caliper+coreneuron+gpu+tests~openmp
- neuron%nvhpc+caliper+coreneuron+gpu+tests+openmp+sympy
- [email protected]
- neurodamus-hippocampus+coreneuron+caliper
- neurodamus-mousify+coreneuron+caliper
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ class LibsonataReport(CMakePackage):
git = "https://github.com/BlueBrain/libsonatareport.git"

version("develop", branch="master", submodules=False, get_full_repo=True)
version("1.2.1", tag="1.2.1", submodules=False)
version("1.2", tag="1.2", submodules=False)
version("1.1.1", tag="1.1.1", submodules=False)
version("1.1", tag="1.1", submodules=False)
9 changes: 5 additions & 4 deletions bluebrain/repo-patches/packages/neuron/package.py
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ class Neuron(CMakePackage):
patch("patch-v800-cmake-nvhpc.patch", when="@8.0.0%nvhpc^[email protected]:")

version("develop", branch="master")
version("9.0.a9", commit="baf3b14")
version("9.0.a8", commit="67a672a")
version("9.0.a5", commit="522c866")
version("9.0.a4", commit="de2c927")
@@ -111,10 +112,10 @@ class Neuron(CMakePackage):
)
# There are three different eras relevant for these variants:
# * neuron@:9 -- coreneuron was a separate package, so nmodl is irrelevant to this recipe
# * neuron@9:9.0.a6 -- coreneuron exists inside neuron, nmodl is active if +coreneuron+nmodl
# * neuron@develop -- coreneuron exists inside neuron,
# mod2c is dead so nmodl active if +coreneuron
nmodl_enabled_specs = [nmodl_variant_exists + "+nmodl", "@develop +coreneuron"]
# * neuron@9:9.0.a8 -- coreneuron exists inside neuron, nmodl is active if +coreneuron+nmodl
# * neuron@9.0.a9 -- coreneuron exists inside neuron, mod2c is dead so nmodl active if
# +coreneuron
nmodl_enabled_specs = [nmodl_variant_exists + "+nmodl", "@9.0.a9: +coreneuron"]
for nmodl_spec in nmodl_enabled_specs:
# The lack of version constraint is a lie
# most neuron/coreneuron versions are only compatible with one