Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
ekouts committed Apr 16, 2024
1 parent 2de71e0 commit 769c0d4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions reframe/core/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -1863,9 +1863,7 @@ def compile(self):
# build_job_opts. We want any user supplied options to be able to
# override those set by the framework.
resources_opts = self._map_resources_to_jobopts()
self._build_job.options = (
resources_opts + self._build_job.options
)
self._build_job.options = resources_opts + self._build_job.options
with osext.change_dir(self._stagedir):
# Prepare build job
build_commands = [
Expand Down Expand Up @@ -2013,9 +2011,7 @@ def _get_cp_env():
# job_opts. We want any user supplied options to be able to
# override those set by the framework.
resources_opts = self._map_resources_to_jobopts()
self._job.options = (
resources_opts + self._job.options
)
self._job.options = resources_opts + self._job.options
with osext.change_dir(self._stagedir):
try:
self.logger.debug('Generating the run script')
Expand All @@ -2042,7 +2038,10 @@ def _map_resources_to_jobopts(self):
resources_opts = []
# Combine all resources into one dictionary, where extra_resources
# can overwrite _current_environ.resources
combined_resources = {**self._current_environ.resources, **self.extra_resources}
combined_resources = {
**self._current_environ.resources,
**self.extra_resources
}
for r, v in combined_resources.items():
resources_opts += self._current_partition.get_resource(r, **v)

Expand Down
2 changes: 1 addition & 1 deletion reframe/core/systems.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ def create(cls, site_config):
devices=site_config.get(f'{partid}/devices'),
extras=site_config.get(f'{partid}/extras'),
features=site_config.get(f'{partid}/features'),
time_limit=site_config.get(f'{partid}/time_limit'),
time_limit=site_config.get(f'{partid}/time_limit')
)
)

Expand Down

0 comments on commit 769c0d4

Please sign in to comment.