nrnivmodl under cmake no longer uses symbolic links. #850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pramodk
reviewed
Nov 30, 2020
There was a problem hiding this comment.
Overall LGTM. Have some minor suggestion about var names.
Generating makefile and including that in another makefile is not the pattern I used before. But it might come handy.
I tested generated wheel and BBP models by building this PR from source. This works fine.
-I<mod_file_location> before $(INCLUDES)
But note that Make rules require a tab for indentation.
pramodk
reviewed
Dec 5, 2020
|
@nrnhines : we need to backport some of the important fixes to v7.8 (e.g. v7.8.2) and then we can release new wheels for the same. |
nrnhines
added a commit
that referenced
this pull request
Dec 8, 2020
* nrnivmodl under cmake no longer uses symbolic links. * windows has different signature for mkdir * missed one * .libs/libnrnmech.sh may not be a symlink. * Accept reviewer suggestions. -I<mod_file_location> before $(INCLUDES) * Uniform 2 space per level indentation. But note that Make rules require a tab for indentation. * Handle spaces in paths to mod file * extern cfiles can be a ';' separated list of c files * extern cfiles now is extern nrnivmodl_cfiles to list ';' separated c files. * nrnivmodl file and folder name arg checking. * print args only on error * add some comments Co-authored-by: Pramod Kumbhar <pramod.kumbhar@epfl.ch>
nrnhines
added a commit
that referenced
this pull request
Dec 10, 2020
* nrnivmodl under cmake no longer uses symbolic links. * windows has different signature for mkdir * missed one * .libs/libnrnmech.sh may not be a symlink. * Accept reviewer suggestions. -I<mod_file_location> before $(INCLUDES) * Uniform 2 space per level indentation. But note that Make rules require a tab for indentation. * Handle spaces in paths to mod file * extern cfiles can be a ';' separated list of c files * extern cfiles now is extern nrnivmodl_cfiles to list ';' separated c files. * nrnivmodl file and folder name arg checking. * print args only on error * add some comments Co-authored-by: Pramod Kumbhar <pramod.kumbhar@epfl.ch>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #846
Keeps the legacy style for autotools.
nocmodl has a
-o output_diroption following BlueBrain/mod2c#8Instead of symbolic links, nrnivmod creates makefile include file that defines the rules for individual mod and c file for
nrnivmodl_makefile_cmake.in. The rules for mod generated c files is more robust as the location of the mod file is added as an -I argument. The rules for external $cfiles are more robust as the compile happens at the location of the c file.Tested on linux for autotools and cmake on modeldb regression and tested with
The latter test does all files in first two relative path folders, an explicit full path mod file without specifying the suffix, and an explicit relative path mod file with the suffix.