Update memory units from MB to MiB

Author: dpoznik

R/R/decorators-aws.R

@@ -14,7 +14,7 @@
 #'
 #' @param cpu Integer number of CPUs required for this step. Defaults to `1`.
 #' @param gpu Integer number of GPUs required for this step. Defaults to `0`.
-#' @param memory Integer memory size (in MB) required for this step. Defaults to
+#' @param memory Integer memory size (in MiB) required for this step. Defaults to
 #'   `4096`.
 #' @param image Character. Specifies the image to use when launching on AWS
 #'   Batch. If not specified, an appropriate

R/man/batch.Rd

@@ -41,7 +41,7 @@ class BatchDecorator(StepDecorator):
         Number of GPUs required for this step. If `@resources` is
         also present, the maximum value from all decorators is used.
     memory : int, default 4096
-        Memory size (in MB) required for this step. If
+        Memory size (in MiB) required for this step. If
         `@resources` is also present, the maximum value from all decorators is
         used.
     image : str, optional, default None

metaflow/plugins/aws/batch/batch_decorator.py

@@ -1,5 +1,6 @@
 import re
 from typing import Dict, List, Optional
+
 from metaflow.exception import CommandException, MetaflowException
 from metaflow.util import get_username, get_latest_run_id
 
@@ -43,8 +44,8 @@ def qos_requests_and_limits(qos: str, cpu: int, memory: int, storage: int):
         # Guaranteed - has both cpu/memory limits. requests not required, as these will be inferred.
         qos_limits = {
             "cpu": str(cpu),
-            "memory": "%sM" % str(memory),
-            "ephemeral-storage": "%sM" % str(storage),
+            "memory": "%sMi" % str(memory),
+            "ephemeral-storage": "%sMi" % str(storage),
         }
         # NOTE: Even though Kubernetes will produce matching requests for the specified limits, this happens late in the lifecycle.
         # We specify them explicitly here to make some K8S tooling happy, in case they rely on .resources.requests being present at time of submitting the job.
@@ -53,8 +54,8 @@ def qos_requests_and_limits(qos: str, cpu: int, memory: int, storage: int):
         # Burstable - not Guaranteed, and has a memory/cpu limit or request
         qos_requests = {
             "cpu": str(cpu),
-            "memory": "%sM" % str(memory),
-            "ephemeral-storage": "%sM" % str(storage),
+            "memory": "%sMi" % str(memory),
+            "ephemeral-storage": "%sMi" % str(storage),
         }
     # TODO: Add support for BestEffort once there is a use case for it.
     # BestEffort - no limit or requests for cpu/memory

metaflow/plugins/kubernetes/kube_utils.py

@@ -61,11 +61,11 @@ class KubernetesDecorator(StepDecorator):
         Number of CPUs required for this step. If `@resources` is
         also present, the maximum value from all decorators is used.
     memory : int, default 4096
-        Memory size (in MB) required for this step. If
+        Memory size (in MiB) required for this step. If
         `@resources` is also present, the maximum value from all decorators is
         used.
     disk : int, default 10240
-        Disk size (in MB) required for this step. If
+        Disk size (in MiB) required for this step. If
         `@resources` is also present, the maximum value from all decorators is
         used.
     image : str, optional, default None

metaflow/plugins/kubernetes/kubernetes_decorator.py

@@ -26,9 +26,9 @@ class ResourcesDecorator(StepDecorator):
     gpu : int, optional, default None
         Number of GPUs required for this step.
     disk : int, optional, default None
-        Disk size (in MB) required for this step. Only applies on Kubernetes.
+        Disk size (in MiB) required for this step. Only applies on Kubernetes.
     memory : int, default 4096
-        Memory size (in MB) required for this step.
+        Memory size (in MiB) required for this step.
     shared_memory : int, optional, default None
         The value for the size (in MiB) of the /dev/shm volume for this step.
         This parameter maps to the `--shm-size` option in Docker.