Skip to content

Commit

Permalink
Addressed comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
stiggy87 committed Dec 12, 2024
1 parent e182c6f commit 3bc3e01
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
11 changes: 2 additions & 9 deletions configs/sites/tier2/aws-ubuntu2404/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ apt upgrade
apt install -y build-essential g++-12 gcc-12 gfortran-12 make cmake automake autoconf

#Install other requirements.
apt install -y cpp-12 libgomp1 git git-lfs autopoint mysql-server libmysqlclient-dev qtbase5-dev qt5-qmake libqt5svg5-dev qt5dxcb-plugin wget curl file tcl-dev gnupg2 iproute2 locales unzip less bzip2 gettext libtree pkg-config
apt install -y cpp-12 libgomp1 git git-lfs autopoint mysql-server libmysqlclient-dev qtbase5-dev qt5-qmake libqt5svg5-dev qt5dxcb-plugin wget curl file tcl-dev gnupg2 iproute2 locales unzip less bzip2 gettext libtree pkg-config libcurl4-openssl-dev

# Editors
apt install -y vim nano
Expand Down Expand Up @@ -240,7 +240,7 @@ spack external find --scope system wget
spack external find --scope system texlive
spack external find --scope system mysql

# No external find for pre-installed intel-oneapi-mpi (from pcluster AMI),
# No external find for pre-installed intel-oneapi-mpi,
# and no way to add object entry to list using "spack config add".
cat << 'EOF' >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
gcc:
Expand Down Expand Up @@ -277,13 +277,6 @@ spack config add "packages:mpi:buildable:False"
spack config add "packages:all:providers:mpi:[[email protected]]"
spack config add "packages:all:compiler:[[email protected], [email protected]]"

# Edit envs/unified-intel/spack.yaml.
# 1) Find this line:
# compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
# 2) Delete all compilers except for your target compiler. In the case of intel
# the line should look like this:
# compilers: ['%intel']

# edit envs/unified-env/site/compilers.yaml and replace the following line in the **Intel** compiler section:
# environment: {}
# -->
Expand Down
22 changes: 22 additions & 0 deletions doc/source/PreConfiguredSites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,28 @@ Linux/macOS default configs
The Linux and macOS configurations are **not** meant to be used as is, as user setups and package versions vary considerably. Instructions for adding this information can be found in :numref:`Section %s <NewSiteConfigs>`.


.. _Preconfigured_Sites_AWS_Ubuntu2404:

----------------
AWS Ubuntu 24.04
----------------

To build consult the `README.md` in the `sites/tier2/aws-ubuntu2404`.

This image can contain GCC and Intel compilers. It is strongly suggested that if you are to use either environment, it is suggested to separate environments into their own terminal.


.. _Preconfigured_Sites_AWS_Rocky8:

----------
AWS Rocky8
----------

To build consult the `README.md` in the `sites/tier2/aws-rocky8`.

This image can contain GCC and Intel compilers. It is strongly suggested that if you are to use either environment, it is suggested to separate environments into their own terminal.


.. _Configurable_Sites_CreateEnv:

========================
Expand Down

0 comments on commit 3bc3e01

Please sign in to comment.