Make workflow generic and add model download to SanityCheck

1. Renamed workflow to "Android Emulator Tests" (generic, not DL3-specific)
2. Added demo_path input parameter for flexibility
3. Updated SanityCheck.kt to download model if not present
4. Updated run-ci-tests.sh to be generic (uses DEMO_NAME)
5. Updated README to reflect model auto-download in tests

Co-authored-by: kirklandsign <107070759+kirklandsign@users.noreply.github.com>

Author: Copilot

.github/workflows/android-emulator.yml

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-name: DL3 Android Emulator
+name: Android Emulator Tests
 
 on:
   pull_request:
@@ -13,6 +13,12 @@ on:
       - 'dl3/android/**'
       - '.github/workflows/android-emulator.yml'
   workflow_dispatch:
+    inputs:
+      demo_path:
+        description: 'Path to Android demo (e.g., dl3/android/DeepLabV3Demo)'
+        required: false
+        default: 'dl3/android/DeepLabV3Demo'
+        type: string
 
 permissions:
   contents: read
@@ -23,12 +29,20 @@ jobs:
     env:
       API_LEVEL: 34
       ARCH: x86_64
+      DEMO_PATH: ${{ inputs.demo_path || 'dl3/android/DeepLabV3Demo' }}
 
-    name: Instrumentation Test DL3
+    name: Instrumentation Test Android Emulator
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Determine demo name
+        id: demo-info
+        run: |
+          DEMO_NAME=$(basename "${{ env.DEMO_PATH }}")
+          echo "demo_name=$DEMO_NAME" >> $GITHUB_OUTPUT
+          echo "Testing: $DEMO_NAME"
+
       - name: Enable KVM group perms
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -51,7 +65,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ env.API_LEVEL }}-${{ env.ARCH }}-ram8G-disk8G-dl3-v1
+          key: avd-${{ env.API_LEVEL }}-${{ env.ARCH }}-ram8G-disk8G-${{ steps.demo-info.outputs.demo_name }}-v1
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
@@ -64,7 +78,7 @@ jobs:
           force-avd-creation: true
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-snapshot-save -memory 8192
           disable-animations: false
-          working-directory: dl3/android/DeepLabV3Demo
+          working-directory: ${{ env.DEMO_PATH }}
           script: echo "Generated AVD snapshot for caching."
 
       - name: Run instrumentation tests
@@ -77,13 +91,13 @@ jobs:
           force-avd-creation: true
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-snapshot-save -memory 8192
           disable-animations: true
-          working-directory: dl3/android/DeepLabV3Demo
+          working-directory: ${{ env.DEMO_PATH }}
           script: bash ./scripts/run-ci-tests.sh
 
       - name: Upload logcat
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: logcat-dl3
-          path: /tmp/logcat-dl3.txt
+          name: logcat-${{ steps.demo-info.outputs.demo_name }}
+          path: /tmp/logcat-*.txt
           retention-days: 7

dl3/android/DeepLabV3Demo/README.md

