Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pick the larger settting for resource #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions {{cookiecutter.profile_name}}/slurm_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,22 @@ def format_values(dictionary, job_properties):

def convert_job_properties(job_properties, resource_mapping=None):
options = {}
if resource_mapping is None:
resource_mapping = {}
resources = job_properties.get("resources", {})
for k, v in resource_mapping.items():
options.update({k: resources[i] for i in v if i in resources})
if resource_mapping is not None:
resource_mapping_dict = {v: k for k, vs in resource_mapping.items() for v in vs}
# update resource, but keep the larger value
# "mem", "mem-per-cpu", "nodes", "time"
for resource_alias, resource_value in resources.items():
if resource_alias in resource_mapping_dict:
resource_name = resource_mapping_dict[resource_alias]
if resource_name in ["mem", "mem-per-cpu"]:
if _convert_units_to_mb(resource_value) > _convert_units_to_mb(options.get(resource_name, 0)):
options[resource_name] = resource_value
if resource_name == "nodes":
if int(resource_value) > int(options.get(resource_name, 0)):
options[resource_name] = resource_value
else:
options[resource_name] = resource_value

if "threads" in job_properties:
options["cpus-per-task"] = job_properties["threads"]
Expand Down