Remove 'required' attribute

4 files changed, 8 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/OnnxModel.java b/config-model/src/main/java/com/yahoo/schema/OnnxModel.java
index ae6f1fd96e4..3d96849fa15 100644
--- a/config-model/src/main/java/com/yahoo/schema/OnnxModel.java
+++ b/config-model/src/main/java/com/yahoo/schema/OnnxModel.java
@@ -24,7 +24,7 @@ public class OnnxModel extends DistributableResource {
     private String  statelessExecutionMode = null;
     private Integer statelessInterOpThreads = null;
     private Integer statelessIntraOpThreads = null;
-    private GpuDevice gpuDevice = null;
+    private Integer gpuDevice = null;
 
     public OnnxModel(String name) {
         super(name);
@@ -114,9 +114,9 @@ public class OnnxModel extends DistributableResource {
         }
     }
 
-    public void setGpuDevice(int deviceNumber, boolean required) {
+    public void setGpuDevice(int deviceNumber) {
         if (deviceNumber >= 0) {
-            this.gpuDevice = new GpuDevice(deviceNumber, required);
+            this.gpuDevice = deviceNumber;
         }
     }
 
@@ -124,16 +124,8 @@ public class OnnxModel extends DistributableResource {
         return Optional.ofNullable(statelessIntraOpThreads);
     }
 
-    public Optional<GpuDevice> getGpuDevice() {
+    public Optional<Integer> getGpuDevice() {
         return Optional.ofNullable(gpuDevice);
     }
 
-    public record GpuDevice(int deviceNumber, boolean required) {
-
-        public GpuDevice {
-            if (deviceNumber < 0) throw new IllegalArgumentException("deviceNumber cannot be negative, got " + deviceNumber);
-        }
-
-    }
-
 }
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
index cff0776fddd..f63e872836e 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
@@ -52,10 +52,8 @@ public class FileDistributedOnnxModels {
                 if (model.getStatelessIntraOpThreads().isPresent())
                     modelBuilder.stateless_intraop_threads(model.getStatelessIntraOpThreads().get());
                 if (model.getGpuDevice().isPresent()) {
-                    modelBuilder.gpu_device(model.getGpuDevice().get().deviceNumber());
-                    modelBuilder.gpu_device_required(model.getGpuDevice().get().required());
+                    modelBuilder.gpu_device(model.getGpuDevice().get());
                 }
-
                 builder.model(modelBuilder);
             }
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index e07b1a95e20..700393e84f3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -685,12 +685,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             onnxModel.setStatelessExecutionMode(getStringValue(modelElement, "execution-mode", null));
             onnxModel.setStatelessInterOpThreads(getIntValue(modelElement, "interop-threads", -1));
             onnxModel.setStatelessIntraOpThreads(getIntValue(modelElement, "intraop-threads", -1));
-            Element gpuDeviceElement = XML.getChild(modelElement, "gpu-device");
-            if (gpuDeviceElement != null) {
-                int gpuDevice = Integer.parseInt(gpuDeviceElement.getTextContent());
-                boolean required = Boolean.parseBoolean(extractAttribute(gpuDeviceElement, "required"));
-                onnxModel.setGpuDevice(gpuDevice, required);
-            }
+            onnxModel.setGpuDevice(getIntValue(modelElement, "gpu-device", -1));
         }
 
         cluster.setModelEvaluation(new ContainerModelEvaluation(cluster, profiles));
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 888851b2db2..b8c02b013aa 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -105,7 +105,8 @@ ModelEvaluation = element model-evaluation {
                 element interop-threads { xsd:nonNegativeInteger }? &
                 element execution-mode { string "sequential" | string "parallel" }? &
                 element gpu-device {
-                  attribute required { xsd:boolean } &
+                  # TODO(mpolden): Remove this after 2023-02-01
+                  attribute required { xsd:boolean }? &
                   xsd:nonNegativeInteger
                 }?
             }*