@@ -106,9 +106,9 @@ Open `app/src/androidTest/java/org/pytorch/executorchexamples/dl3/SanityCheck.kt
 
 ### Test Files
 - **SanityCheck.kt**: Basic module forward pass test
+  - Downloads model automatically if not present
   - Tests model loading from app's private storage
-  - Validates model output shape
-  - Skips gracefully if model not yet downloaded
+  - Validates model output shape (batch_size × classes × width × height)
 
 > **Note**: UI workflow tests for the Compose-based interface are planned for a future update.
 

dl3/android/DeepLabV3Demo/app/src/androidTest/java/org/pytorch/executorchexamples/dl3/SanityCheck.kt

@@ -9,43 +9,79 @@
 package org.pytorch.executorchexamples.dl3
 
 import android.content.Context
+import android.util.Log
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
-import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Test
 import org.pytorch.executorch.Module
 import org.pytorch.executorch.Tensor
 import java.io.File
+import java.io.FileOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
 
 /**
  * Sanity check test for model loading.
  * 
- * This test will skip if the model file is not available.
- * The model should be in the app's private storage (same location as MainActivity uses).
+ * This test downloads the model if not available and validates model functionality.
+ * The model is stored in the app's private storage (same location as MainActivity uses).
  */
 @SmallTest
 class SanityCheck {
 
     companion object {
         private const val MODEL_FILENAME = "dl3_xnnpack_fp32.pte"
+        private const val MODEL_URL = "https://ossci-android.s3.amazonaws.com/executorch/models/snapshot-20260116/dl3_xnnpack_fp32.pte"
+        private const val TAG = "SanityCheck"
     }
 
     private lateinit var modelPath: String
+    private lateinit var context: Context
 
     @Before
     fun setUp() {
         // Use the app's private files directory (same as MainActivity)
-        val context = ApplicationProvider.getApplicationContext<Context>()
+        context = ApplicationProvider.getApplicationContext()
         modelPath = "${context.filesDir.absolutePath}/$MODEL_FILENAME"
 
-        // Check if model file exists, skip test if not
+        // Download model if not present
         val modelFile = File(modelPath)
-        assumeTrue(
-            "Model file not found at $modelPath. Run UIWorkflowTest first to download the model.",
-            modelFile.exists()
-        )
+        if (!modelFile.exists()) {
+            Log.i(TAG, "Model not found at $modelPath, downloading...")
+            downloadModel()
+        } else {
+            Log.i(TAG, "Model found at $modelPath")
+        }
+    }
+
+    private fun downloadModel() {
+        try {
+            val url = URL(MODEL_URL)
+            val connection = url.openConnection() as HttpURLConnection
+            connection.requestMethod = "GET"
+            connection.instanceFollowRedirects = true
+            connection.connect()
+
+            if (connection.responseCode != HttpURLConnection.HTTP_OK) {
+                throw RuntimeException("Server returned HTTP ${connection.responseCode}")
+            }
+
+            connection.inputStream.use { input ->
+                FileOutputStream(modelPath).use { output ->
+                    val buffer = ByteArray(4096)
+                    var bytesRead: Int
+                    while (input.read(buffer).also { bytesRead = it } != -1) {
+                        output.write(buffer, 0, bytesRead)
+                    }
+                }
+            }
+            Log.i(TAG, "Model downloaded successfully to $modelPath")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to download model", e)
+            throw RuntimeException("Failed to download model: ${e.message}", e)
+        }
     }
 
     @Test

dl3/android/DeepLabV3Demo/scripts/run-ci-tests.sh

@@ -5,13 +5,16 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-# CI test script for running DL3 instrumentation tests
-# The model will be downloaded automatically by the app during the test
+# CI test script for running Android instrumentation tests
+# The model will be downloaded automatically by the test if needed
 
 set -ex
 
+DEMO_NAME=$(basename "$PWD")
+
 echo "=== Test Configuration ==="
-echo "DL3 Demo - Model will be downloaded by the app"
+echo "Demo: $DEMO_NAME"
+echo "Model will be downloaded by the test if not present"
 
 echo "=== Emulator Memory Info ==="
 adb shell cat /proc/meminfo | head -5
@@ -20,8 +23,9 @@ echo "=== Emulator Disk Space ==="
 adb shell df -h /data
 
 # Start logcat capture
+LOGCAT_FILE="/tmp/logcat-${DEMO_NAME}.txt"
 adb logcat -c
-adb logcat > /tmp/logcat-dl3.txt &
+adb logcat > "$LOGCAT_FILE" &
 LOGCAT_PID=$!
 
 echo "=== Starting Gradle ==="
@@ -41,6 +45,6 @@ else
 fi
 
 echo "=== Checking for test results in logcat ==="
-grep "UIWorkflowTest" /tmp/logcat-dl3.txt || echo "No UIWorkflowTest logs found"
+grep "SanityCheck" "$LOGCAT_FILE" || echo "No SanityCheck logs found"
 
 exit $TEST_EXIT_CODE