diff --git a/extension/android/jni/jni_layer.cpp b/extension/android/jni/jni_layer.cpp index 1ef81b20b0..78624e744c 100644 --- a/extension/android/jni/jni_layer.cpp +++ b/extension/android/jni/jni_layer.cpp @@ -243,19 +243,11 @@ class ExecuTorchJni : public facebook::jni::HybridClass { static facebook::jni::local_ref initHybrid( facebook::jni::alias_ref, facebook::jni::alias_ref modelPath, - facebook::jni::alias_ref< - facebook::jni::JMap> - extraFiles, jint loadMode) { - return makeCxxInstance(modelPath, extraFiles, loadMode); + return makeCxxInstance(modelPath, loadMode); } - ExecuTorchJni( - facebook::jni::alias_ref modelPath, - facebook::jni::alias_ref< - facebook::jni::JMap> - extraFiles, - jint loadMode) { + ExecuTorchJni(facebook::jni::alias_ref modelPath, jint loadMode) { Module::LoadMode load_mode = Module::LoadMode::Mmap; if (loadMode == 0) { load_mode = Module::LoadMode::File; diff --git a/extension/android/src/main/java/org/pytorch/executorch/Module.java b/extension/android/src/main/java/org/pytorch/executorch/Module.java index 084f1be23f..608439548a 100644 --- a/extension/android/src/main/java/org/pytorch/executorch/Module.java +++ b/extension/android/src/main/java/org/pytorch/executorch/Module.java @@ -10,7 +10,6 @@ import com.facebook.soloader.nativeloader.NativeLoader; import com.facebook.soloader.nativeloader.SystemDelegate; -import java.util.Map; import org.pytorch.executorch.annotations.Experimental; /** @@ -36,32 +35,18 @@ public class Module { /** Reference to the NativePeer object of this module. */ private NativePeer mNativePeer; - /** - * Loads a serialized ExecuTorch module from the specified path on the disk. Uses default load - * FILE. - * - * @param modelPath path to file that contains the serialized ExecuTorch module. - * @param extraFiles map with extra files names as keys, content of them will be loaded to values. - * @return new {@link org.pytorch.executorch.Module} object which owns the model module. - */ - public static Module load(final String modelPath, final Map extraFiles) { - return load(modelPath, extraFiles, LOAD_MODE_FILE); - } - /** * Loads a serialized ExecuTorch module from the specified path on the disk. * * @param modelPath path to file that contains the serialized ExecuTorch module. - * @param extraFiles map with extra files names as keys, content of them will be loaded to values. * @param loadMode load mode for the module. See constants in {@link Module}. * @return new {@link org.pytorch.executorch.Module} object which owns the model module. */ - public static Module load( - final String modelPath, final Map extraFiles, int loadMode) { + public static Module load(final String modelPath, int loadMode) { if (!NativeLoader.isInitialized()) { NativeLoader.init(new SystemDelegate()); } - return new Module(new NativePeer(modelPath, extraFiles, loadMode)); + return new Module(new NativePeer(modelPath, loadMode)); } /** @@ -71,7 +56,7 @@ public static Module load( * @return new {@link org.pytorch.executorch.Module} object which owns the model module. */ public static Module load(final String modelPath) { - return load(modelPath, null); + return load(modelPath, LOAD_MODE_FILE); } Module(NativePeer nativePeer) { diff --git a/extension/android/src/main/java/org/pytorch/executorch/NativePeer.java b/extension/android/src/main/java/org/pytorch/executorch/NativePeer.java index 6d0078b0b6..2cf2ee53d7 100644 --- a/extension/android/src/main/java/org/pytorch/executorch/NativePeer.java +++ b/extension/android/src/main/java/org/pytorch/executorch/NativePeer.java @@ -11,7 +11,6 @@ import com.facebook.jni.HybridData; import com.facebook.jni.annotations.DoNotStrip; import com.facebook.soloader.nativeloader.NativeLoader; -import java.util.Map; import org.pytorch.executorch.annotations.Experimental; /** @@ -29,11 +28,10 @@ class NativePeer { private final HybridData mHybridData; @DoNotStrip - private static native HybridData initHybrid( - String moduleAbsolutePath, Map extraFiles, int loadMode); + private static native HybridData initHybrid(String moduleAbsolutePath, int loadMode); - NativePeer(String moduleAbsolutePath, Map extraFiles, int loadMode) { - mHybridData = initHybrid(moduleAbsolutePath, extraFiles, loadMode); + NativePeer(String moduleAbsolutePath, int loadMode) { + mHybridData = initHybrid(moduleAbsolutePath, loadMode); } /** Clean up the native resources associated with this instance */