Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Conversation

@olupton
Copy link
Contributor

@olupton olupton commented May 4, 2022

Description
Move scopmath solvers into header files, drop kinderiv.py/dimplic.cpp workarounds.

TODO:

Use certain branches in CI pipelines.

CI_BRANCHES:NEURON_BRANCH=master,NMODL_BRANCH=master,SPACK_BRANCH=develop

@bbpbuildbot

This comment was marked as outdated.

@bbpbuildbot

This comment was marked as outdated.

@pramodk
Copy link
Collaborator

pramodk commented May 4, 2022

It seems like the simulation stack is failing with unrelated errors and could be ignored.

image

Copy link
Collaborator

@pramodk pramodk left a comment

Choose a reason for hiding this comment

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

Quickly skimmed through this and overall everything looks fine!

@olupton olupton force-pushed the olupton/scopmath-inline branch from 8c42d35 to d534166 Compare May 12, 2022 08:59
@olupton olupton marked this pull request as ready for review May 12, 2022 08:59
@bbpbuildbot

This comment was marked as outdated.

Copy link
Collaborator

@pramodk pramodk left a comment

Choose a reason for hiding this comment

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

1-2 minor comments but overall LGTM!

Copy link
Collaborator

@pramodk pramodk left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

olupton added a commit to BlueBrain/mod2c that referenced this pull request May 12, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
olupton added a commit to BlueBrain/nmodl that referenced this pull request May 12, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
@olupton olupton force-pushed the olupton/scopmath-inline branch from ee2d196 to 2f8b46d Compare May 12, 2022 16:21
@pramodk pramodk merged commit 554c250 into master May 12, 2022
@pramodk pramodk deleted the olupton/scopmath-inline branch May 12, 2022 19:06
iomaganaris pushed a commit to BlueBrain/nmodl that referenced this pull request May 13, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
iomaganaris pushed a commit to BlueBrain/nmodl that referenced this pull request May 13, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
iomaganaris pushed a commit to BlueBrain/nmodl that referenced this pull request May 13, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
iomaganaris pushed a commit to BlueBrain/nmodl that referenced this pull request May 13, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
iomaganaris added a commit to BlueBrain/nmodl that referenced this pull request May 17, 2022
#868)

* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.

Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
iomaganaris added a commit to BlueBrain/nmodl that referenced this pull request Sep 15, 2022
#868)

* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.

Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
iomaganaris added a commit to BlueBrain/nmodl that referenced this pull request Sep 15, 2022
#868)

* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.

Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
pramodk pushed a commit to neuronsimulator/nrn that referenced this pull request Nov 2, 2022
…c.cpp (BlueBrain/CoreNeuron#809)

* Solvers used for derivimplicit, sparse and euler methods were
   compiled as a separate library. These solvers were called from
   generated .mod to .cpp files.
* But as GPU programming models don't support function pointers,
   we use a very convoluted way via macros (+ _kinderiv.py) to achieve
   similar functionality as function pointers. This also needed to use
   `acc routine seq` for all the solver routines. But this is not compatible
   when we want to support shared libraries for python wheels (see BlueBrain/CoreNeuron#141)
* With this PR we make all solvers inline-able by making them part of headers
* Finally drop kinderiv.py !
* Drop acc routine seq
* Reallocate net receive buffers using ecalloc_align/free_memory for consistency.
* fix-up test, update submodules
* Make the NetReceiveBuffer initial size at least 8.

CoreNEURON Repo SHA: BlueBrain/CoreNeuron@554c250
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants