Skip to content

Commit 955a71e

Browse files
committed
Remove unused config_file parameter to get_spack_script()
We no longer need any config options to create the spack script.
1 parent 57bff3f commit 955a71e

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

docs/users_guide/spack/build.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ spack_script = get_spack_script(
113113
mpi=mpi,
114114
shell='sh', # or 'csh'
115115
machine=machine,
116-
config_file=machine_config,
117116
include_e3sm_lapack=include_e3sm_lapack,
118117
include_e3sm_hdf5_netcdf=e3sm_hdf5_netcdf,
119118
)

mache/spack/env.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def make_spack_env(
113113
mpi,
114114
'sh',
115115
machine,
116-
None,
117116
include_e3sm_lapack,
118117
include_e3sm_hdf5_netcdf,
119118
load_spack_env=False,

mache/spack/script.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from jinja2 import Template
44

5-
from mache.machine_info import MachineInfo, discover_machine
5+
from mache.machine_info import discover_machine
66
from mache.spack.config_machines import extract_spack_from_config_machines
77

88

@@ -13,7 +13,6 @@ def get_spack_script(
1313
mpi,
1414
shell,
1515
machine=None,
16-
config_file=None,
1716
include_e3sm_lapack=False,
1817
include_e3sm_hdf5_netcdf=False,
1918
load_spack_env=True,
@@ -43,9 +42,6 @@ def get_spack_script(
4342
The name of an E3SM supported machine. If none is given, the machine
4443
will be detected automatically via the host name.
4544
46-
config_file : str, optional
47-
The name of a config file to load config options from.
48-
4945
include_e3sm_lapack : bool, optional
5046
Whether to include the same lapack (typically from MKL) as used in E3SM
5147
@@ -71,12 +67,6 @@ def get_spack_script(
7167
if machine is None:
7268
raise ValueError('Unable to discover machine form host name')
7369

74-
machine_info = MachineInfo(machine)
75-
76-
config = machine_info.config
77-
if config_file is not None:
78-
config.read(config_file)
79-
8070
load_script_template = ''
8171

8272
if load_spack_env:

0 commit comments

Comments
 (0)