-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move spack-stack repos into spack submodule, use two-level namespace …
…for openmpi and mpich, add package py-pyhdf, use only one macOS reference config (#131) *Finalizes the move of the `spack-stack` repos into the `spack` submodule - This requires adding the projections/name translations for `ecmwf-atlas` to `atlas` in the common module config * Enables use of two-level namespace for `openmpi` and `mpich` (the former required making changes to the package config in `spack`, for the latter this was already implemented) - Also need to export `OMPI_MCA_rmaps_base_oversubscribe=1` in the `openmpi` module so that one can use more tasks than CPU cores (for unit testing) - Fixes several problems with CI builds on Linux and macOS - Use a combination of package-level build parallelism and install-level build parallelism (see https://spack.readthedocs.io/en/latest/packaging_guide.html?highlight=parallel#parallel-builds) to speed up the Ubuntu Intel build * Adds the existing `hdf` and new `py-pyhdf` packages - Requires setting the default provider for `jpeg` to `libjpeg-turbo` (already part of our spack-stack) * Updates one of the macOS reference configs to `macos-monterey-apple-clang-openmpi-reference` (use `apple-clang` instead of (llvm) `clang`) and removes the macOS reference config for easier maintenance - This reference config now builds openmpi-4.1.3 built by `spack` with two-level namespace enabled - Note that I tested the same config with `mpich-3.4.2` built by `spack` with two-level namespace enabled * Adds the capability to create containers with `spack`, all built into the existing scripts - `create-env.py` is renamed to `create.py environment ...` for creating local environments; Github unfortunately doesn't see this and thinks it is a new file and the old one got deleted (use a graphical diff tool locally to compare) * Containers are built using `create.py container ...` - One example is added: `configs/containers/docker-ubuntu-gcc-openmpi.yaml` * Comments out `git-lfs` in the common package config, because pinning a version there isn't needed (we don't build `git-lfs`, but require it due to the dependencies on `go`/`go-bootstrap`, which are difficult to build) and having it in there breaks the container builds * Updates and consolidates the documentation in `README.md`, `config/sites/README.md` and `config/common/README.md` into a single (top-level) `README.md` - Note: In my next PR, I will add the capability to create HTML (and possibly LaTeX/PDF) documentation using `sphinx`
- Loading branch information
Showing
58 changed files
with
538 additions
and
1,904 deletions.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ spack: | |
@CONFIG_INCLUDES@ | ||
|
||
specs: | ||
- nceplibs-bundle | ||
- nceplibs-bundle-env |
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.