Skip to content

Commit e624a55

Browse files
authored
Merge pull request #259 from xylar/spack-and-machines-cleanup
Spack and machines cleanup
2 parents e40fe0b + 506120a commit e624a55

File tree

80 files changed

+769
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+769
-647
lines changed

conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "mache" %}
2-
{% set version = "1.30.0" %}
2+
{% set version = "1.31.0" %}
33

44
package:
55
name: {{ name|lower }}

mache/machines/andes.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ group = cli115
2424
# The parallel section describes options related to running jobs in parallel
2525
[parallel]
2626

27-
# parallel system of execution: slurm, cobalt or single_node
27+
# parallel system of execution: slurm, pbs or single_node
2828
system = slurm
2929

3030
# whether to use mpirun or srun to run a task

mache/machines/anvil.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = cels
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = gnu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = openmpi
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -44,7 +44,7 @@ base_url = https://web.lcrc.anl.gov/public/e3sm/diagnostic_output
4444
# The parallel section describes options related to running jobs in parallel
4545
[parallel]
4646

47-
# parallel system of execution: slurm, cobalt or single_node
47+
# parallel system of execution: slurm, pbs or single_node
4848
system = slurm
4949

5050
# whether to use mpirun or srun to run a task

mache/machines/chicoma-cpu.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ group = climate
2424
# The parallel section describes options related to running jobs in parallel
2525
[parallel]
2626

27-
# parallel system of execution: slurm, cobalt or single_node
27+
# parallel system of execution: slurm, pbs or single_node
2828
system = slurm
2929

3030
# whether to use mpirun or srun to run a task

mache/machines/chrysalis.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = cels
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = gnu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = openmpi
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -44,7 +44,7 @@ base_url = https://web.lcrc.anl.gov/public/e3sm/diagnostic_output
4444
# The parallel section describes options related to running jobs in parallel
4545
[parallel]
4646

47-
# parallel system of execution: slurm, cobalt or single_node
47+
# parallel system of execution: slurm, pbs or single_node
4848
system = slurm
4949

5050
# whether to use mpirun or srun to run a task

mache/machines/compy.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = users
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = gnu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = openmpi
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -44,7 +44,7 @@ base_url = https://compy-dtn.pnl.gov
4444
# The parallel section describes options related to running jobs in parallel
4545
[parallel]
4646

47-
# parallel system of execution: slurm, cobalt or single_node
47+
# parallel system of execution: slurm, pbs or single_node
4848
system = slurm
4949

5050
# whether to use mpirun or srun to run a task

mache/machines/dane.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = e3sm
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = intel
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = mvapich2
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -40,7 +40,7 @@ base_url = https://lc.llnl.gov/e3sm/diagnostic_output
4040
# The parallel section describes options related to running jobs in parallel
4141
[parallel]
4242

43-
# parallel system of execution: slurm, cobalt or single_node
43+
# parallel system of execution: slurm, pbs or single_node
4444
system = slurm
4545

4646
# whether to use mpirun or srun to run a task

mache/machines/frontier.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = cli115
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = craygnu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = mpich
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -34,7 +34,7 @@ group = cli115
3434
# The parallel section describes options related to running jobs in parallel
3535
[parallel]
3636

37-
# parallel system of execution: slurm, cobalt or single_node
37+
# parallel system of execution: slurm, pbs or single_node
3838
system = slurm
3939

4040
# whether to use mpirun or srun to run a task

mache/machines/pm-cpu.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = e3sm
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = gnu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = mpich
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -44,7 +44,7 @@ base_url = https://portal.nersc.gov/cfs/e3sm
4444
# The parallel section describes options related to running jobs in parallel
4545
[parallel]
4646

47-
# parallel system of execution: slurm, cobalt or single_node
47+
# parallel system of execution: slurm, pbs or single_node
4848
system = slurm
4949

5050
# whether to use mpirun or srun to run a task

mache/machines/pm-gpu.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# the unix group for permissions for the e3sm-unified conda environment
66
group = e3sm
77

8-
# the compiler set to use for system libraries and MPAS builds
8+
# the compiler set to use for system libraries
99
compiler = nvidiagpu
1010

11-
# the system MPI library to use for intel18 compiler
11+
# the system MPI library
1212
mpi = mpich
1313

1414
# the path to the directory where activation scripts, the base environment, and
@@ -44,7 +44,7 @@ base_url = https://portal.nersc.gov/cfs/e3sm
4444
# The parallel section describes options related to running jobs in parallel
4545
[parallel]
4646

47-
# parallel system of execution: slurm, cobalt or single_node
47+
# parallel system of execution: slurm, pbs or single_node
4848
system = slurm
4949

5050
# whether to use mpirun or srun to run a task

0 commit comments

Comments
 (0)