Skip to content

Commit dceb3e2

Browse files
committed
Add API to ExecuTorchRuntime; remove Runtime.java and rename references
1 parent 2bbc2a5 commit dceb3e2

File tree

4 files changed

+13
-51
lines changed

4 files changed

+13
-51
lines changed

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/RuntimeInstrumentationTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,20 @@
88

99
package org.pytorch.executorch;
1010

11-
import static org.junit.Assert.assertTrue;
1211
import static org.junit.Assert.assertNotNull;
1312

1413
import androidx.test.ext.junit.runners.AndroidJUnit4;
1514
import org.junit.runner.RunWith;
1615
import org.junit.Test;
1716

18-
/** Unit tests for {@link Runtime}. */
17+
/** Unit tests for {@link ExecuTorchRuntime}. */
1918
@RunWith(AndroidJUnit4.class)
2019
public class RuntimeInstrumentationTest {
2120

2221
@Test
2322
public void testRuntimeApi() {
24-
assertTrue(Runtime.isInitialized());
25-
26-
String[] ops = Runtime.getRegisteredOps();
27-
String[] backends = Runtime.getRegisteredBackends();
23+
String[] ops = ExecuTorchRuntime.getRegisteredOps();
24+
String[] backends = ExecuTorchRuntime.getRegisteredBackends();
2825

2926
assertNotNull(ops);
3027
assertNotNull(backends);

extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import com.facebook.soloader.nativeloader.NativeLoader;
1212
import com.facebook.soloader.nativeloader.SystemDelegate;
13+
import com.facebook.jni.annotations.DoNotStrip;
1314

1415
/** Class for entire ExecuTorch Runtime related functions. */
1516
public class ExecuTorchRuntime {
@@ -30,4 +31,12 @@ private ExecuTorchRuntime() {}
3031
public static ExecuTorchRuntime getRuntime() {
3132
return sInstance;
3233
}
34+
35+
/** Get all registered ops. */
36+
@DoNotStrip
37+
public static native String[] getRegisteredOps();
38+
39+
/** Get all registered backends. */
40+
@DoNotStrip
41+
public static native String[] getRegisteredBackends();
3342
}

extension/android/executorch_android/src/main/java/org/pytorch/executorch/Runtime.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

extension/android/jni/jni_layer_runtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
1717

1818
class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
1919
public:
20-
constexpr static const char* kJavaDescriptor = "Lorg/pytorch/executorch/Runtime;";
20+
constexpr static const char* kJavaDescriptor = "Lorg/pytorch/executorch/ExecuTorchRuntime;";
2121

2222
static void registerNatives() {
2323
javaClassStatic()->registerNatives({

0 commit comments

Comments
 (0)