LLAMA Android demo app Fix (#2354)

Summary:
Pull Request resolved: #2354

Fix namespace.
Update README for ExecuTorchDemo since we updated the CMake variable name.

Reviewed By: shoumikhin

Differential Revision: D54766652

fbshipit-source-id: c9a84deb520c3d2c31eb83086a10f0c742c76fcc

Author: kirklandsign

examples/demo-apps/android/ExecuTorchDemo/README.md

@@ -116,7 +116,7 @@ cmake .. \
     -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
     -DANDROID_ABI=arm64-v8a \
     -DBUCK2=/tmp/buck2 \
-    -DEXECUTORCH_BUILD_ANDROID_DEMO_APP_JNI=ON \
+    -DEXECUTORCH_BUILD_ANDROID_JNI=ON \
     -DEXECUTORCH_BUILD_XNNPACK=ON \
     -DEXECUTORCH_BUILD_FLATC=OFF \
     -DEXECUTORCH_BUILD_QNN=ON \

examples/demo-apps/android/LlamaDemo/app/build.gradle.kts

@@ -12,11 +12,11 @@ plugins {
 }
 
 android {
-  namespace = "com.example.executorchdemo"
+  namespace = "com.example.executorchllamademo"
   compileSdk = 34
 
   defaultConfig {
-    applicationId = "com.example.executorchdemo"
+    applicationId = "com.example.executorchllamademo"
     minSdk = 24
     targetSdk = 33
     versionCode = 1

examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchdemo/MainActivity.java renamed to examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java

@@ -177,7 +177,8 @@ inline void fill_stub(scalar_t* data, scalar_t val, int64_t size) {
   for (; d < size - (size % Vec::size()); d += Vec::size()) {
     data_vec.store(data + d);
   }
-#if !defined(_MSC_VER) && !defined(COMPILING_FOR_MIN_SIZE)
+#if !defined(_MSC_VER) && !defined(COMPILING_FOR_MIN_SIZE) && \
+    !defined(__ANDROID__)
 #pragma unroll
 #endif
   for (; d < size; d++) {
@@ -249,7 +250,7 @@ void cpu_flash_attention(
     ET_CHECK_MSG(
         attn_mask.value().size(1) == kvSize,
         "attn_mask shape mismatch"
-        "attn_mask.size(1)=%ld kvSize=%" PRId64,
+        "attn_mask.size(1)=%zd kvSize=%" PRId64,
         attn_mask.value().size(1),
         kvSize);
   }
@@ -578,7 +579,7 @@ bool validate_cache_params(
       "start_post + seq_length must be less than max seq length supported by key cache."
       "start pos: %" PRId64 ", seq_length: %" PRId64
       "."
-      "key cache size: %ld",
+      "key cache size: %zd",
       start_pos,
       seq_length,
       k_cache.size(2));
@@ -588,7 +589,7 @@ bool validate_cache_params(
       "start_post + seq_length must be less than max seq length supported by key cache."
       "start pos: %" PRId64 ", seq_length: %" PRId64
       "."
-      "value cache size: %ld",
+      "value cache size: %zd",
       start_pos,
       seq_length,
       v_cache.size(2));