-
Notifications
You must be signed in to change notification settings - Fork 284
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
required changes for toolchain which replaces toolkit + cleanups/enhancements #7
Merged
+123
−137
Merged
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
7f8c6a9
stop using toolkit, use toolchain instead
boegel 13abdf7
stop using toolchain.opts, use toolchain.options instead
boegel ce36418
stop misuing mpi_family to determine MPI lib dir, use MPI_LIB_DIR ins…
boegel 8c0f7f6
fix debug message when clearing LDFLAGS
boegel b1bb9a7
fix specifying libs and includes for numpy
boegel bac94a0
fix use of get_openmp_flag and mpi_type
boegel 3247b58
fix specifying library/include paths, just strip off -L/-I prefixes
boegel 297f083
make sure old install dir is removed before configuring
boegel 70fa993
use toolchain.QLOGICMPI instead of QLOGIC
boegel 826a4af
fix use of license_server that was renamed from licenseServer
boegel 530904a
fix sanity check for METIS
boegel b32d80e
fix typo in help for shared_libs easyconfig parameters
boegel 080cf32
fix checking of MPI family for IntelMPI
boegel c915ff1
fix use of INTELMPI constant, rename INTEL constant to INTELCOMP
boegel bbe1307
add comments to make PyDev happy about assignment to __path__
boegel 701745f
fix rename of make_install into install_step (how did we miss that?)
boegel fd60bf6
add #@UndefinedVariable comments to make PyDev happy where toolchain …
boegel 5139f84
use dontcreate parameter for make_installdir (depends on https://gith…
boegel 927efd7
Merge branch 'toolchain_176' of github.com:boegel/easybuild-easyblock…
boegel 9867a85
refactor out preprocessor flag in a variable, and append it to cflags…
boegel 953e13b
use toolchain.get_variable method to obtain list of library and inclu…
boegel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
at some point we will have to specify what the best way is to do this: through environment or through toolchain instance
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
with best i meant "recommended"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel environment variables are easier, no API for people to get familiar with, they just need to know which environment variable to use. It also allows us to make changes to toolchain, if needed.
The biggest downside is that something else may be setting the environment variables as well, outside of EasyBuild, I guess.
Is there currently an easy way to access stuff like
CC
,MPICC
and things likeCFLAGS
andMPI_LIB_DIR
viatoolchain
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i don't understand the question.
str(self.toolchain.variables['CC'])
? you could write a tiny function (get_variable
) to do just that.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't realize it was that simple. :) But it does make a lot of sense in retrospect.
Having a
get_variable
function makes sense, it hides the guts of toolchain, which is a good thing (because then we can change it without affecting outsiders).So... Should we change this everywhere? That's going to be a fun exercise... Hard to test if we got them all too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ask feedback and make the preferred method known. actual work can be done later and in seperate issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See easybuilders/easybuild-framework#298 for a discussion on this.