Skip to content
Merged
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
8 changes: 4 additions & 4 deletions lib/galaxy/jobs/runners/gcp_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -496,13 +496,13 @@ def _get_memory_mib(self, job_destination, params, resource_params):

# Check for Galaxy job resource parameter 'mem' (in GB, convert to MiB)
if resource_params.get("mem"):
mem_gb = int(resource_params["mem"])
return mem_gb * 1024 # Convert GB to MiB
mem_gb = float(resource_params["mem"])
return int(mem_gb * 1024) # Convert GB to MiB

# Check for TPV-style 'mem' in destination params (in GB)
if "mem" in job_destination.params:
mem_gb = int(job_destination.params["mem"])
return mem_gb * 1024 # Convert GB to MiB
mem_gb = float(job_destination.params["mem"])
return int(mem_gb * 1024) # Convert GB to MiB

# Fall back to configured default
return int(params.get("memory_mib", DEFAULT_MEMORY_MIB))
Expand Down
Loading