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.

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 util/nrl/batch_install.sh, add patch to build py-netcdf4 without mpi #1464

Merged
merged 16 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8e263c2
Update .gitmodules to point to branch release/1.5 in NRL Enterprise G…
climbfuji Jan 17, 2025
802003c
Merge branch 'develop' of https://github.com/jcsda/spack-stack into r…
climbfuji Jan 17, 2025
2dae74e
Bug fix in configs/sites/tier1/atlantis/packages_gcc.yaml: must load …
climbfuji Jan 17, 2025
fa71139
Initial commit of util/nrl_batch_install.sh (WIP)
climbfuji Jan 17, 2025
e4b4b01
Remove external [email protected] from configs/sites/tier1/atlantis/package…
climbfuji Jan 18, 2025
e21a234
In util/nrl_batch_install.sh, exclude esmf and crtm when looking for …
climbfuji Jan 18, 2025
f2d00fd
Re-enable all environments and compilers for NRL sites in util/nrl_ba…
climbfuji Jan 18, 2025
b56b643
in util/nrl_batch_install.sh, catch spack install errors and exclude …
climbfuji Jan 18, 2025
7e792f4
Fix bug in util/nrl_batch_install.sh
climbfuji Jan 19, 2025
c85ba05
With gcc@10 and earlier, must use [email protected]
climbfuji Jan 19, 2025
c5a1932
Workaround for Narwhal/cylc-dev in util/nrl_batch_install.sh: copy co…
climbfuji Jan 20, 2025
7d52616
Configure aocc, clang, and host bounty in util/nrl_batch_install.sh
climbfuji Jan 21, 2025
e035502
Merge branch 'release/neptune-1.5' of https://github.nrlmry.navy.mil/…
climbfuji Jan 21, 2025
f7b9d6f
Revert NRL Enterprise GitHub .gitmodules changes
climbfuji Jan 21, 2025
c262666
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Jan 21, 2025
bb6d9c2
Revert .gitmodules and update submodule pointer for spack; util/nrl_…
climbfuji Jan 21, 2025
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
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "spack"]
path = spack
url = https://github.com/jcsda/spack
branch = spack-stack-dev
#url = https://github.com/jcsda/spack
#branch = spack-stack-dev
url = https://github.com/climbfuji/spack
branch = bugfix/pynetcdf4_nompi
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
3 changes: 3 additions & 0 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ packages:
- any_of: ['@2.3.0 ~openmp']
when: '%intel@2021:'
message: '2.3.0 is the last version to use C++17, use with Intel Classic'
- any_of: ['@2.3.0 ~openmp']
when: '%gcc@:10'
message: 2.3.0 is the last version to use C++17, use with GCC 10 and earlier
- any_of: ['@2.3.0 ~openmp']
when: '%apple-clang@:14'
message: '2.3.0 is the last version to use C++17, use with Apple Clang 14 and earlier'
Expand Down
4 changes: 0 additions & 4 deletions configs/sites/tier1/atlantis/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
bison:
externals:
- spec: [email protected]
prefix: /usr
coreutils:
externals:
- spec: [email protected]
Expand Down
22 changes: 22 additions & 0 deletions configs/sites/tier1/narwhal/compilers.gcc-direct.tmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
compilers::
- compiler:
spec: [email protected]
paths:
# For cylc-dev, can't use Cray wrappers (https://github.com/spack/spack/issues/48515)
cc: /opt/cray/pe/gcc/10.3.0/snos/bin/gcc
cxx: /opt/cray/pe/gcc/10.3.0/snos/bin/g++
f77: /opt/cray/pe/gcc/10.3.0/snos/bin/gfortran
fc: /opt/cray/pe/gcc/10.3.0/snos/bin/gfortran
flags: {}
operating_system: sles15
modules:
- PrgEnv-gnu/8.4.0
- gcc/10.3.0
- cray-libsci/23.05.1.4
- libfabric/1.12.1.2.2.1
environment:
prepend_path:
LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/23.05.1.4/GNU/10.3/x86_64/lib'
set:
CRAYPE_LINK_TYPE: 'dynamic'
extra_rpaths: []
Loading
Loading