load and run onnx

Author: mbuckton

src/main/java-ml/io/mapsmessaging/selector/operators/functions/ml/MLFunction.java

@@ -84,7 +84,12 @@ public static MLFunction parse(String functionName, List<String> list) {
     List<String> identifiers = new ArrayList<>();
     int startIdx;
 
-    if ("tensorFlow".equalsIgnoreCase(functionName) || list.size() <=1) {
+    boolean isMl = ("tensorFlow".equalsIgnoreCase(functionName) ||
+                   "onnx".equalsIgnoreCase(functionName) ||
+            list.size() <=1);
+
+
+    if (isMl) {
       modelName = list.getFirst();
       startIdx = 1;
     } else {

src/main/java-ml/io/mapsmessaging/selector/operators/functions/ml/impl/functions/onnx/OnnxModelRegistry.java

@@ -55,8 +55,7 @@ public static OnnxModelEntry getOrLoad(final String modelName,
       return cached;
     }
 
-    byte[] modelBytes = java.util.Objects.requireNonNull(
-        modelStore.loadModel(modelName), "Model bytes are null for " + modelName);
+    byte[] modelBytes = modelStore.loadModel(modelName);
 
     // Try engines in the precomputed order until a session is created.
     OrtSession ortSession = null;

src/main/java-ml/io/mapsmessaging/selector/operators/functions/ml/impl/functions/onnx/OnnxOperation.java

@@ -172,4 +172,9 @@ private void warmUp() throws OrtException {
       }
     }
   }
+
+  @Override
+  public String toString() {
+    return "onnx ("+ super.toString() + ")";
+  }
 }

src/main/java-ml/io/mapsmessaging/selector/operators/functions/ml/impl/functions/onnx/OnnxRuntimeGate.java

@@ -32,6 +32,7 @@ public class OnnxRuntimeGate {
       OrtEnvironment.getEnvironment().close(); // no-op safe
       ok = true;
     } catch (Throwable t) {
+      t.printStackTrace();
       ok = false; // UnsatisfiedLinkError, missing deps, etc.
     }
     AVAILABLE = ok && !Boolean.getBoolean("maps.ml.onnx.disabled")

src/test/java-ml/io/mapsmessaging/selector/SelectorMLConformanceTest.java

@@ -20,9 +20,14 @@
 
 package io.mapsmessaging.selector;
 
+import io.mapsmessaging.selector.ml.impl.store.FileModelStore;
+import io.mapsmessaging.selector.model.ModelStore;
 import io.mapsmessaging.selector.operators.ParserExecutor;
+import io.mapsmessaging.selector.operators.functions.ml.MLFunction;
 import io.mapsmessaging.selector.operators.functions.ml.impl.functions.onnx.OnnxRuntimeGate;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -77,10 +82,11 @@ public static Stream<String> selectors() {
         "pca_cor (explainedvariance[3], model_pca_cor.arff) > 0.7",
         "pca_cor (explainedvariance[4], model_pca_cor.arff, temp, humidity) > 0.7",
         "tensorflow (sensor_safety_model, temp, humidity, co2) < 10",
-        "onnx (sensor_safety_model, temp, humidity, co2) < 10"
+        "onnx (model.onnx, temp, humidity, co2) < 10"
 
                 /*
 
+
         "svm (classify, model_svm.arff) = 1",
         "svm (classify, model_svm.arff, temp, humidity) = 1",
 
@@ -92,6 +98,18 @@ public static Stream<String> selectors() {
 
   }
 
+  private static ModelStore init;
+  @BeforeAll
+  static void setup(){
+    init = MLFunction.getModelStore();
+    MLFunction.setModelStore(new FileModelStore("./src/test/resources/"));
+  }
+
+  @AfterAll
+  static void tearDown(){
+    MLFunction.setModelStore(init);
+  }
+
   @ParameterizedTest(name = "Syntax test for: {0}")
   @MethodSource("selectors")
   void syntaxTest(String selector) {