memoryGb => memoryGiB

9 files changed, 14 insertions, 14 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index da0fd265724..dcaa7acf823 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -305,8 +305,8 @@ public class InMemoryProvisioner implements HostProvisioner {
 
         @Override
         public int compare(NodeResources a, NodeResources b) {
-            if (a.memoryGb() > b.memoryGb()) return 1;
-            if (a.memoryGb() < b.memoryGb()) return -1;
+            if (a.memoryGiB() > b.memoryGiB()) return 1;
+            if (a.memoryGiB() < b.memoryGiB()) return -1;
             if (a.diskGb() > b.diskGb()) return 1;
             if (a.diskGb() < b.diskGb()) return -1;
             return Double.compare(a.vcpu(), b.vcpu());
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
index 0d4776ad00a..ce24d11121c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
@@ -36,7 +36,7 @@ public class NodeResourceChangeValidator implements ChangeValidator {
     }
 
     private boolean changeRequiresRestart(NodeResources currentResources, NodeResources nextResources) {
-        return currentResources.memoryGb() != nextResources.memoryGb();
+        return currentResources.memoryGiB() != nextResources.memoryGiB();
     }
 
     private Optional<NodeResources> resourcesOf(ClusterSpec.Id clusterId, VespaModel model) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
index 42410dc3acf..a1f8a97d47f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
@@ -42,7 +42,7 @@ public class ResourcesReductionValidator implements ChangeValidator {
             NodeResources currentResources = current.totalResources();
             NodeResources nextResources = next.totalResources();
             if (nextResources.vcpu() < 0.5 * currentResources.vcpu() ||
-                nextResources.memoryGb() < 0.5 * currentResources.memoryGb() ||
+                nextResources.memoryGiB() < 0.5 * currentResources.memoryGiB() ||
                 nextResources.diskGb() < 0.5 * currentResources.diskGb())
                 context.invalid(ValidationId.resourcesReduction,
                                 "Resource reduction in '" + clusterId.value() + "' is too large: " +
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
index e57110e44e5..c68e13102d7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
@@ -111,7 +111,7 @@ public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValida
         double currentModelCostInGb = onnxModelCostInGb(clusterInCurrentModel);
         double nextModelCostInGb = onnxModelCostInGb(cluster);
 
-        double totalMemory = containers.stream().mapToDouble(c -> c.getHostResource().realResources().memoryGb()).min().orElseThrow();
+        double totalMemory = containers.stream().mapToDouble(c -> c.getHostResource().realResources().memoryGiB()).min().orElseThrow();
         double memoryUsedByModels = currentModelCostInGb + nextModelCostInGb;
         double availableMemory = Math.max(0, totalMemory - Host.memoryOverheadGb - memoryUsedByModels);
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index cc570d47907..014d183071d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -213,7 +213,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
             if (getContainers().isEmpty()) return Optional.of(JvmMemoryPercentage.of(heapSizePercentageOfAvailable)); // Node memory is not known
 
             // Node memory is known, so compute heap size as a percentage of available memory (excluding overhead, which the startup scripts also account for)
-            double totalMemoryGb = getContainers().stream().mapToDouble(c -> c.getHostResource().realResources().memoryGb()).min().orElseThrow();
+            double totalMemoryGb = getContainers().stream().mapToDouble(c -> c.getHostResource().realResources().memoryGiB()).min().orElseThrow();
             double totalMemoryMinusOverhead = Math.max(0, totalMemoryGb - Host.memoryOverheadGb);
             double onnxModelCostGb = onnxModelCostCalculator.aggregatedModelCostInBytes() / (1024D * 1024 * 1024);
             double availableMemoryGb = Math.max(0, totalMemoryMinusOverhead - onnxModelCostGb);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
index 3e51ee7ccec..d60e6ac2df6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
@@ -114,7 +114,7 @@ public class NodeResourcesTuning implements ProtonConfig.Producer {
 
     /** Returns the memory we can expect will be available for the content node processes */
     private double usableMemoryGb() {
-        double usableMemoryGb = resources.memoryGb() - Host.memoryOverheadGb;
+        double usableMemoryGb = resources.memoryGiB() - Host.memoryOverheadGb;
         return usableMemoryGb * (1 - fractionOfMemoryReserved);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
index b7e612127c1..36839e72e10 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
@@ -209,7 +209,7 @@ public class ResourcesReductionValidatorTest {
         String resourcesStr = resources == null ?
                 "" :
                 String.format("        <resources vcpu='%.0f' memory='%.0fG' disk='%.0fG'/>",
-                        resources.vcpu(), resources.memoryGb(), resources.diskGb());
+                        resources.vcpu(), resources.memoryGiB(), resources.diskGb());
         return "<services version='1.0'>" +
                 "  <container id='default' version='1.0'>" +
                 "    <nodes count='" + nodes + "'>" +
@@ -223,7 +223,7 @@ public class ResourcesReductionValidatorTest {
         String resourcesStr = resources == null ?
                               "" :
                               String.format("        <resources vcpu='%.0f' memory='%.0fG' disk='%.0fG'/>",
-                                            resources.vcpu(), resources.memoryGb(), resources.diskGb());
+                                            resources.vcpu(), resources.memoryGiB(), resources.diskGb());
         return "<services version='1.0'>" +
                "  <content id='default' version='1.0'>" +
                "    <redundancy>1</redundancy>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
index 344471cada0..e0193d10e23 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
@@ -42,8 +42,8 @@ public class NodesSpecificationTest {
         assertEquals(2, spec.minResources().nodeResources().vcpu(), 1e-9);
         assertEquals(2, spec.maxResources().nodeResources().vcpu(), 1e-9);
 
-        assertEquals(3e15, spec.minResources().nodeResources().memoryGb(), 1e-9);
-        assertEquals(3e15, spec.maxResources().nodeResources().memoryGb(), 1e-9);
+        assertEquals(3e15, spec.minResources().nodeResources().memoryGiB(), 1e-9);
+        assertEquals(3e15, spec.maxResources().nodeResources().memoryGiB(), 1e-9);
 
         assertEquals(4e3, spec.minResources().nodeResources().diskGb(), 1e-9);
         assertEquals(4e3, spec.maxResources().nodeResources().diskGb(), 1e-9);
@@ -54,8 +54,8 @@ public class NodesSpecificationTest {
         assertEquals(1 << 30, spec.minResources().nodeResources().gpuResources().count());
         assertEquals(1 << 30, spec.maxResources().nodeResources().gpuResources().count());
 
-        assertEquals(3e-9, spec.minResources().nodeResources().gpuResources().memoryGb(), 1e-12);
-        assertEquals(3e-9, spec.maxResources().nodeResources().gpuResources().memoryGb(), 1e-12);
+        assertEquals(3e-9, spec.minResources().nodeResources().gpuResources().memoryGiB(), 1e-12);
+        assertEquals(3e-9, spec.maxResources().nodeResources().gpuResources().memoryGiB(), 1e-12);
 
         assertEquals(DiskSpeed.fast, spec.minResources().nodeResources().diskSpeed());
         assertEquals(DiskSpeed.fast, spec.maxResources().nodeResources().diskSpeed());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 7037480f853..887db9c9cc9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -88,7 +88,7 @@ public class VespaModelTester {
             // (for e.g cluster controllers and slobrok nodes)
             String hostname = String.format("%s-%02d",
                                             "node" + "-" + Math.round(resources.vcpu()) +
-                                                     "-" + Math.round(resources.memoryGb()) +
+                                                     "-" + Math.round(resources.memoryGiB()) +
                                                      "-" + Math.round(resources.diskGb()),
                                             count - i);
             hosts.add(new Host(hostname, List.of(), flavor));