-
Notifications
You must be signed in to change notification settings - Fork 46
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
Add ai-env virtual package; remove python variant from jedi-base-env; bug fixes for Discover SCU16/17; doc updates for ParallelWorks; etc #1017
Merged
climbfuji
merged 26 commits into
JCSDA:develop
from
climbfuji:bugfix/discover_scu16_ldflags
Mar 8, 2024
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
09a1f2d
Update submodule pointer for spack
climbfuji e318ced
Update submodule pointer for spack
climbfuji fc6eef7
Set env variable I_MPI_EXTRA_FILESYSTEM='ON' for Derecho and Discover…
climbfuji b26ebfb
Add protobuf and py-protobuf to list of module excludes
climbfuji 35fc2a5
Update README.md for noaa-aws, noaa-azure, noaa-gcloud
climbfuji 430c887
Update instructions for building ecflow on Discover SCU17
climbfuji 3f723d6
Add variant to build py-torch as part of jedi-base-env, defaults to F…
climbfuji 0f6cd8e
Update submodule pointer for spack
climbfuji e3a3184
Update openmpi on Nautilus to 4.1.6 (#1014)
climbfuji 7104e11
Update doc/source/PreConfiguredSites.rst for Discover SCU16/17
climbfuji 834e435
Merge branch 'develop' of https://github.com/jcsda/spack-stack into b…
climbfuji 9fe5499
Merge branch 'develop' of https://github.com/jcsda/spack-stack into b…
climbfuji ebb945f
Remove python variant from jedi-base-env dependency in gmao-swell-env
climbfuji f81d7ee
Add ai-env virtual package
climbfuji b0fb03e
Skip duplicate check for py-protobuf in github actions
climbfuji d0c1623
Add diag-disable flag for deprecated Intel classic compilers for Herc…
climbfuji 60e421f
Enable variant internal-protobuf for py-torch in ai-env
climbfuji 59b7aa9
Skip ai-env with Intel compilers in unified-dev template
climbfuji 8424f72
Move variant definitions for py-torch from spack-ext/repos/spack-stac…
climbfuji fde4df0
Revert '-i py-protobuf' for .github/workflows/*
climbfuji 986cc01
Update submodule pointer for spack
climbfuji 90c8f3a
Put inadvertently deleted line back in configs/sites/noaa-azure/READM…
climbfuji 54b61ad
Update submodule pointer for spack
climbfuji fa9ca77
Update submodule pointer for spack
climbfuji 1a26f1e
Revert .gitmodules and update submodule pointer for spack
climbfuji 14fd885
Merge branch 'develop' of https://github.com/jcsda/spack-stack into b…
climbfuji 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 |
---|---|---|
|
@@ -71,6 +71,8 @@ modules: | |
- openssl | ||
- perl | ||
- pkgconf | ||
- protobuf | ||
- py-protobuf | ||
- qt | ||
- randrproto | ||
- readline | ||
|
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 |
---|---|---|
|
@@ -73,6 +73,8 @@ modules: | |
- openssl | ||
- perl | ||
- pkgconf | ||
- protobuf | ||
- py-protobuf | ||
- qt | ||
- randrproto | ||
- readline | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,47 @@ | ||
compilers:: | ||
- compiler: | ||
spec: intel@2021.10.0 | ||
paths: | ||
cc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icc | ||
cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc | ||
f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort | ||
fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort | ||
flags: {} | ||
operating_system: sles15 | ||
target: x86_64 | ||
modules: | ||
- ncarenv/23.09 | ||
- intel-classic/2023.2.1 | ||
environment: | ||
prepend_path: | ||
PATH: '/opt/cray/pe/gcc/12.2.0/bin' | ||
CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include' | ||
LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/lib64' | ||
set: | ||
# https://github.com/JCSDA/spack-stack/issues/957 | ||
FI_CXI_RX_MATCH_MODE: 'hybrid' | ||
extra_rpaths: [] | ||
- compiler: | ||
spec: gcc@12.2.0 | ||
paths: | ||
cc: /opt/cray/pe/gcc/12.2.0/bin/gcc | ||
cxx: /opt/cray/pe/gcc/12.2.0/bin/g++ | ||
f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran | ||
fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran | ||
flags: {} | ||
operating_system: sles15 | ||
target: x86_64 | ||
modules: | ||
- ncarenv/23.09 | ||
- gcc/12.2.0 | ||
environment: | ||
set: | ||
# https://github.com/JCSDA/spack-stack/issues/957 | ||
FI_CXI_RX_MATCH_MODE: 'hybrid' | ||
- compiler: | ||
spec: intel@2021.10.0 | ||
paths: | ||
cc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icc | ||
cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc | ||
f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort | ||
fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort | ||
flags: | ||
cflags: -diag-disable=10441 | ||
cxxflags: -diag-disable=10441 | ||
fflags: -diag-disable=10448 | ||
operating_system: sles15 | ||
target: x86_64 | ||
modules: | ||
- ncarenv/23.09 | ||
- intel-classic/2023.2.1 | ||
environment: | ||
prepend_path: | ||
PATH: '/opt/cray/pe/gcc/12.2.0/bin' | ||
CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include' | ||
LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/lib64' | ||
set: | ||
# https://github.com/JCSDA/spack-stack/issues/957 | ||
FI_CXI_RX_MATCH_MODE: 'hybrid' | ||
# https://github.com/JCSDA/spack-stack/issues/1012 | ||
I_MPI_EXTRA_FILESYSTEM: 'ON' | ||
extra_rpaths: [] | ||
- compiler: | ||
spec: gcc@12.2.0 | ||
paths: | ||
cc: /opt/cray/pe/gcc/12.2.0/bin/gcc | ||
cxx: /opt/cray/pe/gcc/12.2.0/bin/g++ | ||
f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran | ||
fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran | ||
flags: {} | ||
operating_system: sles15 | ||
target: x86_64 | ||
modules: | ||
- ncarenv/23.09 | ||
- gcc/12.2.0 | ||
environment: | ||
set: | ||
# https://github.com/JCSDA/spack-stack/issues/957 | ||
FI_CXI_RX_MATCH_MODE: 'hybrid' | ||
extra_rpaths: [] | ||
|
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
Submodule spack
updated
2 files
+11 −3 | var/spack/repos/builtin/packages/awscli-v2/package.py | |
+18 −9 | var/spack/repos/builtin/packages/py-torch/package.py |
Oops, something went wrong.
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.
Except for lines 10-12 adding the annoying deprecation warnings, and line 27 adding the recently reintroduced I_MPI env var, the rest of the changes here are due to fixing the indentation only.
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.
These I_MPI_* variables might be needed for building or running the UFS and Apps as well. Probably this is something to keep in mind
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.
So these will be set automatically whenever the
stack-intel
compiler gets loaded on Derecho - should be sufficient for UFS