diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-03-29 09:38:28 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-03-29 09:38:28 +0200 |
| commit | 2b51d83756cb0aa14aa45d80a0cc99a9691c4e8f (patch) | |
| tree | cfbe549e88df2911e77f9c6c89f496706f2b024b /config-model | |
| parent | b55da928a113abb841e9acb403710bf03ecf9fa5 (diff) | |
Allow configuration of execution mode from rank profile
Diffstat (limited to 'config-model')
3 files changed, 7 insertions, 1 deletions
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj index 61e8574bc87..4746dcb4cf1 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -189,6 +189,9 @@ TOKEN : | < INTRAOPTHREADS: "intraop-threads"> | < INTEROPTHREADS: "interop-threads"> | < GPUDEVICE: "gpu-device"> +| < EXECUTIONMODE: "execution-mode"> +| < PARALLEL: "parallel"> +| < SEQUENTIAL: "sequential"> | < MODEL: "model" > | < MUTATE: "mutate" > | < QUERY: "query" > @@ -1606,6 +1609,8 @@ void onnxModelItem(OnnxModel onnxModel) : <GPUDEVICE> <COLON> num = integer() { onnxModel.setGpuDevice(num, false); } | <INTRAOPTHREADS> <COLON> num = integer() { onnxModel.setStatelessIntraOpThreads(num); } | <INTEROPTHREADS> <COLON> num = integer() { onnxModel.setStatelessInterOpThreads(num); } | + <EXECUTIONMODE> <COLON> ( <PARALLEL> { onnxModel.setStatelessExecutionMode("parallel"); } + | <SEQUENTIAL> { onnxModel.setStatelessExecutionMode("sequential"); } ) | (<ONNX_INPUT_SL>) { String name = token.image.substring(5, token.image.lastIndexOf(":")).trim(); if (name.startsWith("\"")) { name = name.substring(1, name.length() - 1); } diff --git a/config-model/src/test/derived/globalphase_onnx_inside/onnx-models.cfg b/config-model/src/test/derived/globalphase_onnx_inside/onnx-models.cfg index f705f896540..d63e85e2f19 100644 --- a/config-model/src/test/derived/globalphase_onnx_inside/onnx-models.cfg +++ b/config-model/src/test/derived/globalphase_onnx_inside/onnx-models.cfg @@ -25,7 +25,7 @@ model[].input[].source "rankingExpression(indirect_x)" model[].output[].name "vector_Y" model[].output[].as "foobar" model[].dry_run_on_setup true -model[].stateless_execution_mode "" +model[].stateless_execution_mode "parallel" model[].stateless_interop_threads 5 model[].stateless_intraop_threads 3 model[].gpu_device 2 diff --git a/config-model/src/test/derived/globalphase_onnx_inside/test.sd b/config-model/src/test/derived/globalphase_onnx_inside/test.sd index cd3dfcea3d0..f7749e648e0 100644 --- a/config-model/src/test/derived/globalphase_onnx_inside/test.sd +++ b/config-model/src/test/derived/globalphase_onnx_inside/test.sd @@ -52,6 +52,7 @@ schema test { intraop-threads: 3 interop-threads: 5 gpu-device: 2 + execution-mode: parallel } first-phase { expression: sum(attribute(aa)) |