Merge pull request #121 from yuzawa-san/v15_providers

update providers
yuzawa-san · May 31, 2023 · 310e468 · 310e468
2 parents e5497bb + 28b6357
commit 310e468
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/src/main/java/com/jyuzawa/onnxruntime/ExecutionProvider.java b/src/main/java/com/jyuzawa/onnxruntime/ExecutionProvider.java
@@ -7,8 +7,9 @@
 /**
  * The universe of possible execution providers.
  *
- * The identifiers are the constants defined in //https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/graph/constants.h
+ * The identifiers are the constants defined in https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/graph/constants.h
  *
+ * Support in the public C API and in the provided native library is a requirement for successful usage.
  */
 public enum ExecutionProvider {
     /**
@@ -20,7 +21,7 @@ public enum ExecutionProvider {
      */
     CUDA_EXECUTION_PROVIDER("CUDAExecutionProvider", ExecutionProviderCUDAConfig::new),
     /**
-     * DNNL: supported
+     * oneDNN (DNNL): supported
      */
     DNNL_EXECUTION_PROVIDER("DnnlExecutionProvider", ExecutionProviderDnnlConfig::new),
     /**
@@ -39,6 +40,10 @@ public enum ExecutionProvider {
      * NNApi: not supported
      */
     NNAPI_EXECUTION_PROVIDER("NnapiExecutionProvider"),
+    /**
+     * QNN: supported
+     */
+    QNN_EXECUTION_PROVIDER("QNNExecutionProvider", ExecutionProviderSimpleMapConfig.of("QNN")),
     /**
      * RKNPU: not supported
      */
@@ -67,6 +72,10 @@ public enum ExecutionProvider {
      * CoreML: supported
      */
     COREML_EXECUTION_PROVIDER("CoreMLExecutionProvider", ExecutionProviderCoreMLConfig::new),
+    /**
+     * JS Execution Provider: not supported
+     */
+    JS_EXECUTION_PROVIDER("JsExecutionProvider"),
     /**
      * SNPE: supported
      */
@@ -79,10 +88,18 @@ public enum ExecutionProvider {
      * XNNPACK: supported
      */
     XNNPACK_EXECUTION_PROVIDER("XnnpackExecutionProvider", ExecutionProviderSimpleMapConfig.of("XNNPACK")),
+    /**
+     * WebNN: not supported
+     */
+    WEBNN_EXECUTION_PROVIDER("WebNNExecutionProvider"),
     /**
      * CANN: not supported
      */
-    CANN_EXECUTION_PROVIDER("CANNExecutionProvider");
+    CANN_EXECUTION_PROVIDER("CANNExecutionProvider"),
+    /**
+     * Azure: not supported
+     */
+    AZURE_EXECUTION_PROVIDER("AzureExecutionProvider");
 
     private final String identifier;
     final ExecutionProviderConfigFactory factory;

diff --git a/src/test/java/com/jyuzawa/onnxruntime/SessionTest.java b/src/test/java/com/jyuzawa/onnxruntime/SessionTest.java
@@ -1071,6 +1071,21 @@ public void rocmTest() throws Exception {
 
     @Test
     public void dnnlTest() throws Exception {
-        providerTest(ExecutionProvider.ROCM_EXECUTION_PROVIDER, Map.of("device_id", "0"));
+        providerTest(ExecutionProvider.DNNL_EXECUTION_PROVIDER, Map.of("device_id", "0"));
+    }
+
+    @Test
+    public void snpeTest() throws Exception {
+        providerTest(ExecutionProvider.SNPE_EXECUTION_PROVIDER, Map.of("device_id", "0"));
+    }
+
+    @Test
+    public void xnnpackTest() throws Exception {
+        providerTest(ExecutionProvider.XNNPACK_EXECUTION_PROVIDER, Map.of("device_id", "0"));
+    }
+
+    @Test
+    public void qnnTest() throws Exception {
+        providerTest(ExecutionProvider.QNN_EXECUTION_PROVIDER, Map.of("device_id", "0"));
     }
 }