Skip to content

Commit d83d7cd

Browse files
committed
spelling update, minor test changes
1 parent 14d4955 commit d83d7cd

File tree

11 files changed

+23
-11
lines changed

11 files changed

+23
-11
lines changed

smartsim/settings/arguments/batch/lsf.py

+2
Original file line numberDiff line numberDiff line change
@@ -190,5 +190,7 @@ def set(self, key: str, value: str | None) -> None:
190190
:param value: A string representation of the value for the launch
191191
argument (if applicable), otherwise `None`
192192
"""
193+
if key in self._batch_args and key != self._batch_args[key]:
194+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
193195
# Store custom arguments in the launcher_args
194196
self._batch_args[key] = value

smartsim/settings/arguments/batch/pbs.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ def set_walltime(self, walltime: str) -> None:
106106
if walltime and re.match(pattern, walltime):
107107
self.set("walltime", walltime)
108108
else:
109-
raise ValueError("Invalid walltime format. Please use 'HH:MM:SS' format.")
109+
raise ValueError(
110+
f"Invalid walltime: {walltime}. Please use 'HH:MM:SS' format."
111+
)
110112

111113
def set_queue(self, queue: str) -> None:
112114
"""Set the queue for the batch job
@@ -211,4 +213,6 @@ def set(self, key: str, value: str | None) -> None:
211213
:param value: A string representation of the value for the launch
212214
argument (if applicable), otherwise `None`
213215
"""
216+
if key in self._batch_args and key != self._batch_args[key]:
217+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
214218
self._batch_args[key] = value

smartsim/settings/arguments/batch/slurm.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ def set_walltime(self, walltime: str) -> None:
6565
if walltime and re.match(pattern, walltime):
6666
self.set("time", str(walltime))
6767
else:
68-
raise ValueError("Invalid walltime format. Please use 'HH:MM:SS' format.")
68+
raise ValueError(
69+
f"Invalid walltime: {walltime}. Please use 'HH:MM:SS' format."
70+
)
6971

7072
def set_nodes(self, num_nodes: int) -> None:
7173
"""Set the number of nodes for this batch job
@@ -181,4 +183,6 @@ def set(self, key: str, value: str | None) -> None:
181183
argument (if applicable), otherwise `None`
182184
"""
183185
# Store custom arguments in the launcher_args
186+
if key in self._batch_args and key != self._batch_args[key]:
187+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
184188
self._batch_args[key] = value

smartsim/settings/arguments/launch/alps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,5 @@ def set(self, key: str, value: str | None) -> None:
224224
)
225225
return
226226
if key in self._launch_args and key != self._launch_args[key]:
227-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
227+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
228228
self._launch_args[key] = value

smartsim/settings/arguments/launch/dragon.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def set(self, key: str, value: str | None) -> None:
7171
"""
7272
set_check_input(key, value)
7373
if key in self._launch_args and key != self._launch_args[key]:
74-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
74+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
7575
self._launch_args[key] = value
7676

7777
def set_node_feature(self, feature_list: t.Union[str, t.List[str]]) -> None:

smartsim/settings/arguments/launch/local.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ def set(self, key: str, value: str | None) -> None:
8383
"""
8484
set_check_input(key, value)
8585
if key in self._launch_args and key != self._launch_args[key]:
86-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
86+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
8787
self._launch_args[key] = value

smartsim/settings/arguments/launch/lsf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,5 @@ def set(self, key: str, value: str | None) -> None:
148148
)
149149
return
150150
if key in self._launch_args and key != self._launch_args[key]:
151-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
151+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
152152
self._launch_args[key] = value

smartsim/settings/arguments/launch/mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def set(self, key: str, value: str | None) -> None:
221221
)
222222
return
223223
if key in self._launch_args and key != self._launch_args[key]:
224-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
224+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
225225
self._launch_args[key] = value
226226

227227

smartsim/settings/arguments/launch/pals.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,5 @@ def set(self, key: str, value: str | None) -> None:
158158
)
159159
return
160160
if key in self._launch_args and key != self._launch_args[key]:
161-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
161+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
162162
self._launch_args[key] = value

smartsim/settings/arguments/launch/slurm.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ def set_walltime(self, walltime: str) -> None:
210210
if walltime and re.match(pattern, walltime):
211211
self.set("time", str(walltime))
212212
else:
213-
raise ValueError("Invalid walltime format. Please use 'HH:MM:SS' format.")
213+
raise ValueError(
214+
f"Invalid walltime: {walltime}. Please use 'HH:MM:SS' format."
215+
)
214216

215217
def set_het_group(self, het_group: t.Iterable[int]) -> None:
216218
"""Set the heterogeneous group for this job
@@ -349,5 +351,5 @@ def set(self, key: str, value: str | None) -> None:
349351
)
350352
return
351353
if key in self._launch_args and key != self._launch_args[key]:
352-
logger.warning(f"Overwritting argument '{key}' with value '{value}'")
354+
logger.warning(f"Overwriting argument '{key}' with value '{value}'")
353355
self._launch_args[key] = value

tests/temp_tests/test_settings/test_lsfScheduler.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test_create_bsub():
7777
assert args == ["-core_isolation", "-nnodes", "1", "-W", "10:10", "-q", "default"]
7878

7979

80-
def test_batch_arguments_type_set_hostlist(scheduler):
80+
def test_batch_arguments_type_set_hostlist():
8181
bs = BatchSettings(batch_scheduler="lsf", env_vars={"ENV": "VAR"})
8282
with pytest.raises(TypeError, match="host_list argument must be a list of strings"):
8383
bs.batch_args.set_hostlist([25, 37])

0 commit comments

Comments
 (0)