Skip to content

Commit

Permalink
Add site config for tier2 machine bounty and update doc/source/NewSit…
Browse files Browse the repository at this point in the history
…eConfigs.rst for Ubuntu (#1307)

1. Update doc/source/NewSiteConfigs.rst for Ubuntu: - don't install meson and bison via apt anymore
2. Add site config for tier2 system bounty
  • Loading branch information
climbfuji authored Sep 20, 2024
1 parent d303e16 commit 53a9f02
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 9 deletions.
4 changes: 1 addition & 3 deletions configs/sites/tier2/blackpearl/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Blackpearl is @climbfuji's development system (Dell Laptop running Oracle Linux 9.1 under Windows WSL2).

The site config currently requires a manual copy of the correct packages_COMPILER.yaml to the environment site directory. This will be improved later.
Blackpearl is one of @climbfuji's development systems (Dell Laptop running Oracle Linux 9.1 under Windows WSL2).
1 change: 1 addition & 0 deletions configs/sites/tier2/bounty/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bounty is one of @climbfuji's development systems (Dell Laptop running Ubuntu Linux 22.04 under Windows WSL2).
27 changes: 27 additions & 0 deletions configs/sites/tier2/bounty/compilers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
compilers:
- compiler:
spec: gcc@=11.4.0
paths:
cc: /usr/bin/gcc
cxx: /usr/bin/g++
f77: /usr/bin/gfortran
fc: /usr/bin/gfortran
flags: {}
operating_system: ubuntu22.04
target: x86_64
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: gcc@=12.3.0
paths:
cc: /usr/bin/gcc-12
cxx: /usr/bin/g++-12
f77: /usr/bin/gfortran-12
fc: /usr/bin/gfortran-12
flags: {}
operating_system: ubuntu22.04
target: x86_64
modules: []
environment: {}
extra_rpaths: []
2 changes: 2 additions & 0 deletions configs/sites/tier2/bounty/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config:
build_jobs: 4
2 changes: 2 additions & 0 deletions configs/sites/tier2/bounty/mirrors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mirrors:
local-source: file:///home/dom/prod/spack-source-cache
10 changes: 10 additions & 0 deletions configs/sites/tier2/bounty/modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- openmpi
- mpich
- python
73 changes: 73 additions & 0 deletions configs/sites/tier2/bounty/packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
packages:
autoconf:
externals:
- spec: autoconf@2.71
prefix: /usr
automake:
externals:
- spec: automake@1.16.5
prefix: /usr
binutils:
externals:
- spec: binutils@2.38
prefix: /usr
coreutils:
externals:
- spec: coreutils@8.32
prefix: /usr
diffutils:
externals:
- spec: diffutils@3.8
prefix: /usr
findutils:
externals:
- spec: findutils@4.8.0
prefix: /usr
gawk:
externals:
- spec: gawk@5.1.0
prefix: /usr
gettext:
externals:
- spec: gettext@0.21
prefix: /usr
git:
externals:
- spec: git@2.34.1~tcltk
prefix: /usr
git-lfs:
externals:
- spec: git-lfs@3.0.2
prefix: /usr
gmake:
externals:
- spec: gmake@4.3
prefix: /usr
groff:
externals:
- spec: groff@1.22.4
prefix: /usr
m4:
externals:
- spec: m4@1.4.18
prefix: /usr
perl:
externals:
- spec: perl@5.34.0~cpanm+opcode+open+shared+threads
prefix: /usr
sed:
externals:
- spec: sed@4.8
prefix: /usr
tar:
externals:
- spec: tar@1.34
prefix: /usr
texlive:
externals:
- spec: texlive@20220321
prefix: /usr
wget:
externals:
- spec: wget@1.21.2
prefix: /usr
5 changes: 5 additions & 0 deletions configs/sites/tier2/bounty/packages_gcc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
packages:
all:
compiler:: [gcc@12.3.0]
providers:
mpi:: [openmpi@5.0.3]
6 changes: 0 additions & 6 deletions doc/source/NewSiteConfigs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -459,21 +459,15 @@ The following instructions were used to prepare a basic Ubuntu 20.04 or 22.04 LT
apt install -y automake
apt install -y autopoint
apt install -y gettext
apt install -y xterm
apt install -y texlive
apt install -y libcurl4-openssl-dev
apt install -y libssl-dev
apt install -y meson
apt install -y bison
# Note - only needed for running JCSDA's
# JEDI-Skylab system (using R2D2 localhost)
apt install -y mysql-server
apt install -y libmysqlclient-dev
# Python
apt install -y python3-dev python3-pip
# Exit root session
exit
Expand Down

0 comments on commit 53a9f02

Please sign in to comment.