Skip to content
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.

Sign up for GitHub

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

Jump to bottom

release/1.6.0: fix bug in documentation for Hercules, site config updates/cleanup for ParallelWorks #943

Merged
merged 3 commits into from
Jan 12, 2024
Merged

release/1.6.0: fix bug in documentation for Hercules, site config updates/cleanup for ParallelWorks #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe5caa7
Fix bug in documentation for Hercules
climbfuji Jan 11, 2024
a0a1a71
Changes for NOAA Azure, remove use of intel/2018 compiler on NOAA pla…
Jan 12, 2024
7148850
Merge pull request #6 from natalie-perlin/release/1.6.0
climbfuji Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions configs/sites/noaa-aws/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ compilers:
PATH: '/apps/gnu/gcc-9.2.0/bin'
LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64'
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc
cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc
f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
flags: {}
operating_system: centos7
target: x86_64
modules:
- intel/18.0.5.274
environment: {}
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
Expand Down
8 changes: 0 additions & 8 deletions configs/sites/noaa-aws/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
packages:
all:
compiler:: [[email protected], [email protected]]
#compiler:: [[email protected]]
providers:
mpi:: [[email protected], [email protected]]
#mpi:: [[email protected]]

### MPI, Python, MKL
mpi:
Expand All @@ -15,12 +13,6 @@ packages:
prefix: /apps/oneapi
modules:
- impi/2021.3.0
intel-mpi:
externals:
- spec: [email protected]%[email protected]
prefix: /apps/intel/compilers_and_libraries_2018
modules:
- impi/2018.4.274
openmpi:
externals:
- spec: [email protected]%[email protected]
Expand Down
14 changes: 0 additions & 14 deletions configs/sites/noaa-azure/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ compilers:
PATH: '/apps/gnu/gcc-9.2.0/bin'
LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64'
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc
cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc
f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
flags: {}
operating_system: centos7
target: x86_64
modules:
- intel/18.0.5.274
environment: {}
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
Expand Down
12 changes: 0 additions & 12 deletions configs/sites/noaa-azure/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
packages:
all:
compiler:: [[email protected], [email protected]]
#compiler:: [[email protected]]
providers:
mpi:: [[email protected], [email protected]]
#mpi:: [[email protected]]

### MPI, Python, MKL
mpi:
Expand All @@ -15,12 +13,6 @@ packages:
prefix: /apps/oneapi
modules:
- impi/2021.3.0
intel-mpi:
externals:
- spec: [email protected]%[email protected]
prefix: /apps/intel/compilers_and_libraries_2018
modules:
- impi/2018.4.274
openmpi:
externals:
- spec: [email protected]%[email protected]
Expand Down Expand Up @@ -50,10 +42,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
cmake:
externals:
- spec: [email protected]
prefix: /contrib/spack-stack/cmake-3.27.2
cpio:
externals:
- spec: [email protected]
Expand Down
14 changes: 0 additions & 14 deletions configs/sites/noaa-gcloud/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ compilers:
PATH: '/apps/gnu/gcc-9.2.0/bin'
LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64'
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc
cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc
f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
flags: {}
operating_system: centos7
target: x86_64
modules:
- intel/18.0.5.274
environment: {}
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
Expand Down
8 changes: 0 additions & 8 deletions configs/sites/noaa-gcloud/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
packages:
all:
compiler:: [[email protected], [email protected]]
#compiler:: [[email protected]]
providers:
mpi:: [[email protected], [email protected]]
#mpi:: [[email protected]]

### MPI, Python, MKL
mpi:
Expand All @@ -15,12 +13,6 @@ packages:
prefix: /apps/oneapi
modules:
- impi/2021.3.0
intel-mpi:
externals:
- spec: [email protected]%[email protected]
prefix: /apps/intel/compilers_and_libraries_2018
modules:
- impi/2018.4.274
openmpi:
externals:
- spec: [email protected]%[email protected]
Expand Down
8 changes: 0 additions & 8 deletions configs/templates/unified-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,3 @@ spack:
exclude:
# jedi-tools doesn't build with Intel
- jedi-tools-env%intel
## Don't even bother building those with Intel 18,
## not needed. Many of the Python packages don't build.
#- ewok-env%intel@18
#- jedi-fv3-env%intel@18
#- jedi-tools-env%intel@18
#- jedi-ufs-env%intel@18
#- jedi-um-env%intel@18
#- soca-env%intel@18
4 changes: 3 additions & 1 deletion doc/source/PreConfiguredSites.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ For ``spack-stack-1.6.0`` with GNU, load the following modules after loading mys

For testing, an additional version of spack-stack-1.6.0 with GNU+OpenMPI is available. Load the following modules after loading mysql and ecflow:

module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-gcc12-openmpi416/install/modulefiles/Core/
.. code-block:: console

module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-gcc12-openmpi416/install/modulefiles/Core
module load stack-gcc/12.2.0
module load stack-openmpi/4.1.6
module load stack-python/3.10.13
Expand Down
Loading