-
Notifications
You must be signed in to change notification settings - Fork 710
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
use proper Python dependency for OTF2 #21325
Merged
SebastianAchilles
merged 1 commit into
easybuilders:develop
from
Thyre:otf2-use-toolchain-python
Sep 6, 2024
Merged
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,21 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.10.4'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.10' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| moduleclass = 'perf' | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,22 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.9.6'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.9' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
|
|
||
| moduleclass = 'perf' | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,21 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.10.4'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.10' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| moduleclass = 'perf' | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,21 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.10.8'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.10' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| moduleclass = 'perf' | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,22 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.11.3'), | ||
| ('Python-bundle-PyPI', '2023.06'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.11' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| moduleclass = 'perf' | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # Copyright:: Copyright 2013-2019 Juelich Supercomputing Centre, Germany | ||
| # Authors:: Bernd Mohr <[email protected]> | ||
| # Markus Geimer <[email protected]> | ||
| # Jan Andre Reuter <[email protected]> | ||
| # License:: 3-clause BSD | ||
| # | ||
| # This work is based on experiences from the UNITE project | ||
|
|
@@ -34,17 +35,22 @@ builddependencies = [ | |
| dependencies = [ | ||
| # SIONlib container support (optional): | ||
| ('SIONlib', '1.7.7', '-tools'), | ||
| # OTF2 Python bindings | ||
| ('Python', '3.11.5'), | ||
| ('Python-bundle-PyPI', '2023.10'), | ||
| ] | ||
|
|
||
| local_pyshortver = '3.11' | ||
| configopts = '--enable-shared' | ||
|
|
||
| modextrapaths = {'PYTHONPATH': ['lib64/python%s/site-packages' % local_pyshortver]} | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': ['bin/otf2-config', 'include/otf2/otf2.h', | ||
| 'lib/libotf2.a', 'lib/libotf2.%s' % SHLIB_EXT], | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| sanity_check_commands = ['%(namelower)s-config --help'] | ||
| sanity_check_commands = ['%(namelower)s-config --help', | ||
| 'python -c "import %(namelower)s"'] | ||
|
|
||
| moduleclass = 'perf' | ||
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.
I would suggest to use
-shere as otherwise the $HOME packages might be used causing failures/success: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.
Yes, it makes sense to include that flag, just to make sure that nothing breaks because of user packages. Do you want to make a follow-up PR? I probably don't have the time for that today.
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.
Done: #21362 which also does the same for other existing ECs
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.
@Flamefire This is relevant for several easyblocks too where we use
python -c?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.
Yes it is
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.
-> easybuilders/easybuild-easyblocks#3440