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

Include solvers to avoid include path dependency.#1329

Merged
matz-e merged 10 commits into
masterfrom
include-solver-headers
Jul 5, 2024
Merged

Include solvers to avoid include path dependency.#1329
matz-e merged 10 commits into
masterfrom
include-solver-headers

Conversation

@matz-e

@matz-e matz-e commented Jul 2, 2024

Copy link
Copy Markdown
Member

Similar to #1305, include the solver headers in variables in a C++
header, and include them in the code generated for the MOD files. This
should allow to substitute different NMODL binaries in NEURON builds
without confusion as to which solver headers are going to be included in
the MOD file compilation.

Tested in neuronsimulator/nrn#2953

CI_BRANCHES:NEURON_BRANCH=nmodl-include-header-cleanup

bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 2, 2024
matz-e added a commit to neuronsimulator/nrn that referenced this pull request Jul 2, 2024
In BlueBrain/nmodl#1329, solver includes for MOD file generation are
included in the NMODL binary. This PR removes remaining CMake glue, as
well as outdated code removed in BlueBrain/nmodl#964. Sitting on top of
PR #1305.
@bbpbuildbot

This comment has been minimized.

bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 2, 2024
@bbpbuildbot

This comment has been minimized.

matz-e added 3 commits July 2, 2024 09:15
Similar to #1305, include the solver headers in variables in a C++
header, and include them in the code generated for the MOD files. This
should allow to substitute different NMODL binaries in NEURON builds
without confusion as to which solver headers are going to be included in
the MOD file compilation.
@matz-e matz-e force-pushed the include-solver-headers branch from 7a72d9a to a6b19d5 Compare July 2, 2024 13:15
bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 2, 2024
bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 2, 2024
bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 2, 2024
@bbpbuildbot

This comment has been minimized.

Also only use it for testing, and use targets where appropriate.
@bbpbuildbot

This comment has been minimized.

@bbpbuildbot

This comment has been minimized.

matz-e added a commit to neuronsimulator/nrn that referenced this pull request Jul 4, 2024
In BlueBrain/nmodl#1329, solver includes for MOD file generation are
included in the NMODL binary. This PR removes remaining CMake glue, as
well as outdated code removed in BlueBrain/nmodl#964. Sitting on top of
PR #1305.
bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 4, 2024
@codecov

codecov Bot commented Jul 4, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 85.37%. Comparing base (7beaee9) to head (a57ede4).

Files Patch % Lines
src/codegen/codegen_coreneuron_cpp_visitor.cpp 50.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1329   +/-   ##
=======================================
  Coverage   85.37%   85.37%           
=======================================
  Files         178      178           
  Lines       13458    13459    +1     
=======================================
+ Hits        11490    11491    +1     
  Misses       1968     1968           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bbpbuildbot

This comment has been minimized.

bbpadministrator pushed a commit to BlueBrain/nmodl-references that referenced this pull request Jul 4, 2024
@matz-e matz-e marked this pull request as ready for review July 4, 2024 13:32
@matz-e matz-e requested a review from pramodk July 4, 2024 13:37
@matz-e matz-e requested a review from alkino July 4, 2024 13:37
@bbpbuildbot

Copy link
Copy Markdown
Collaborator

Logfiles from GitLab pipeline #220283 (:white_check_mark:) have been uploaded here!

Status and direct links:

Comment thread src/solver/CMakeLists.txt
Comment thread src/solver/solver.hpp.inc
Comment thread src/solver/CMakeLists.txt
Comment thread CMakeLists.txt
@matz-e matz-e merged commit 7910146 into master Jul 5, 2024
@matz-e matz-e deleted the include-solver-headers branch July 5, 2024 14:14
matz-e added a commit to neuronsimulator/nrn that referenced this pull request Jul 5, 2024
In BlueBrain/nmodl#1329, solver includes for MOD file generation are
included in the NMODL binary. This PR removes remaining CMake glue, as
well as outdated code removed in BlueBrain/nmodl#964. Sitting on top of
PR #1305.
pramodk pushed a commit to neuronsimulator/nrn that referenced this pull request Jul 8, 2024
* In BlueBrain/nmodl#1329, solver includes for MOD file generation are
included in the NMODL binary. This PR removes remaining CMake glue, as
well as outdated code removed in BlueBrain/nmodl#964. Sitting on top of
PR #1305.
* NEURON copies the Eigen headers into the installation prefix
JCGoran pushed a commit to neuronsimulator/nrn that referenced this pull request Mar 12, 2025
Similar to BlueBrain/nmodl#1305, include the solver headers in variables in a C++
header, and include them in the code generated for the MOD files. This
should allow to substitute different NMODL binaries in NEURON builds
without confusion as to which solver headers are going to be included in
the MOD file compilation.

NMODL Repo SHA: BlueBrain/nmodl@7910146
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.

4 participants