Android MV2 E2E instrumentation test

extension/android/executorch_android/android_test_setup.sh

@@ -13,17 +13,33 @@ fi
 which "${PYTHON_EXECUTABLE}"
 
 BASEDIR=$(dirname "$(realpath $0)")
-cp "${BASEDIR}/../../../extension/module/test/resources/add.pte" "${BASEDIR}/src/androidTest/resources"
-
-pushd "${BASEDIR}/../../../"
-curl -C - -Ls "https://huggingface.co/karpathy/tinyllamas/resolve/main/stories110M.pt" --output stories110M.pt
-curl -C - -Ls "https://raw.githubusercontent.com/karpathy/llama2.c/master/tokenizer.model" --output tokenizer.model
-# Create params.json file
-touch params.json
-echo '{"dim": 768, "multiple_of": 32, "n_heads": 12, "n_layers": 12, "norm_eps": 1e-05, "vocab_size": 32000}' > params.json
-python -m examples.models.llama.export_llama -c stories110M.pt -p params.json -d fp16 -n stories110m_h.pte -kv
-python -m pytorch_tokenizers.tools.llama2c.convert -t tokenizer.model -o tokenizer.bin
-
-cp stories110m_h.pte "${BASEDIR}/src/androidTest/resources/stories.pte"
-cp tokenizer.bin "${BASEDIR}/src/androidTest/resources/tokenizer.bin"
-popd
+
+prepare_add() {
+  cp "${BASEDIR}/../../../extension/module/test/resources/add.pte" "${BASEDIR}/src/androidTest/resources"
+}
+
+prepare_tinyllama() {
+  pushd "${BASEDIR}/../../../"
+  curl -C - -Ls "https://huggingface.co/karpathy/tinyllamas/resolve/main/stories15M.pt" --output stories15M.pt
+  curl -C - -Ls "https://raw.githubusercontent.com/karpathy/llama2.c/master/tokenizer.model" --output tokenizer.model
+  # Create params.json file
+  touch params.json
+  echo '{"dim": 288, "multiple_of": 32, "n_heads": 6, "n_layers": 6, "norm_eps": 1e-05, "vocab_size": 32000}' > params.json
+  python -m examples.models.llama.export_llama -c stories15M.pt -p params.json -d fp16 -n stories15m_h.pte -kv
+  python -m pytorch_tokenizers.tools.llama2c.convert -t tokenizer.model -o tokenizer.bin
+
+  cp stories15m_h.pte "${BASEDIR}/src/androidTest/resources/stories.pte"
+  cp tokenizer.bin "${BASEDIR}/src/androidTest/resources/tokenizer.bin"
+  popd
+}
+
+prepare_vision() {
+  pushd "${BASEDIR}/../../../"
+  python3 -m examples.xnnpack.aot_compiler --model_name "mv2" --delegate
+  cp mv2*.pte "${BASEDIR}/src/androidTest/resources/"
+  popd
+}
+
+prepare_add
+prepare_tinyllama
+prepare_vision

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package org.pytorch.executorch;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+
+import android.os.Environment;
+import androidx.test.rule.GrantPermissionRule;
+import android.Manifest;
+import android.content.Context;
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.io.IOException;
+import java.io.File;
+import java.io.FileOutputStream;
+import org.junit.runners.JUnit4;
+import org.apache.commons.io.FileUtils;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+
+/** Unit tests for {@link Module}. */
+@RunWith(AndroidJUnit4.class)
+public class ModuleE2ETest {
+    private static String getTestFilePath(String fileName) {
+        return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName;
+    }
+
+    @Rule
+    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+
+    @Test
+    public void testMv2Fp32() throws IOException, URISyntaxException{
+        String filePath = "/mv2_xnnpack_fp32.pte";
+        File pteFile = new File(getTestFilePath(filePath));
+        InputStream inputStream = getClass().getResourceAsStream(filePath);
+        FileUtils.copyInputStreamToFile(inputStream, pteFile);
+        inputStream.close();
+
+        Module module = Module.load(getTestFilePath(filePath));
+
+        EValue[] results = module.forward();
+        assertTrue(results[0].isTensor());
+    }
+
+}

scripts/run_android_emulator.sh

@@ -22,7 +22,8 @@ adb uninstall org.pytorch.executorch.test || true
 adb install -t android-test-debug-androidTest.apk
 
 adb logcat -c
-adb shell am instrument -w -r -e class org.pytorch.executorch.ModuleInstrumentationTest \
+adb shell am instrument -w -r -e \
+  class org.pytorch.executorch.ModuleInstrumentationTest,org.pytorch.executorch.ModuleE2ETest \
   org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner >result.txt 2>&1
 adb logcat -d > logcat.txt
 cat logcat.txt