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

Neurodamus-models to depend on neurodamus-py (bringing core) #1406

Merged
merged 21 commits into from
Jan 26, 2022

Conversation

ferdonline
Copy link

@ferdonline ferdonline commented Dec 21, 2021

Summary

As part of the repo reorganization (2021), neurodamus-core becomes officially an addendum to neurodamus-py

This PR changes the way neurodamus is built, and ultimately loaded, by setting neurodamus-py as a direct dependency of the models.

Context

Neurodamus-core has became a submodule of neurodamus-py to support the long term goal of dropping it if favor of pure Python. Consequently it can/must no longer be considered a main package.
We therefore make neurodamus-models to depend directly on neurodamus-py, since it brings it all, which streamlines the process of building, deploying and even loading.
The end user will be able to simply load e.g. neurodamus-neocortex and have a fully functional environment with guaranteed cross-compatibility of the neocortex model, core and (Edit: Soon) neurodamus-py.
Edit: We disabled auto-loading neurodamus-py since it will bring the intel stack, which is not optimal because we may need to use other stacks (bglig-py...). These issues should be addresses in a dedicated ticket.

Extra

Bumped neurodamus-py to 2.10.0, bringing

  • initial Neurodamulation support
  • Sonata config fixes
  • Some mandatory dependencies became optional, namely scipy is no longer required for normal workloads
  • etc

@ferdonline ferdonline changed the title neurodamus-models to depend on neurodamus-py (bringing core) wip: neurodamus-models to depend on neurodamus-py (bringing core) Dec 21, 2021
Keeping old function version_from_model_core_dep to enable building
latest stable deployed version depending still on neurodamus-core.

Changed recipes to call the function once per version for readability
@ferdonline ferdonline marked this pull request as ready for review December 23, 2021 09:33
@ferdonline ferdonline changed the title wip: neurodamus-models to depend on neurodamus-py (bringing core) Neurodamus-models to depend on neurodamus-py (bringing core) Dec 23, 2021
matz-e
matz-e previously requested changes Dec 29, 2021
deploy/environments/libraries.yaml Outdated Show resolved Hide resolved
jorblancoa
jorblancoa previously approved these changes Jan 12, 2022
Copy link

@jorblancoa jorblancoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Conflicts:
	bluebrain/repo-bluebrain/packages/neurodamus-hippocampus/package.py
	bluebrain/repo-bluebrain/packages/neurodamus-mousify/package.py
	bluebrain/repo-bluebrain/packages/neurodamus-neocortex/package.py
	bluebrain/repo-bluebrain/packages/neurodamus-thalamus/package.py
	deploy/environments/libraries.yaml
	var/spack/repos/builtin/packages/py-charm4py/package.py
@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-thalamus/1.6-2.9.0
neurodamus-hippocampus/1.6-2.9.0
neurodamus-hippocampus-knl/1.6-2.9.0
neurodamus-neocortex-plasticity/1.6-2.9.0
neurodamus-neocortex/1.6-2.9.0
py-neurodamus/2.9.0
neurodamus-thalamus-knl/1.6-2.9.0
neurodamus-neocortex-knl/1.6-2.9.0
neurodamus-mousify/1.6-2.9.0

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-mousify/1.6-2.9.0
neurodamus-neocortex/1.6-2.9.0
py-neurodamus/2.9.0
neurodamus-thalamus-knl/1.6-2.9.0
neurodamus-hippocampus-knl/1.6-2.9.0
neurodamus-hippocampus/1.6-2.9.0
neurodamus-neocortex-plasticity/1.6-2.9.0
neurodamus-neocortex-knl/1.6-2.9.0
neurodamus-thalamus/1.6-2.9.0

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-mousify/1.6-2.9.0
neurodamus-thalamus/1.6-2.9.0
py-neurodamus/2.9.0
neurodamus-neocortex-plasticity/1.6-2.9.0
neurodamus-hippocampus-knl/1.6-2.9.0
neurodamus-neocortex/1.6-2.9.0
neurodamus-neocortex-knl/1.6-2.9.0
neurodamus-thalamus-knl/1.6-2.9.0
neurodamus-hippocampus/1.6-2.9.0

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-thalamus/1.6-2.9.0
neurodamus-hippocampus/1.6-2.9.0
neurodamus-neocortex/1.6-2.9.0
py-neurodamus/2.10.0
neurodamus-thalamus-knl/1.6-2.9.0
neurodamus-hippocampus-knl/1.6-2.9.0
neurodamus-mousify/1.6-2.9.0
neurodamus-neocortex-knl/1.6-2.9.0
neurodamus-neocortex-plasticity/1.6-2.9.0

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-mousify/1.6-2.9.0
neurodamus-neocortex-plasticity/1.6-2.9.0
neurodamus-neocortex-knl/1.6-2.9.0
neurodamus-hippocampus/1.6-2.9.0
neurodamus-thalamus-knl/1.6-2.9.0
py-neurodamus/2.10.0
neurodamus-thalamus/1.6-2.9.0
neurodamus-hippocampus-knl/1.6-2.9.0
neurodamus-neocortex/1.6-2.9.0

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-hippocampus-knl/1.6-2.10.0
neurodamus-thalamus-knl/1.6-2.10.0
py-neurodamus/2.10.0
neurodamus-neocortex-plasticity/1.6-2.10.0
neurodamus-mousify/1.6-2.10.0
neurodamus-neocortex-knl/1.6-2.10.0
neurodamus-hippocampus/1.6-2.10.0
neurodamus-thalamus/1.6-2.10.0
neurodamus-neocortex/1.6-2.10.0

Copy link
Member

@matz-e matz-e left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable. I'd prefer if the structure were simpler still, but we can leave that for future work.

@bbpbuildbot
Copy link
Collaborator

To test your PR, use the following on BlueBrain5:

unset MODULEPATH
. /gpfs/bbp.cscs.ch/ssd/apps/bsd/pulls/1406/config/modules.sh
module load unstable

Please test the following updated modules:

neurodamus-neocortex-plasticity/1.6-2.10.0
neurodamus-neocortex/1.6-2.10.0
neurodamus-neocortex-knl/1.6-2.10.0
neurodamus-hippocampus/1.6-2.10.0
py-neurodamus/2.10.0
neurodamus-mousify/1.6-2.10.0
neurodamus-thalamus/1.6-2.10.0
neurodamus-thalamus-knl/1.6-2.10.0
neurodamus-hippocampus-knl/1.6-2.10.0

@ferdonline ferdonline merged commit 0e78343 into develop Jan 26, 2022
@ferdonline ferdonline deleted the neurodamus/new_recipes branch January 26, 2022 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants