From ba4f8b1bf5e4cfdc74c0b3d58d9747da27b3b127 Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Wed, 31 May 2023 09:58:05 +0200 Subject: [PATCH] neuron, coreneuron, nmodl: modern units by default --- bluebrain/repo-bluebrain/packages/coreneuron/package.py | 2 +- bluebrain/repo-bluebrain/packages/nmodl/package.py | 2 +- bluebrain/repo-patches/packages/neuron/package.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluebrain/repo-bluebrain/packages/coreneuron/package.py b/bluebrain/repo-bluebrain/packages/coreneuron/package.py index 7cc2d8e96892ce..150edccf5bf7c2 100644 --- a/bluebrain/repo-bluebrain/packages/coreneuron/package.py +++ b/bluebrain/repo-bluebrain/packages/coreneuron/package.py @@ -48,7 +48,7 @@ class Coreneuron(CMakePackage): ) variant("sympy", default=False, description="Use NMODL with SymPy to solve ODEs") variant("sympyopt", default=False, description="Use NMODL with SymPy Optimizations") - variant("legacy-unit", default=True, description="Enable legacy units") + variant("legacy-unit", default=False, description="Enable legacy units") # Build with `ninja` instead of `make` generator = "Ninja" diff --git a/bluebrain/repo-bluebrain/packages/nmodl/package.py b/bluebrain/repo-bluebrain/packages/nmodl/package.py index 558fb00e753e67..5a474b7dbbf02c 100644 --- a/bluebrain/repo-bluebrain/packages/nmodl/package.py +++ b/bluebrain/repo-bluebrain/packages/nmodl/package.py @@ -19,7 +19,7 @@ class Nmodl(CMakePackage): version("0.5.0", tag="0.5") version("0.4.0", tag="0.4") - variant("legacy-unit", default=True, description="Enable legacy units") + variant("legacy-unit", default=False, description="Enable legacy units") variant("python", default=False, description="Enable python bindings") variant("llvm", default=False, description="Enable llvm codegen") variant("llvm_cuda", default=False, description="Enable llvm codegen with CUDA backend") diff --git a/bluebrain/repo-patches/packages/neuron/package.py b/bluebrain/repo-patches/packages/neuron/package.py index f923fb42f3da44..1d46990f4dcdf9 100644 --- a/bluebrain/repo-patches/packages/neuron/package.py +++ b/bluebrain/repo-patches/packages/neuron/package.py @@ -32,7 +32,7 @@ class Neuron(CMakePackage): patch("patch-v800-cmake-nvhpc.patch", when="@8.0.0%nvhpc^cmake@3.20:") version("develop", branch="master") - version("9.0.a7", commit="67a672a") + version("9.0.a8", commit="67a672a") version("9.0.a5", commit="522c866") version("9.0.a4", commit="de2c927") version("9.0.a3", commit="afce1ef") @@ -90,7 +90,7 @@ class Neuron(CMakePackage): multi=True, values=("None", "olfactory", "channel-benchmark", "tqperf-heavy"), ) - variant("legacy-unit", default=True, description="Enable legacy units") + variant("legacy-unit", default=False, description="Enable legacy units") variant("caliper", default=False, description="Add LLNL/Caliper support") # extra variants from coreneuron recipe @@ -102,7 +102,7 @@ class Neuron(CMakePackage): variant("openmp", default=False, description="Enable OpenMP support", when="@9:") variant("report", default=True, description="Enable SONATA reports") variant("shared", default=True, description="Build shared library") - nmodl_variant_exists = "@9:9.0.a7 +coreneuron" + nmodl_variant_exists = "@9:9.0.a8 +coreneuron" variant( "nmodl", default=True,