diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-01-24 11:23:14 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-01-24 11:23:14 +0100 |
| commit | f23f703533d75a85fc98f73fbcab6f5ccc162673 (patch) | |
| tree | 0951b6bfa94f03030ed04cd0836db43539beb3b4 /config-model | |
| parent | eec4962db2f6dc302f7195c1b20a6818dbc0178a (diff) | |
Fix and test gpu-device parsing
Diffstat (limited to 'config-model')
3 files changed, 4 insertions, 1 deletions
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 53b95e2d455..e7aaed163dc 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,7 +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(modelsElement, "gpu-device"); + Element gpuDeviceElement = XML.getChild(modelElement, "gpu-device"); if (gpuDeviceElement != null) { int gpuDevice = Integer.parseInt(gpuDeviceElement.getTextContent()); boolean required = Boolean.parseBoolean(extractAttribute(gpuDeviceElement, "required")); diff --git a/config-model/src/test/cfg/application/onnx/services.xml b/config-model/src/test/cfg/application/onnx/services.xml index cdfecc3df5a..68c2e8530be 100644 --- a/config-model/src/test/cfg/application/onnx/services.xml +++ b/config-model/src/test/cfg/application/onnx/services.xml @@ -8,6 +8,7 @@ <models> <model name="mul"> <intraop-threads>2</intraop-threads> + <gpu-device required="false">0</gpu-device> </model> <model name="non-existent-model"> <interop-threads>400</interop-threads> diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java index 00e510ce0ff..8ccbe99f70a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java @@ -129,6 +129,8 @@ public class StatelessOnnxEvaluationTest { assertEquals(2, mulModel.stateless_intraop_threads()); assertEquals(-1, mulModel.stateless_interop_threads()); assertEquals("", mulModel.stateless_execution_mode()); + assertFalse(mulModel.gpu_device_required()); + assertEquals(0, mulModel.gpu_device()); } } |