Skip to content

Changes to adapt mod files for MOD to CPP translation#11

Merged
olupton merged 3 commits into
masterfrom
pramodk/mod-cpp
Apr 1, 2022
Merged

Changes to adapt mod files for MOD to CPP translation#11
olupton merged 3 commits into
masterfrom
pramodk/mod-cpp

Conversation

@pramodk

@pramodk pramodk commented Mar 29, 2022

Copy link
Copy Markdown
Member
  • Remove random123 APIs as they are now included via headers
  • Avoid passing void*
  • Avoid assignement of void*

See neuronsimulator/nrn#1597

* Remove random123 APIs as they are now included via headers
* Avoid passing void*
* Avoid assignement of void*

See neuronsimulator/nrn#1597
@pramodk pramodk requested review from nrnhines and olupton March 29, 2022 14:24

@olupton olupton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Generally looks good, all my comments are basically the same.
nullptr is not going to work with the current master of NEURON.
I tend to think we will make our lives easier if we initially make these external models/tests dual C/C++ compatible, but I am open to other options.

Comment thread mod/invlfire.mod Outdated
Comment thread mod/invlfire.mod Outdated
Comment thread mod/invlfire.mod Outdated
Comment thread modx/invlfiresha.mod Outdated
Comment thread modx/invlfiresha.mod Outdated
@pramodk

pramodk commented Mar 29, 2022

Copy link
Copy Markdown
Member Author

I tend to think we will make our lives easier if we initially make these external models/tests dual C/C++ compatible, but I am open to other options.

In this case it's trivial do doesn't hurt. Done. (But in near future we might need bite the bulltet)

@pramodk pramodk marked this pull request as ready for review March 29, 2022 14:55
@olupton

olupton commented Mar 29, 2022

Copy link
Copy Markdown
Contributor

Before we merge this we should test the master of NEURON against the various updated test/model repositories.

@pramodk

pramodk commented Mar 29, 2022

Copy link
Copy Markdown
Member Author

Before we merge this we should test the master of NEURON against the various updated test/model repositories.

Will create PR where we can gather these updated masters.

olupton pushed a commit to neuronsimulator/nrn that referenced this pull request Mar 31, 2022
- [x] Update nrntest : @olupton: neuronsimulator/nrntest#26 is merged.
- [x] Update tqperf : @pramodk : neuronsimulator/tqperf#11
- [x] Update reduced_dentate: @pramodk : neuronsimulator/reduced_dentate#5
- [ ] olfactory-bulb-3d: @iomaganaris
- [ ] testcorenrn: @alkino
- [ ] channel-benchmark: @jorblancoa

All CI here in master should pass to make sure model changes are
backward compatible with MOD to C translation.
@olupton olupton merged commit add46f2 into master Apr 1, 2022
@olupton olupton deleted the pramodk/mod-cpp branch April 1, 2022 09:39
olupton added a commit to neuronsimulator/nrn that referenced this pull request Apr 1, 2022
* channel-benchmark!9
* HumanBrainProject/olfactory-bulb-3d#19,
  actually this PR merged into 2to3 branch.
* neuronsimulator/nrntest#26
* neuronsimulator/reduced_dentate#5
* neuronsimulator/testcorenrn#10
* neuronsimulator/tqperf#11
* BlueBrain/CoreNeuron#792
* BlueBrain/CoreNeuron#793

The new versions should still support being translated to C code by
NEURON versions with #1755,
but should additionally support being translated to C++ code: see
#1597.

Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
Co-authored-by: Ioannis Magkanaris <iomagkanaris@gmail.com>
Co-authored-by: Jorge Blanco Alonso <jorge.blancoalonso@epfl.ch>
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.

3 participants