-
Notifications
You must be signed in to change notification settings - Fork 42
Bump spack-packages version #1186
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1387f5d
Update checkout-versions.yaml
michaelmckinsey1 a359fd2
change std ver
michaelmckinsey1 cf1ab07
Pin kokkos < 5
michaelmckinsey1 88e0791
Update package.py
michaelmckinsey1 defcee7
Remove compiler flags from systems
michaelmckinsey1 fce470d
Merge branch 'develop' into michaelmckinsey1-patch-1
michaelmckinsey1 9d99988
Remove other flags
michaelmckinsey1 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -53,7 +53,9 @@ class SpartaSnl(CMakePackage, CudaPackage, ROCmPackage): | |
| depends_on("kokkos+openmp cxxstd=17", when="+openmp") | ||
| depends_on("kokkos+rocm", when="+rocm") | ||
| depends_on("kokkos+wrapper+cuda cxxstd=17", when="+cuda") | ||
|
|
||
| # Kokkos 5 not building | ||
| depends_on("kokkos@:4", when="+kokkos") | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @rfhaque Is this expected to be necessary? |
||
|
|
||
| depends_on("jpeg", when="+jpeg") | ||
| depends_on("libpng", when="+png") | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -185,12 +185,6 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/opt/cray/pe/cce/18.0.0/", | ||
| {"c": "cracc", "cxx": "crayCC", "fortran": "crayftn"}, | ||
| flags={ | ||
| "cflags": "-g -O2 --gcc-toolchain=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0", | ||
| "cxxflags": "-g -O2 --gcc-toolchain=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0", | ||
| "fflags": "-g -O2 -hnopattern", | ||
| "ldflags": "-ldl", | ||
| }, | ||
| env={ | ||
| "prepend_path": { | ||
| "LD_LIBRARY_PATH": "/opt/cray/pe/cce/18.0.0/cce/aarch64/lib:/opt/cray/libfabric/1.20.1/lib64:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib64:/opt/cray/pe/gcc-libs" | ||
|
|
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -455,12 +455,6 @@ def compute_compilers_section(self): | |
| } | ||
| cuda_modules = cuda_module_map[cuda_ver] | ||
|
|
||
| flags = { | ||
| "cflags": "-g -O2", | ||
| "cxxflags": "-g -O2", | ||
| "fflags": "-g -O2", | ||
| } | ||
|
|
||
| if (compiler, cuda_ver) == ("clang-ibm", "11-8-0"): | ||
| cfg1 = compiler_section_for( | ||
| "llvm", | ||
|
|
@@ -469,7 +463,6 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/", | ||
| {"c": "clang", "cxx": "clang++"}, | ||
| flags=flags, | ||
| modules=cuda_modules | ||
| + ["clang/ibm-16.0.6-cuda-11.8.0-gcc-11.2.1"], | ||
| ) | ||
|
|
@@ -482,7 +475,6 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/", | ||
| {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, | ||
| flags=flags, | ||
| ) | ||
| ], | ||
| ) | ||
|
|
@@ -495,7 +487,6 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/", | ||
| {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, | ||
| flags=flags, | ||
| modules=cuda_modules + ["xl/2023.06.28-cuda-11.8.0-gcc-11.2.1"], | ||
| ) | ||
| ], | ||
|
|
@@ -508,7 +499,6 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/usr/tce/packages/xl/xl-2022.08.19/", | ||
| {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, | ||
| flags=flags, | ||
| modules=cuda_modules + ["xl/2022.08.19"], | ||
| ) | ||
| ], | ||
|
|
@@ -521,24 +511,18 @@ def compute_compilers_section(self): | |
| "[email protected]", | ||
| "/usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/", | ||
| {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, | ||
| flags=flags, | ||
| modules=cuda_modules + ["xl/2022.08.19-cuda-11.8.0"], | ||
| ) | ||
| ], | ||
| ) | ||
| elif (compiler, cuda_ver) == ("clang", "11-8-0"): | ||
| custom_flags = { | ||
| "cflags": "-g -O2", | ||
| "cxxflags": "-g -O2", | ||
| } | ||
| cfg1 = compiler_section_for( | ||
| "llvm", | ||
| [ | ||
| compiler_def( | ||
| "[email protected]", | ||
| "/usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/", | ||
| {"c": "clang", "cxx": "clang++"}, | ||
| flags=custom_flags, | ||
| ) | ||
| ], | ||
| ) | ||
|
|
@@ -549,7 +533,6 @@ def compute_compilers_section(self): | |
| "[email protected] languages:=c,c++,fortran", | ||
| "/usr/tce/packages/gcc/gcc-11.2.1/", | ||
| {"c": "gcc", "cxx": "g++", "fortran": "gfortran"}, | ||
| flags=custom_flags, | ||
| ) | ||
| ], | ||
| ) | ||
|
|
||
This file contains hidden or 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.
@rfhaque Is this expected to be necessary?