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

nrnbbcore_write code re-organisation #722

Merged
merged 6 commits into from
Aug 28, 2020
Merged

Conversation

alexsavulescu
Copy link
Member

@alexsavulescu alexsavulescu commented Aug 20, 2020

This PR targets nrnbbcore_write code re-organisation (and a few minor updates).
It represents a first step for its refactoring.

@alexsavulescu alexsavulescu marked this pull request as draft August 20, 2020 16:17
@nrnhines
Copy link
Member

nrnhines commented Aug 20, 2020

I think that this refactoring is a good time to replace nrnbbcore_write with nrncore_write (and any other nrnbbcore prefixes with nrncore).

@alexsavulescu
Copy link
Member Author

I think that this refactoring is a good time to replace nrnbbcore_write with nrncore_write (and any other nrnbbcore prefixes with nrncore).

Noted.

@alkino thank you for the review, this PR is however just about re-organising the code. Will tackle those when refactoring is of interest. Just made a few changes, will tag those so you can have a look.

@alexsavulescu alexsavulescu force-pushed the nrnbbcore_write_reorg branch from ffc3b53 to 7be0e38 Compare August 21, 2020 10:35
@alexsavulescu alexsavulescu marked this pull request as ready for review August 24, 2020 14:04
@alexsavulescu
Copy link
Member Author

Used this to have a sort of integration test, outputs are the same wrt master:

Copy link
Member

@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.

This PR is almost good for merge.

I didn't comment on the code style aspects as we want to limit this PR for code re-organisation and not changing the implementation.

Copy link
Member

@nrnhines nrnhines left a comment

Choose a reason for hiding this comment

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

This is too much to pore over in detail. I trust things are just being copied to other places and enough include stuff is added to make everything consistent. It is a transition pull request to be extensively modified later. I wish #717 had made it in before this. When @pramodk approves, in it goes, unless we prefer to keep in different branch that receives pull requests til it is mature or nicely polished.

@alexsavulescu
Copy link
Member Author

@nrnhines I propose to review #717 and wait for it to get merged before, so that I can move your modifications accordingly.
In the meantime I will do a bit of polishing.

@alexsavulescu alexsavulescu marked this pull request as draft August 24, 2020 16:48
@alexsavulescu alexsavulescu marked this pull request as ready for review August 27, 2020 20:40
Copy link
Member

@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.

as most of the changes are just re-organisation of code without any change is logic, I am also OK to merge this PR sooner. (after Alex give green signal)

Copy link
Member

@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.

I am triggering CI at BBP server as a sanity check. Will report is here once those tests passes.
Simulation CI job on BBP server is here.

@pramodk
Copy link
Member

pramodk commented Aug 27, 2020

I am seeing below error:


Reports Buffering Info : flushBufferScalar: 1, nextReportFlush: 25, steps_to_buffer: 300 
19 special: NEURON model internal structures are out of date
19  in /jenkins/05/workspace/hpc.SimulationStack/INSTALL_HOME/install/linux-rhel7-x86_64/intel-19.0.4/neurodamus-neocortex-develop-6735d5/lib/hoc/init.hoc near line 262
19  {cvode.cache_efficient(1)}
25 special: NEURON model internal structures are out of date
25  in /jenkins/05/workspace/hpc.SimulationStack/INSTALL_HOME/install/linux-rhel7-x86_64/intel-19.0.4/neurodamus-neocortex-develop-6735d5/lib/hoc/init.hoc near line 262
25  {cvode.cache_efficient(1)}
                           ^
1 special: NEURON model internal structures are out of date
1  in /jenkins/05/workspace/hpc.SimulationStack/INSTALL_HOME/install/linux-rhel7-x86_64/intel-19.0.4/neurodamus-neocortex-develop-6735d5/lib/hoc/init.hoc near line 262
1  {cvode.cache_efficient(1)}

I wonder if this behaviour was introduced in master branch itself. I started new CI job for master branch of NEURON.

Copy link
Member

@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.

The issue I described in previous comment comes from the older commit in the master branch and we will handle that separately.

Discussed with Robert on slack and we will go ahead with the merge.

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.

4 participants