From efdd8f2d5e877541f83222bf22eb1ae0634b6960 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Tue, 18 Mar 2025 14:36:53 -0700 Subject: [PATCH 01/19] Update --- extension/android/BUCK | 16 +++---- extension/android/build.gradle | 42 +++++++++++-------- .../android/executorch_android/build.gradle | 33 +++++++++++++++ .../executorch_android/gradle.properties | 4 ++ .../src/main/AndroidManifest.xml | 3 ++ .../java/org/pytorch/executorch/DType.java | 0 .../java/org/pytorch/executorch/EValue.java | 0 .../org/pytorch/executorch/LlamaCallback.java | 0 .../org/pytorch/executorch/LlamaModule.java | 0 .../java/org/pytorch/executorch/Module.java | 0 .../org/pytorch/executorch/NativePeer.java | 0 .../java/org/pytorch/executorch/Tensor.java | 0 .../executorch/annotations/Experimental.java | 0 extension/android/gradle.properties | 16 +++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- extension/android/settings.gradle | 12 +++++- 16 files changed, 100 insertions(+), 28 deletions(-) create mode 100644 extension/android/executorch_android/build.gradle create mode 100644 extension/android/executorch_android/gradle.properties create mode 100644 extension/android/executorch_android/src/main/AndroidManifest.xml rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/DType.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/EValue.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/LlamaCallback.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/LlamaModule.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/Module.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/NativePeer.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/Tensor.java (100%) rename extension/android/{ => executorch_android}/src/main/java/org/pytorch/executorch/annotations/Experimental.java (100%) create mode 100644 extension/android/gradle.properties diff --git a/extension/android/BUCK b/extension/android/BUCK index 040c9258d42..b44a3d71e67 100644 --- a/extension/android/BUCK +++ b/extension/android/BUCK @@ -5,12 +5,12 @@ oncall("executorch") fb_android_library( name = "executorch", srcs = [ - "src/main/java/org/pytorch/executorch/DType.java", - "src/main/java/org/pytorch/executorch/EValue.java", - "src/main/java/org/pytorch/executorch/Module.java", - "src/main/java/org/pytorch/executorch/NativePeer.java", - "src/main/java/org/pytorch/executorch/Tensor.java", - "src/main/java/org/pytorch/executorch/annotations/Experimental.java", + "executorch_android/src/main/java/org/pytorch/executorch/DType.java", + "executorch_android/src/main/java/org/pytorch/executorch/EValue.java", + "executorch_android/src/main/java/org/pytorch/executorch/Module.java", + "executorch_android/src/main/java/org/pytorch/executorch/NativePeer.java", + "executorch_android/src/main/java/org/pytorch/executorch/Tensor.java", + "executorch_android/src/main/java/org/pytorch/executorch/annotations/Experimental.java", ], autoglob = False, language = "JAVA", @@ -23,8 +23,8 @@ fb_android_library( fb_android_library( name = "executorch_llama", srcs = [ - "src/main/java/org/pytorch/executorch/LlamaCallback.java", - "src/main/java/org/pytorch/executorch/LlamaModule.java", + "executorch_android/src/main/java/org/pytorch/executorch/LlamaCallback.java", + "executorch_android/src/main/java/org/pytorch/executorch/LlamaModule.java", ], autoglob = False, language = "JAVA", diff --git a/extension/android/build.gradle b/extension/android/build.gradle index a4172e90578..ac031653a7a 100644 --- a/extension/android/build.gradle +++ b/extension/android/build.gradle @@ -1,24 +1,30 @@ -/* - * 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. - */ +allprojects { + buildscript { + ext { + minSdkVersion = 21 + targetSdkVersion = 34 + compileSdkVersion = 34 + buildToolsVersion = '33.0.1' -plugins { - id 'java-library' -} + fbjniJavaOnlyVersion = "0.5.1" + soLoaderNativeLoaderVersion = "0.10.5" + } -group 'org.pytorch.executorch' + repositories { + google() + mavenCentral() + } -repositories { - mavenCentral() -} + dependencies { + classpath 'com.android.tools.build:gradle:8.9.0' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.31.0' + } + + } -task makeJar(type: Jar) { - dependencies { - implementation 'com.facebook.fbjni:fbjni-java-only:0.5.1' - implementation 'com.facebook.soloader:nativeloader:0.10.5' + repositories { + google() + jcenter() + mavenCentral() } } diff --git a/extension/android/executorch_android/build.gradle b/extension/android/executorch_android/build.gradle new file mode 100644 index 00000000000..99093bd23f1 --- /dev/null +++ b/extension/android/executorch_android/build.gradle @@ -0,0 +1,33 @@ +/* + * 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. + */ + +plugins { + id "com.android.library" version "8.9.0" + id "maven-publish" +} + +android { + namespace = "org.pytorch.executorch" + compileSdk = 34 + + defaultConfig { + minSdk = 19 + + testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation 'com.facebook.fbjni:fbjni-java-only:0.5.1' + implementation 'com.facebook.soloader:nativeloader:0.10.5' +} diff --git a/extension/android/executorch_android/gradle.properties b/extension/android/executorch_android/gradle.properties new file mode 100644 index 00000000000..cdbe05eb1aa --- /dev/null +++ b/extension/android/executorch_android/gradle.properties @@ -0,0 +1,4 @@ +POM_NAME=executorch_android ExecuTorch Android API +POM_DESCRIPTION=executorch_android ExecuTorch Android API +POM_ARTIFACT_ID=executorch_android +POM_PACKAGING=aar diff --git a/extension/android/executorch_android/src/main/AndroidManifest.xml b/extension/android/executorch_android/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..a796abff9c7 --- /dev/null +++ b/extension/android/executorch_android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/extension/android/src/main/java/org/pytorch/executorch/DType.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/DType.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/DType.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/DType.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/EValue.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/EValue.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/EValue.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/EValue.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/LlamaCallback.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/LlamaCallback.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/LlamaCallback.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/LlamaCallback.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/LlamaModule.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/LlamaModule.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/LlamaModule.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/LlamaModule.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/Module.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/Module.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/Module.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/Module.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/NativePeer.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/NativePeer.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/NativePeer.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/NativePeer.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/Tensor.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/Tensor.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/Tensor.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/Tensor.java diff --git a/extension/android/src/main/java/org/pytorch/executorch/annotations/Experimental.java b/extension/android/executorch_android/src/main/java/org/pytorch/executorch/annotations/Experimental.java similarity index 100% rename from extension/android/src/main/java/org/pytorch/executorch/annotations/Experimental.java rename to extension/android/executorch_android/src/main/java/org/pytorch/executorch/annotations/Experimental.java diff --git a/extension/android/gradle.properties b/extension/android/gradle.properties new file mode 100644 index 00000000000..01742a6d666 --- /dev/null +++ b/extension/android/gradle.properties @@ -0,0 +1,16 @@ +ABI_FILTERS=arm64-v8a,x86_64 + +VERSION_NAME=0.6.0-SNAPSHOT +GROUP=org.pytorch +MAVEN_GROUP=org.pytorch +SONATYPE_STAGING_PROFILE=orgpytorch +POM_URL=https://github.com/pytorch/executorch/tree/main/extension/android +POM_SCM_URL=https://github.com/pytorch/executorch.git +POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/executorch +POM_SCM_DEV_CONNECTION=scm:git:git@github.com:pytorch/executorch.git +POM_LICENSE_NAME=BSD 3-Clause +POM_LICENSE_URL=https://github.com/pytorch/executorch/blob/main/LICENSE +POM_ISSUES_URL=https://github.com/pytorch/executorch/issues +POM_LICENSE_DIST=repo +POM_DEVELOPER_ID=pytorch +POM_DEVELOPER_NAME=pytorch diff --git a/extension/android/gradle/wrapper/gradle-wrapper.properties b/extension/android/gradle/wrapper/gradle-wrapper.properties index a80b22ce5cf..e2847c82004 100644 --- a/extension/android/gradle/wrapper/gradle-wrapper.properties +++ b/extension/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/extension/android/settings.gradle b/extension/android/settings.gradle index 2a0a78b30cc..95d46203058 100644 --- a/extension/android/settings.gradle +++ b/extension/android/settings.gradle @@ -5,10 +5,20 @@ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation. */ +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + plugins { // Apply the foojay-resolver plugin to allow automatic download of JDKs id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } rootProject.name = 'executorch' -include('src') + +include('executorch_android') From 405ac8334e2084c1be689da557c940d5c4951fc3 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Tue, 18 Mar 2025 19:53:09 -0700 Subject: [PATCH 02/19] Update --- .../android/executorch_android/build.gradle | 38 ++++++++++++++++++- .../src/main/AndroidManifest.xml | 3 -- 2 files changed, 37 insertions(+), 4 deletions(-) delete mode 100644 extension/android/executorch_android/src/main/AndroidManifest.xml diff --git a/extension/android/executorch_android/build.gradle b/extension/android/executorch_android/build.gradle index 99093bd23f1..528a3856188 100644 --- a/extension/android/executorch_android/build.gradle +++ b/extension/android/executorch_android/build.gradle @@ -8,7 +8,7 @@ plugins { id "com.android.library" version "8.9.0" - id "maven-publish" + id "com.vanniktech.maven.publish" version "0.31.0" } android { @@ -31,3 +31,39 @@ dependencies { implementation 'com.facebook.fbjni:fbjni-java-only:0.5.1' implementation 'com.facebook.soloader:nativeloader:0.10.5' } + +import com.vanniktech.maven.publish.SonatypeHost + +mavenPublishing { + publishToMavenCentral(SonatypeHost.DEFAULT) + signAllPublications() + + coordinates("org.pytorch", "executorch-android", "0.6.0-SNAPSHOT") + + pom { + name = "ExecuTorch Android" + description = "ExecuTorch Android API" + inceptionYear = "2025" + url = "https://github.com/pytorch/executorch/" + licenses { + license { + name = "BSD 3-Clause" + url = "https://github.com/pytorch/executorch/blob/main/LICENSE" + distribution = "https://github.com/pytorch/executorch/blob/main/LICENSE" + } + } + developers { + developer { + id = "pytorch" + name = "pytorch" + url = "https://github.com/pytorch/executorch/" + } + } + scm { + url = "https://github.com/pytorch/executorch.git" + connection = "scm:git:https://github.com/pytorch/executorch" + developerConnection = "scm:git:git@github.com:pytorch/executorch.git" + } + } + +} diff --git a/extension/android/executorch_android/src/main/AndroidManifest.xml b/extension/android/executorch_android/src/main/AndroidManifest.xml deleted file mode 100644 index a796abff9c7..00000000000 --- a/extension/android/executorch_android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - From e1a14eae17425b35967f45e0d93edfd76343b29f Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 19 Mar 2025 14:47:40 -0700 Subject: [PATCH 03/19] Remove gradle.properties --- .../android/executorch_android/gradle.properties | 4 ---- extension/android/gradle.properties | 16 ---------------- 2 files changed, 20 deletions(-) delete mode 100644 extension/android/executorch_android/gradle.properties delete mode 100644 extension/android/gradle.properties diff --git a/extension/android/executorch_android/gradle.properties b/extension/android/executorch_android/gradle.properties deleted file mode 100644 index cdbe05eb1aa..00000000000 --- a/extension/android/executorch_android/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -POM_NAME=executorch_android ExecuTorch Android API -POM_DESCRIPTION=executorch_android ExecuTorch Android API -POM_ARTIFACT_ID=executorch_android -POM_PACKAGING=aar diff --git a/extension/android/gradle.properties b/extension/android/gradle.properties deleted file mode 100644 index 01742a6d666..00000000000 --- a/extension/android/gradle.properties +++ /dev/null @@ -1,16 +0,0 @@ -ABI_FILTERS=arm64-v8a,x86_64 - -VERSION_NAME=0.6.0-SNAPSHOT -GROUP=org.pytorch -MAVEN_GROUP=org.pytorch -SONATYPE_STAGING_PROFILE=orgpytorch -POM_URL=https://github.com/pytorch/executorch/tree/main/extension/android -POM_SCM_URL=https://github.com/pytorch/executorch.git -POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/executorch -POM_SCM_DEV_CONNECTION=scm:git:git@github.com:pytorch/executorch.git -POM_LICENSE_NAME=BSD 3-Clause -POM_LICENSE_URL=https://github.com/pytorch/executorch/blob/main/LICENSE -POM_ISSUES_URL=https://github.com/pytorch/executorch/issues -POM_LICENSE_DIST=repo -POM_DEVELOPER_ID=pytorch -POM_DEVELOPER_NAME=pytorch From d6a26c860d8dafa7bf01589fc27eb13f4814dce5 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 19 Mar 2025 15:18:45 -0700 Subject: [PATCH 04/19] Use gradle to build the AAR --- build/build_android_library.sh | 51 ++++++++----------- .../android/executorch_android/build.gradle | 8 ++- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/build/build_android_library.sh b/build/build_android_library.sh index e5e1b0eeb7b..0eaf829446d 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -12,12 +12,9 @@ if [[ -z "${PYTHON_EXECUTABLE:-}" ]]; then fi which "${PYTHON_EXECUTABLE}" -build_jar() { - pushd extension/android - ./gradlew build - popd - mkdir -p "${BUILD_AAR_DIR}/libs" - cp extension/android/build/libs/executorch.jar "${BUILD_AAR_DIR}/libs/" +copy_src() { + cp -r extension/android/build.gradle extension/android/settings.gradle extension/android/gradlew extension/android/gradle extension/android/gradlew.bat "${BUILD_AAR_DIR}" + cp -r extension/android/executorch_android "${BUILD_AAR_DIR}/executorch_android" } build_android_native_library() { @@ -96,44 +93,40 @@ build_android_native_library() { cmake --build "${CMAKE_OUT}"/extension/android -j "${CMAKE_JOBS}" --config "${EXECUTORCH_CMAKE_BUILD_TYPE}" # Copy artifacts to ABI specific directory - mkdir -p "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}" - cp "${CMAKE_OUT}"/extension/android/*.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" + mkdir -p "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}" + cp "${CMAKE_OUT}"/extension/android/*.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" # Copy QNN related so library if [ -n "$QNN_SDK_ROOT" ] && [ "$ANDROID_ABI" == "arm64-v8a" ]; then - cp "${CMAKE_OUT}"/lib/libqnn_executorch_backend.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtp.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnSystem.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV69Stub.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV73Stub.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV75Stub.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/hexagon-v69/unsigned/libQnnHtpV69Skel.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/hexagon-v73/unsigned/libQnnHtpV73Skel.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" - cp "${QNN_SDK_ROOT}"/lib/hexagon-v75/unsigned/libQnnHtpV75Skel.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" + cp "${CMAKE_OUT}"/lib/libqnn_executorch_backend.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtp.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnSystem.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV69Stub.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV73Stub.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/aarch64-android/libQnnHtpV75Stub.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/hexagon-v69/unsigned/libQnnHtpV69Skel.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/hexagon-v73/unsigned/libQnnHtpV73Skel.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" + cp "${QNN_SDK_ROOT}"/lib/hexagon-v75/unsigned/libQnnHtpV75Skel.so "${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/" fi # Copy MTK related so library if [ -n "$NEURON_BUFFER_ALLOCATOR_LIB" ] && [ -n "$NEURON_USDK_ADAPTER_LIB" ] && [ "$ANDROID_ABI" == "arm64-v8a" ]; then - cp "${CMAKE_OUT}"/backends/mediatek/libneuron_backend.so ${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/ - cp "${NEURON_BUFFER_ALLOCATOR_LIB}" ${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/ - cp "${NEURON_USDK_ADAPTER_LIB}" ${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/ + cp "${CMAKE_OUT}"/backends/mediatek/libneuron_backend.so ${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/ + cp "${NEURON_BUFFER_ALLOCATOR_LIB}" ${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/ + cp "${NEURON_USDK_ADAPTER_LIB}" ${BUILD_AAR_DIR}/executorch_android/src/main/jniLibs/${ANDROID_ABI}/ fi } build_aar() { - echo \ \ - \ \ - \ > "${BUILD_AAR_DIR}/AndroidManifest.xml" pushd "${BUILD_AAR_DIR}" # Rename libexecutorch_jni.so to libexecutorch.so for soname consistency # between Java and JNI - find jni -type f -name "libexecutorch_jni.so" -exec bash -c 'mv "$1" "${1/_jni/}"' bash {} \; + find . -type f -name "libexecutorch_jni.so" -exec bash -c 'mv "$1" "${1/_jni/}"' bash {} \; if [ "$EXECUTORCH_CMAKE_BUILD_TYPE" == "Release" ]; then - find jni -type f -name "*.so" -exec "$ANDROID_NDK"/toolchains/llvm/prebuilt/*/bin/llvm-strip {} \; + find . -type f -name "*.so" -exec "$ANDROID_NDK"/toolchains/llvm/prebuilt/*/bin/llvm-strip {} \; fi - # Zip all necessary files into the AAR file - zip -r executorch.aar libs jni/*/libexecutorch.so jni/*/libqnn*.so jni/*/libQnn*.so jni/*/libneuron_backend.so jni/*/libneuron_buffer_allocator.so jni/*/libneuronusdk_adapter.mtk.so AndroidManifest.xml + ./gradlew build + cp executorch_android/build/outputs/aar/executorch_android-debug.aar executorch.aar popd } @@ -149,7 +142,7 @@ main() { ARTIFACTS_DIR_NAME="$1" - build_jar + copy_src for ANDROID_ABI in "${ANDROID_ABIS[@]}"; do build_android_native_library ${ANDROID_ABI} done diff --git a/extension/android/executorch_android/build.gradle b/extension/android/executorch_android/build.gradle index 528a3856188..4994ba41697 100644 --- a/extension/android/executorch_android/build.gradle +++ b/extension/android/executorch_android/build.gradle @@ -38,7 +38,7 @@ mavenPublishing { publishToMavenCentral(SonatypeHost.DEFAULT) signAllPublications() - coordinates("org.pytorch", "executorch-android", "0.6.0-SNAPSHOT") + coordinates("org.pytorch", "executorch-android", "0.5.0-SNAPSHOT") pom { name = "ExecuTorch Android" @@ -67,3 +67,9 @@ mavenPublishing { } } + +repositories { + maven { + url "https://oss.sonatype.org/content/repositories/snapshots" + } +} From c314cea9e9d9b647f9d5765c6e5940e5c5b12023 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 19 Mar 2025 15:35:19 -0700 Subject: [PATCH 05/19] Fix javadoc and linter --- .github/workflows/doc-build.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index aa3fed97d4a..2cee615855a 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -70,8 +70,8 @@ jobs: # Build javadoc: cd extension/android - ./gradlew javadoc - cp -rf build/docs/javadoc "${RUNNER_DOCS_DIR}" + ./gradlew :executorch_android:javaDocReleaseGeneration + cp -rf executorch_android/build/intermediates/java_doc_dir/release/javaDocReleaseGeneration "${RUNNER_DOCS_DIR}/javadoc" cd ../.. # If it's main branch, add noindex tag to all .html files to exclude from Google Search indexing. diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 69fcc11a347..5a3c8595c72 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -76,8 +76,8 @@ jobs: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 script: | - FILES_NEEDS_FORMAT=$(/opt/google-java-format -n extension/android/src/main/java/org/pytorch/executorch/*.java \ - examples/demo-apps/android/ExecuTorchDemo/app/src/main/java/com/example/executorchdemo/*.java \ + FILES_NEEDS_FORMAT=$(/opt/google-java-format -n \ + extension/android/executorch_android/src/main/java/org/pytorch/executorch/*.java \ examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/*.java \ extension/benchmark/android/benchmark/app/src/main/java/org/pytorch/minibench/*.java) if [ -n "$FILES_NEEDS_FORMAT" ]; then From fd435e3bfe6354609814fef0b0de78ae875e336a Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 19 Mar 2025 15:49:15 -0700 Subject: [PATCH 06/19] Update SDK --- .github/workflows/doc-build.yml | 4 ++-- build/build_android_library.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 2cee615855a..b8b63078643 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -26,7 +26,7 @@ jobs: with: job-name: Build doc runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: executorch-ubuntu-22.04-clang12-android submodules: 'true' repository: pytorch/executorch upload-artifact: docs @@ -70,7 +70,7 @@ jobs: # Build javadoc: cd extension/android - ./gradlew :executorch_android:javaDocReleaseGeneration + ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew :executorch_android:javaDocReleaseGeneration cp -rf executorch_android/build/intermediates/java_doc_dir/release/javaDocReleaseGeneration "${RUNNER_DOCS_DIR}/javadoc" cd ../.. diff --git a/build/build_android_library.sh b/build/build_android_library.sh index 0eaf829446d..8ad87a98e17 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -125,7 +125,7 @@ build_aar() { if [ "$EXECUTORCH_CMAKE_BUILD_TYPE" == "Release" ]; then find . -type f -name "*.so" -exec "$ANDROID_NDK"/toolchains/llvm/prebuilt/*/bin/llvm-strip {} \; fi - ./gradlew build + ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build cp executorch_android/build/outputs/aar/executorch_android-debug.aar executorch.aar popd } From be309dbee138b19ae7bcd1312a49e1ec3820c385 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 19 Mar 2025 16:13:30 -0700 Subject: [PATCH 07/19] Add build-tools 35 --- .ci/docker/common/install_android.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/docker/common/install_android.sh b/.ci/docker/common/install_android.sh index ab779ade8fc..e990bc6933f 100755 --- a/.ci/docker/common/install_android.sh +++ b/.ci/docker/common/install_android.sh @@ -70,6 +70,7 @@ install_sdk() { # These are the tools needed to build Android apps yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "platforms;android-34" yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "build-tools;33.0.1" + yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "build-tools;35.0.0" # And some more tools for future emulator tests yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "platform-tools" yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "tools" From d758f4600bbcd9da554f7ee692232fd2e9d4fb81 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 12:19:25 -0700 Subject: [PATCH 08/19] mkdir --- .github/workflows/_android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index 40969e59911..884a159f687 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -30,6 +30,7 @@ jobs: # Build LLM Demo for Android export BUILD_AAR_DIR=aar-out + mkdir -p $BUILD_AAR_DIR bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME} bash .ci/scripts/build_android_instrumentation.sh ${ARTIFACTS_DIR_NAME} From 4d14c0dc106d71bc4fffb68ead1b815d1bee219a Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 13:19:01 -0700 Subject: [PATCH 09/19] test --- extension/android_test/setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/extension/android_test/setup.sh b/extension/android_test/setup.sh index e1306af4205..d2c169a5033 100755 --- a/extension/android_test/setup.sh +++ b/extension/android_test/setup.sh @@ -51,7 +51,6 @@ build_native_library() { } pushd "$BASEDIR"/../../ -build_jar build_native_library "arm64-v8a" build_native_library "x86_64" build_aar From 320c2fa938181f66e376ffd3f18463c14378cb94 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 15:21:10 -0700 Subject: [PATCH 10/19] Update android test package --- .ci/scripts/build_android_instrumentation.sh | 11 +- .github/workflows/_android.yml | 1 - .github/workflows/pull.yml | 3 +- build/run_android_emulator.sh | 2 - .../android/executorch_android/build.gradle | 14 +- .../LlamaModuleInstrumentationTest.java | 114 +++++++ .../executorch/ModuleInstrumentationTest.java | 127 ++++++++ .../src/main/AndroidManifest.xml | 9 + .../org/pytorch/executorch/EValueTest.java | 230 +++++++++++++ .../org/pytorch/executorch/TensorTest.java | 305 ++++++++++++++++++ extension/android/gradle.properties | 2 + 11 files changed, 806 insertions(+), 12 deletions(-) create mode 100644 extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java create mode 100644 extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java create mode 100644 extension/android/executorch_android/src/main/AndroidManifest.xml create mode 100644 extension/android/executorch_android/src/test/java/org/pytorch/executorch/EValueTest.java create mode 100644 extension/android/executorch_android/src/test/java/org/pytorch/executorch/TensorTest.java create mode 100644 extension/android/gradle.properties diff --git a/.ci/scripts/build_android_instrumentation.sh b/.ci/scripts/build_android_instrumentation.sh index 91bf03691b0..40df2a7521b 100644 --- a/.ci/scripts/build_android_instrumentation.sh +++ b/.ci/scripts/build_android_instrumentation.sh @@ -13,9 +13,11 @@ fi which "${PYTHON_EXECUTABLE}" build_android_test() { - pushd extension/android_test - ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew testDebugUnitTest - ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest + mkdir -p extension/android/executorch_android/src/androidTest/resources + cp extension/module/test/resources/add.pte extension/android/executorch_android/src/androidTest/resources + pushd extension/android + ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew :executorch_android:testDebugUnitTest + ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew :executorch_android:assembleAndroidTest popd } @@ -24,8 +26,7 @@ collect_artifacts_to_be_uploaded() { # Collect Java library test JAVA_LIBRARY_TEST_DIR="${ARTIFACTS_DIR_NAME}/library_test_dir" mkdir -p "${JAVA_LIBRARY_TEST_DIR}" - cp extension/android_test/build/outputs/apk/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}" - cp extension/android_test/build/outputs/apk/androidTest/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}" + cp executorch_android/build/outputs/apk/androidTest/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}" } main() { diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index 884a159f687..e6168c8fe22 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -95,7 +95,6 @@ jobs: curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug.apk curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug-androidTest.apk curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/fp32-xnnpack-custom/model.zip - curl -o android-test-debug.apk https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/library_test_dir/executorch-debug.apk curl -o android-test-debug-androidTest.apk https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/library_test_dir/executorch-debug-androidTest.apk unzip model.zip mv *.pte model.pte diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 42e65eb3253..5cc117fb3f7 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -60,7 +60,7 @@ jobs: - runner: linux.arm64.2xlarge docker-image: executorch-ubuntu-22.04-clang12 # TODO: Need to figure out why buck2 doesnt work on Graviton instances. - - runner: linux.arm64.2xlarge + - runner: linux.arm64.2xlarge build-tool: buck2 fail-fast: false with: @@ -420,7 +420,6 @@ jobs: permissions: id-token: write contents: read - needs: test-llama-runner-linux unittest: uses: ./.github/workflows/_unittest.yml diff --git a/build/run_android_emulator.sh b/build/run_android_emulator.sh index cd625988ec4..fe73ec8a1d7 100755 --- a/build/run_android_emulator.sh +++ b/build/run_android_emulator.sh @@ -28,9 +28,7 @@ adb push model.pte /data/local/tmp/llama adb push tokenizer.bin /data/local/tmp/llama adb shell am instrument -w -r com.example.executorchllamademo.test/androidx.test.runner.AndroidJUnitRunner -adb uninstall org.pytorch.executorch || true adb uninstall org.pytorch.executorch.test || true -adb install -t android-test-debug.apk adb install -t android-test-debug-androidTest.apk adb shell am instrument -w -r org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner diff --git a/extension/android/executorch_android/build.gradle b/extension/android/executorch_android/build.gradle index 4994ba41697..16c3d97c87e 100644 --- a/extension/android/executorch_android/build.gradle +++ b/extension/android/executorch_android/build.gradle @@ -16,20 +16,30 @@ android { compileSdk = 34 defaultConfig { - minSdk = 19 + minSdk = 23 - testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + + sourceSets { + androidTest { + resources.srcDirs += [ 'src/androidTest/resources' ] + } + } } dependencies { implementation 'com.facebook.fbjni:fbjni-java-only:0.5.1' implementation 'com.facebook.soloader:nativeloader:0.10.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'commons-io:commons-io:2.4' } import com.vanniktech.maven.publish.SonatypeHost diff --git a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java new file mode 100644 index 00000000000..ddce4ac3465 --- /dev/null +++ b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java @@ -0,0 +1,114 @@ +/* + * 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.List; +import java.util.ArrayList; +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 LlamaModule}. */ +@RunWith(AndroidJUnit4.class) +public class LlamaModuleInstrumentationTest implements LlamaCallback { + private static String TEST_FILE_NAME = "/tinyllama_portable_fp16_h.pte"; + private static String TOKENIZER_FILE_NAME = "/tokenizer.bin"; + private static String TEST_PROMPT = "Hello"; + private static int OK = 0x00; + private static int SEQ_LEN = 32; + + private final List results = new ArrayList<>(); + private final List tokensPerSecond = new ArrayList<>(); + private LlamaModule mModule; + + private static String getTestFilePath(String fileName) { + return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName; + } + + @Before + public void setUp() throws IOException { + // copy zipped test resources to local device + File addPteFile = new File(getTestFilePath(TEST_FILE_NAME)); + InputStream inputStream = getClass().getResourceAsStream(TEST_FILE_NAME); + FileUtils.copyInputStreamToFile(inputStream, addPteFile); + inputStream.close(); + + File tokenizerFile = new File(getTestFilePath(TOKENIZER_FILE_NAME)); + inputStream = getClass().getResourceAsStream(TOKENIZER_FILE_NAME); + FileUtils.copyInputStreamToFile(inputStream, tokenizerFile); + inputStream.close(); + + mModule = new LlamaModule(getTestFilePath(TEST_FILE_NAME), getTestFilePath(TOKENIZER_FILE_NAME), 0.0f); + } + + @Rule + public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE); + + @Test + public void testGenerate() throws IOException, URISyntaxException{ + int loadResult = mModule.load(); + // Check that the model can be load successfully + assertEquals(OK, loadResult); + + mModule.generate(TEST_PROMPT, SEQ_LEN, LlamaModuleInstrumentationTest.this); + assertEquals(results.size(), SEQ_LEN); + assertTrue(tokensPerSecond.get(tokensPerSecond.size() - 1) > 0); + } + + @Test + public void testGenerateAndStop() throws IOException, URISyntaxException{ + int seqLen = 32; + mModule.generate(TEST_PROMPT, SEQ_LEN, new LlamaCallback() { + @Override + public void onResult(String result) { + LlamaModuleInstrumentationTest.this.onResult(result); + mModule.stop(); + } + + @Override + public void onStats(float tps) { + LlamaModuleInstrumentationTest.this.onStats(tps); + } + }); + + int stoppedResultSize = results.size(); + assertTrue(stoppedResultSize < SEQ_LEN); + } + + @Override + public void onResult(String result) { + results.add(result); + } + + @Override + public void onStats(float tps) { + tokensPerSecond.add(tps); + } +} diff --git a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java new file mode 100644 index 00000000000..a25c0bf6343 --- /dev/null +++ b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java @@ -0,0 +1,127 @@ +/* + * 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.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 ModuleInstrumentationTest { + private static String TEST_FILE_NAME = "/add.pte"; + private static String MISSING_FILE_NAME = "/missing.pte"; + private static String NON_PTE_FILE_NAME = "/test.txt"; + private static String FORWARD_METHOD = "forward"; + private static String NONE_METHOD = "none"; + private static int OK = 0x00; + private static int INVALID_ARGUMENT = 0x12; + private static int ACCESS_FAILED = 0x22; + + private static String getTestFilePath(String fileName) { + return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName; + } + + @Before + public void setUp() throws IOException { + // copy zipped test resources to local device + File addPteFile = new File(getTestFilePath(TEST_FILE_NAME)); + InputStream inputStream = getClass().getResourceAsStream(TEST_FILE_NAME); + FileUtils.copyInputStreamToFile(inputStream, addPteFile); + inputStream.close(); + + File nonPteFile = new File(getTestFilePath(NON_PTE_FILE_NAME)); + inputStream = getClass().getResourceAsStream(NON_PTE_FILE_NAME); + FileUtils.copyInputStreamToFile(inputStream, nonPteFile); + inputStream.close(); + } + + @Rule + public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE); + + @Test + public void testModuleLoadAndForward() throws IOException, URISyntaxException{ + Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); + + EValue[] results = module.forward(); + assertTrue(results[0].isTensor()); + } + + @Test + public void testModuleLoadMethodAndForward() throws IOException{ + Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); + + int loadMethod = module.loadMethod(FORWARD_METHOD); + assertEquals(loadMethod, OK); + + EValue[] results = module.forward(); + assertTrue(results[0].isTensor()); + } + + @Test + public void testModuleLoadForwardExplicit() throws IOException{ + Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); + + EValue[] results = module.execute(FORWARD_METHOD); + assertTrue(results[0].isTensor()); + } + + @Test + public void testModuleLoadNonExistantFile() throws IOException{ + Module module = Module.load(getTestFilePath(MISSING_FILE_NAME)); + + EValue[] results = module.forward(); + assertEquals(null, results); + } + + @Test + public void testModuleLoadMethodNonExistantFile() throws IOException{ + Module module = Module.load(getTestFilePath(MISSING_FILE_NAME)); + + int loadMethod = module.loadMethod(FORWARD_METHOD); + assertEquals(loadMethod, ACCESS_FAILED); + } + + @Test + public void testModuleLoadMethodNonExistantMethod() throws IOException{ + Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); + + int loadMethod = module.loadMethod(NONE_METHOD); + assertEquals(loadMethod, INVALID_ARGUMENT); + } + + @Test + public void testNonPteFile() throws IOException{ + Module module = Module.load(getTestFilePath(NON_PTE_FILE_NAME)); + + int loadMethod = module.loadMethod(FORWARD_METHOD); + assertEquals(loadMethod, INVALID_ARGUMENT); + } +} diff --git a/extension/android/executorch_android/src/main/AndroidManifest.xml b/extension/android/executorch_android/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..cb2a2dcdc53 --- /dev/null +++ b/extension/android/executorch_android/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/extension/android/executorch_android/src/test/java/org/pytorch/executorch/EValueTest.java b/extension/android/executorch_android/src/test/java/org/pytorch/executorch/EValueTest.java new file mode 100644 index 00000000000..cbeb3a7b634 --- /dev/null +++ b/extension/android/executorch_android/src/test/java/org/pytorch/executorch/EValueTest.java @@ -0,0 +1,230 @@ +/* + * 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.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.Arrays; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link EValue}. */ +@RunWith(JUnit4.class) +public class EValueTest { + @Test + public void testNone() { + EValue evalue = EValue.optionalNone(); + assertTrue(evalue.isNone()); + } + + @Test + public void testTensorValue() { + long[] data = {1, 2, 3}; + long[] shape = {1, 3}; + EValue evalue = EValue.from(Tensor.fromBlob(data, shape)); + assertTrue(evalue.isTensor()); + assertTrue(Arrays.equals(evalue.toTensor().shape, shape)); + assertTrue(Arrays.equals(evalue.toTensor().getDataAsLongArray(), data)); + } + + @Test + public void testBoolValue() { + EValue evalue = EValue.from(true); + assertTrue(evalue.isBool()); + assertTrue(evalue.toBool()); + } + + @Test + public void testIntValue() { + EValue evalue = EValue.from(1); + assertTrue(evalue.isInt()); + assertEquals(evalue.toInt(), 1); + } + + @Test + public void testDoubleValue() { + EValue evalue = EValue.from(0.1d); + assertTrue(evalue.isDouble()); + assertEquals(evalue.toDouble(), 0.1d, 0.0001d); + } + + @Test + public void testStringValue() { + EValue evalue = EValue.from("a"); + assertTrue(evalue.isString()); + assertEquals(evalue.toStr(), "a"); + } + + @Test + public void testAllIllegalCast() { + EValue evalue = EValue.optionalNone(); + assertTrue(evalue.isNone()); + + // try Tensor + assertFalse(evalue.isTensor()); + try { + evalue.toTensor(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + } + + // try bool + assertFalse(evalue.isBool()); + try { + evalue.toBool(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + } + + // try int + assertFalse(evalue.isInt()); + try { + evalue.toInt(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + } + + // try double + assertFalse(evalue.isDouble()); + try { + evalue.toDouble(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + } + + // try string + assertFalse(evalue.isString()); + try { + evalue.toStr(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + } + } + + @Test + public void testNoneSerde() { + EValue evalue = EValue.optionalNone(); + byte[] bytes = evalue.toByteArray(); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isNone(), true); + } + + @Test + public void testBoolSerde() { + EValue evalue = EValue.from(true); + byte[] bytes = evalue.toByteArray(); + assertEquals(1, bytes[1]); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isBool(), true); + assertEquals(deser.toBool(), true); + } + + @Test + public void testBoolSerde2() { + EValue evalue = EValue.from(false); + byte[] bytes = evalue.toByteArray(); + assertEquals(0, bytes[1]); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isBool(), true); + assertEquals(deser.toBool(), false); + } + + @Test + public void testIntSerde() { + EValue evalue = EValue.from(1); + byte[] bytes = evalue.toByteArray(); + assertEquals(0, bytes[1]); + assertEquals(0, bytes[2]); + assertEquals(0, bytes[3]); + assertEquals(0, bytes[4]); + assertEquals(0, bytes[5]); + assertEquals(0, bytes[6]); + assertEquals(0, bytes[7]); + assertEquals(1, bytes[8]); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isInt(), true); + assertEquals(deser.toInt(), 1); + } + + @Test + public void testLargeIntSerde() { + EValue evalue = EValue.from(256000); + byte[] bytes = evalue.toByteArray(); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isInt(), true); + assertEquals(deser.toInt(), 256000); + } + + @Test + public void testDoubleSerde() { + EValue evalue = EValue.from(1.345e-2d); + byte[] bytes = evalue.toByteArray(); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isDouble(), true); + assertEquals(1.345e-2d, deser.toDouble(), 1e-6); + } + + @Test + public void testLongTensorSerde() { + long data[] = {1, 2, 3, 4}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + + EValue evalue = EValue.from(tensor); + byte[] bytes = evalue.toByteArray(); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isTensor(), true); + Tensor deserTensor = deser.toTensor(); + long[] deserShape = deserTensor.shape(); + long[] deserData = deserTensor.getDataAsLongArray(); + + for (int i = 0; i < data.length; i++) { + assertEquals(data[i], deserData[i]); + } + + for (int i = 0; i < shape.length; i++) { + assertEquals(shape[i], deserShape[i]); + } + } + + @Test + public void testFloatTensorSerde() { + float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + + EValue evalue = EValue.from(tensor); + byte[] bytes = evalue.toByteArray(); + + EValue deser = EValue.fromByteArray(bytes); + assertEquals(deser.isTensor(), true); + Tensor deserTensor = deser.toTensor(); + long[] deserShape = deserTensor.shape(); + float[] deserData = deserTensor.getDataAsFloatArray(); + + for (int i = 0; i < data.length; i++) { + assertEquals(data[i], deserData[i], 1e-5); + } + + for (int i = 0; i < shape.length; i++) { + assertEquals(shape[i], deserShape[i]); + } + } +} diff --git a/extension/android/executorch_android/src/test/java/org/pytorch/executorch/TensorTest.java b/extension/android/executorch_android/src/test/java/org/pytorch/executorch/TensorTest.java new file mode 100644 index 00000000000..9811a1d0ff6 --- /dev/null +++ b/extension/android/executorch_android/src/test/java/org/pytorch/executorch/TensorTest.java @@ -0,0 +1,305 @@ +/* + * 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.fail; + +import java.nio.ByteBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.LongBuffer; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link Tensor}. */ +@RunWith(JUnit4.class) +public class TensorTest { + + @Test + public void testFloatTensor() { + float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.FLOAT); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsFloatArray()[0], 1e-5); + assertEquals(data[1], tensor.getDataAsFloatArray()[1], 1e-5); + assertEquals(data[2], tensor.getDataAsFloatArray()[2], 1e-5); + assertEquals(data[3], tensor.getDataAsFloatArray()[3], 1e-5); + + FloatBuffer floatBuffer = Tensor.allocateFloatBuffer(4); + floatBuffer.put(data); + tensor = Tensor.fromBlob(floatBuffer, shape); + assertEquals(tensor.dtype(), DType.FLOAT); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsFloatArray()[0], 1e-5); + assertEquals(data[1], tensor.getDataAsFloatArray()[1], 1e-5); + assertEquals(data[2], tensor.getDataAsFloatArray()[2], 1e-5); + assertEquals(data[3], tensor.getDataAsFloatArray()[3], 1e-5); + } + + @Test + public void testIntTensor() { + int data[] = {Integer.MIN_VALUE, 0, 1, Integer.MAX_VALUE}; + long shape[] = {1, 4, 1}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.INT32); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsIntArray()[0]); + assertEquals(data[1], tensor.getDataAsIntArray()[1]); + assertEquals(data[2], tensor.getDataAsIntArray()[2]); + assertEquals(data[3], tensor.getDataAsIntArray()[3]); + + IntBuffer intBuffer = Tensor.allocateIntBuffer(4); + intBuffer.put(data); + tensor = Tensor.fromBlob(intBuffer, shape); + assertEquals(tensor.dtype(), DType.INT32); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsIntArray()[0]); + assertEquals(data[1], tensor.getDataAsIntArray()[1]); + assertEquals(data[2], tensor.getDataAsIntArray()[2]); + assertEquals(data[3], tensor.getDataAsIntArray()[3]); + } + + @Test + public void testDoubleTensor() { + double data[] = {Double.MIN_VALUE, 0.0d, 0.1d, Double.MAX_VALUE}; + long shape[] = {1, 4}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.DOUBLE); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsDoubleArray()[0], 1e-5); + assertEquals(data[1], tensor.getDataAsDoubleArray()[1], 1e-5); + assertEquals(data[2], tensor.getDataAsDoubleArray()[2], 1e-5); + assertEquals(data[3], tensor.getDataAsDoubleArray()[3], 1e-5); + + DoubleBuffer doubleBuffer = Tensor.allocateDoubleBuffer(4); + doubleBuffer.put(data); + tensor = Tensor.fromBlob(doubleBuffer, shape); + assertEquals(tensor.dtype(), DType.DOUBLE); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsDoubleArray()[0], 1e-5); + assertEquals(data[1], tensor.getDataAsDoubleArray()[1], 1e-5); + assertEquals(data[2], tensor.getDataAsDoubleArray()[2], 1e-5); + assertEquals(data[3], tensor.getDataAsDoubleArray()[3], 1e-5); + } + + @Test + public void testLongTensor() { + long data[] = {Long.MIN_VALUE, 0L, 1L, Long.MAX_VALUE}; + long shape[] = {4, 1}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.INT64); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsLongArray()[0]); + assertEquals(data[1], tensor.getDataAsLongArray()[1]); + assertEquals(data[2], tensor.getDataAsLongArray()[2]); + assertEquals(data[3], tensor.getDataAsLongArray()[3]); + + LongBuffer longBuffer = Tensor.allocateLongBuffer(4); + longBuffer.put(data); + tensor = Tensor.fromBlob(longBuffer, shape); + assertEquals(tensor.dtype(), DType.INT64); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsLongArray()[0]); + assertEquals(data[1], tensor.getDataAsLongArray()[1]); + assertEquals(data[2], tensor.getDataAsLongArray()[2]); + assertEquals(data[3], tensor.getDataAsLongArray()[3]); + } + + @Test + public void testSignedByteTensor() { + byte data[] = {Byte.MIN_VALUE, (byte) 0, (byte) 1, Byte.MAX_VALUE}; + long shape[] = {1, 1, 4}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.INT8); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsByteArray()[0]); + assertEquals(data[1], tensor.getDataAsByteArray()[1]); + assertEquals(data[2], tensor.getDataAsByteArray()[2]); + assertEquals(data[3], tensor.getDataAsByteArray()[3]); + + ByteBuffer byteBuffer = Tensor.allocateByteBuffer(4); + byteBuffer.put(data); + tensor = Tensor.fromBlob(byteBuffer, shape); + assertEquals(tensor.dtype(), DType.INT8); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsByteArray()[0]); + assertEquals(data[1], tensor.getDataAsByteArray()[1]); + assertEquals(data[2], tensor.getDataAsByteArray()[2]); + assertEquals(data[3], tensor.getDataAsByteArray()[3]); + } + + @Test + public void testUnsignedByteTensor() { + byte data[] = {(byte) 0, (byte) 1, (byte) 2, (byte) 255}; + long shape[] = {4, 1, 1}; + Tensor tensor = Tensor.fromBlobUnsigned(data, shape); + assertEquals(tensor.dtype(), DType.UINT8); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsUnsignedByteArray()[0]); + assertEquals(data[1], tensor.getDataAsUnsignedByteArray()[1]); + assertEquals(data[2], tensor.getDataAsUnsignedByteArray()[2]); + assertEquals(data[3], tensor.getDataAsUnsignedByteArray()[3]); + + ByteBuffer byteBuffer = Tensor.allocateByteBuffer(4); + byteBuffer.put(data); + tensor = Tensor.fromBlobUnsigned(byteBuffer, shape); + assertEquals(tensor.dtype(), DType.UINT8); + assertEquals(shape[0], tensor.shape()[0]); + assertEquals(shape[1], tensor.shape()[1]); + assertEquals(shape[2], tensor.shape()[2]); + assertEquals(4, tensor.numel()); + assertEquals(data[0], tensor.getDataAsUnsignedByteArray()[0]); + assertEquals(data[1], tensor.getDataAsUnsignedByteArray()[1]); + assertEquals(data[2], tensor.getDataAsUnsignedByteArray()[2]); + assertEquals(data[3], tensor.getDataAsUnsignedByteArray()[3]); + } + + @Test + public void testIllegalDataTypeException() { + float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + assertEquals(tensor.dtype(), DType.FLOAT); + + try { + tensor.getDataAsByteArray(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + // expected + } + try { + tensor.getDataAsUnsignedByteArray(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + // expected + } + try { + tensor.getDataAsIntArray(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + // expected + } + try { + tensor.getDataAsDoubleArray(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + // expected + } + try { + tensor.getDataAsLongArray(); + fail("Should have thrown an exception"); + } catch (IllegalStateException e) { + // expected + } + } + + @Test + public void testIllegalArguments() { + float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; + long shapeWithNegativeValues[] = {-1, 2}; + long mismatchShape[] = {1, 2}; + + try { + Tensor tensor = Tensor.fromBlob((float[]) null, mismatchShape); + fail("Should have thrown an exception"); + } catch (IllegalArgumentException e) { + // expected + } + try { + Tensor tensor = Tensor.fromBlob(data, null); + fail("Should have thrown an exception"); + } catch (IllegalArgumentException e) { + // expected + } + try { + Tensor tensor = Tensor.fromBlob(data, shapeWithNegativeValues); + fail("Should have thrown an exception"); + } catch (IllegalArgumentException e) { + // expected + } + try { + Tensor tensor = Tensor.fromBlob(data, mismatchShape); + fail("Should have thrown an exception"); + } catch (IllegalArgumentException e) { + // expected + } + } + + @Test + public void testLongTensorSerde() { + long data[] = {1, 2, 3, 4}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + byte[] bytes = tensor.toByteArray(); + + Tensor deser = Tensor.fromByteArray(bytes); + long[] deserShape = deser.shape(); + long[] deserData = deser.getDataAsLongArray(); + + for (int i = 0; i < data.length; i++) { + assertEquals(data[i], deserData[i]); + } + + for (int i = 0; i < shape.length; i++) { + assertEquals(shape[i], deserShape[i]); + } + } + + @Test + public void testFloatTensorSerde() { + float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; + long shape[] = {2, 2}; + Tensor tensor = Tensor.fromBlob(data, shape); + byte[] bytes = tensor.toByteArray(); + + Tensor deser = Tensor.fromByteArray(bytes); + long[] deserShape = deser.shape(); + float[] deserData = deser.getDataAsFloatArray(); + + for (int i = 0; i < data.length; i++) { + assertEquals(data[i], deserData[i], 1e-5); + } + + for (int i = 0; i < shape.length; i++) { + assertEquals(shape[i], deserShape[i]); + } + } +} diff --git a/extension/android/gradle.properties b/extension/android/gradle.properties new file mode 100644 index 00000000000..ccaba61416d --- /dev/null +++ b/extension/android/gradle.properties @@ -0,0 +1,2 @@ +android.useAndroidX=true + From 68f52856d2208a82cacf9fc551a1f55a1d5f058f Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 15:47:38 -0700 Subject: [PATCH 11/19] Fix --- build/run_android_emulator.sh | 2 +- extension/android/executorch_android/gradle.properties | 1 + .../executorch_android/src/androidTest/resources/test.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 extension/android/executorch_android/gradle.properties create mode 100644 extension/android/executorch_android/src/androidTest/resources/test.txt diff --git a/build/run_android_emulator.sh b/build/run_android_emulator.sh index fe73ec8a1d7..f48c4b995b8 100755 --- a/build/run_android_emulator.sh +++ b/build/run_android_emulator.sh @@ -31,4 +31,4 @@ adb shell am instrument -w -r com.example.executorchllamademo.test/androidx.test adb uninstall org.pytorch.executorch.test || true adb install -t android-test-debug-androidTest.apk -adb shell am instrument -w -r org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner +# adb shell am instrument -w -r org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner diff --git a/extension/android/executorch_android/gradle.properties b/extension/android/executorch_android/gradle.properties new file mode 100644 index 00000000000..5bac8ac5046 --- /dev/null +++ b/extension/android/executorch_android/gradle.properties @@ -0,0 +1 @@ +android.useAndroidX=true diff --git a/extension/android/executorch_android/src/androidTest/resources/test.txt b/extension/android/executorch_android/src/androidTest/resources/test.txt new file mode 100644 index 00000000000..039461e6a9d --- /dev/null +++ b/extension/android/executorch_android/src/androidTest/resources/test.txt @@ -0,0 +1 @@ +non pte file From 15d8bed5bb5306a9656ac38b5d2e2a0787effe33 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 15:48:51 -0700 Subject: [PATCH 12/19] lint --- extension/android/gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/extension/android/gradle.properties b/extension/android/gradle.properties index ccaba61416d..5bac8ac5046 100644 --- a/extension/android/gradle.properties +++ b/extension/android/gradle.properties @@ -1,2 +1 @@ android.useAndroidX=true - From 6df61feb40890eda672a4d098acd9fcf4a49c940 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 16:27:18 -0700 Subject: [PATCH 13/19] other fix --- build/build_android_library.sh | 2 +- extension/android/executorch_android/gradle.properties | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 extension/android/executorch_android/gradle.properties diff --git a/build/build_android_library.sh b/build/build_android_library.sh index 8ad87a98e17..36d66dd4e21 100755 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -13,7 +13,7 @@ fi which "${PYTHON_EXECUTABLE}" copy_src() { - cp -r extension/android/build.gradle extension/android/settings.gradle extension/android/gradlew extension/android/gradle extension/android/gradlew.bat "${BUILD_AAR_DIR}" + cp -r extension/android/build.gradle extension/android/settings.gradle extension/android/gradlew extension/android/gradle extension/android/gradlew.bat extension/android/gradle.properties "${BUILD_AAR_DIR}" cp -r extension/android/executorch_android "${BUILD_AAR_DIR}/executorch_android" } diff --git a/extension/android/executorch_android/gradle.properties b/extension/android/executorch_android/gradle.properties deleted file mode 100644 index 5bac8ac5046..00000000000 --- a/extension/android/executorch_android/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -android.useAndroidX=true From 9877981a52cb63e9b57bebab187b57546cc05e12 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 16:53:06 -0700 Subject: [PATCH 14/19] fix path --- .ci/scripts/build_android_instrumentation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/build_android_instrumentation.sh b/.ci/scripts/build_android_instrumentation.sh index 40df2a7521b..93b0591a261 100644 --- a/.ci/scripts/build_android_instrumentation.sh +++ b/.ci/scripts/build_android_instrumentation.sh @@ -26,7 +26,7 @@ collect_artifacts_to_be_uploaded() { # Collect Java library test JAVA_LIBRARY_TEST_DIR="${ARTIFACTS_DIR_NAME}/library_test_dir" mkdir -p "${JAVA_LIBRARY_TEST_DIR}" - cp executorch_android/build/outputs/apk/androidTest/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}" + cp extension/android/executorch_android/build/outputs/apk/androidTest/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}" } main() { From 6d5277c96c75d71bc27d973a9f5030c773d0dba4 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 17:22:19 -0700 Subject: [PATCH 15/19] fix export --- .github/workflows/_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index e6168c8fe22..aa8c09fecee 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -35,7 +35,7 @@ jobs: bash .ci/scripts/build_android_instrumentation.sh ${ARTIFACTS_DIR_NAME} mkdir -p ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom - bash ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom + PYTHON_EXECUTABLE=python bash ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom mkdir -p examples/demo-apps/android/LlamaDemo/app/libs cp aar-out/executorch.aar examples/demo-apps/android/LlamaDemo/app/libs From 553eab59b332ec2d6bcf71a72158a583688a906b Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 17:50:38 -0700 Subject: [PATCH 16/19] test --- .github/workflows/_android.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index aa8c09fecee..4ffb7ee9950 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -28,15 +28,16 @@ jobs: PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool buck2 export ARTIFACTS_DIR_NAME=artifacts-to-be-uploaded + mkdir -p ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom + bash examples/models/llama/install_requirements.sh + bash ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom + # Build LLM Demo for Android export BUILD_AAR_DIR=aar-out mkdir -p $BUILD_AAR_DIR bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME} bash .ci/scripts/build_android_instrumentation.sh ${ARTIFACTS_DIR_NAME} - mkdir -p ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom - PYTHON_EXECUTABLE=python bash ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom - mkdir -p examples/demo-apps/android/LlamaDemo/app/libs cp aar-out/executorch.aar examples/demo-apps/android/LlamaDemo/app/libs pushd examples/demo-apps/android/LlamaDemo From a289169f256f95b7092732578934a6b87e1aef59 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 20 Mar 2025 18:38:59 -0700 Subject: [PATCH 17/19] Disable instrumentation test for now --- build/run_android_emulator.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/run_android_emulator.sh b/build/run_android_emulator.sh index f48c4b995b8..363ded31b5e 100755 --- a/build/run_android_emulator.sh +++ b/build/run_android_emulator.sh @@ -28,7 +28,7 @@ adb push model.pte /data/local/tmp/llama adb push tokenizer.bin /data/local/tmp/llama adb shell am instrument -w -r com.example.executorchllamademo.test/androidx.test.runner.AndroidJUnitRunner -adb uninstall org.pytorch.executorch.test || true -adb install -t android-test-debug-androidTest.apk +# adb uninstall org.pytorch.executorch.test || true +# adb install -t android-test-debug-androidTest.apk # adb shell am instrument -w -r org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner From d59f312f59f06c854e5b01c562a37184a9a8e6c0 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 21 Mar 2025 13:47:12 -0700 Subject: [PATCH 18/19] Update --- ...st.java => LlmModuleInstrumentationTest.java} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/{LlamaModuleInstrumentationTest.java => LlmModuleInstrumentationTest.java} (86%) diff --git a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java similarity index 86% rename from extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java rename to extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java index ddce4ac3465..e181398fecd 100644 --- a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlamaModuleInstrumentationTest.java +++ b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java @@ -35,9 +35,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.InstrumentationRegistry; -/** Unit tests for {@link LlamaModule}. */ +/** Unit tests for {@link LlmModule}. */ @RunWith(AndroidJUnit4.class) -public class LlamaModuleInstrumentationTest implements LlamaCallback { +public class LlmModuleInstrumentationTest implements LlmCallback { private static String TEST_FILE_NAME = "/tinyllama_portable_fp16_h.pte"; private static String TOKENIZER_FILE_NAME = "/tokenizer.bin"; private static String TEST_PROMPT = "Hello"; @@ -46,7 +46,7 @@ public class LlamaModuleInstrumentationTest implements LlamaCallback { private final List results = new ArrayList<>(); private final List tokensPerSecond = new ArrayList<>(); - private LlamaModule mModule; + private LlmModule mModule; private static String getTestFilePath(String fileName) { return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName; @@ -65,7 +65,7 @@ public void setUp() throws IOException { FileUtils.copyInputStreamToFile(inputStream, tokenizerFile); inputStream.close(); - mModule = new LlamaModule(getTestFilePath(TEST_FILE_NAME), getTestFilePath(TOKENIZER_FILE_NAME), 0.0f); + mModule = new LlmModule(getTestFilePath(TEST_FILE_NAME), getTestFilePath(TOKENIZER_FILE_NAME), 0.0f); } @Rule @@ -77,7 +77,7 @@ public void testGenerate() throws IOException, URISyntaxException{ // Check that the model can be load successfully assertEquals(OK, loadResult); - mModule.generate(TEST_PROMPT, SEQ_LEN, LlamaModuleInstrumentationTest.this); + mModule.generate(TEST_PROMPT, SEQ_LEN, LlmModuleInstrumentationTest.this); assertEquals(results.size(), SEQ_LEN); assertTrue(tokensPerSecond.get(tokensPerSecond.size() - 1) > 0); } @@ -85,16 +85,16 @@ public void testGenerate() throws IOException, URISyntaxException{ @Test public void testGenerateAndStop() throws IOException, URISyntaxException{ int seqLen = 32; - mModule.generate(TEST_PROMPT, SEQ_LEN, new LlamaCallback() { + mModule.generate(TEST_PROMPT, SEQ_LEN, new LlmCallback() { @Override public void onResult(String result) { - LlamaModuleInstrumentationTest.this.onResult(result); + LlmModuleInstrumentationTest.this.onResult(result); mModule.stop(); } @Override public void onStats(float tps) { - LlamaModuleInstrumentationTest.this.onStats(tps); + LlmModuleInstrumentationTest.this.onStats(tps); } }); From 66d3a410123fe9b2f82067a5e42ebd0fd78a63f1 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 21 Mar 2025 16:45:47 -0700 Subject: [PATCH 19/19] Fix --- .../LlmModuleInstrumentationTest.java | 4 +- extension/android_test/.gitignore | 6 - extension/android_test/TARGETS | 1 - extension/android_test/add_model.py | 26 -- extension/android_test/build.gradle | 56 ---- extension/android_test/gradle.properties | 23 -- .../android_test/gradle/libs.versions.toml | 12 - .../gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - extension/android_test/gradlew | 249 -------------- extension/android_test/gradlew.bat | 92 ------ extension/android_test/settings.gradle | 24 -- extension/android_test/setup.sh | 64 ---- .../LlmModuleInstrumentationTest.java | 119 ------- .../executorch/ModuleInstrumentationTest.java | 130 -------- .../src/androidTest/resources/test.txt | 1 - .../android_test/src/main/AndroidManifest.xml | 12 - .../org/pytorch/executorch/EValueTest.java | 230 ------------- .../org/pytorch/executorch/TensorTest.java | 305 ------------------ 19 files changed, 3 insertions(+), 1358 deletions(-) delete mode 100644 extension/android_test/.gitignore delete mode 100644 extension/android_test/TARGETS delete mode 100644 extension/android_test/add_model.py delete mode 100644 extension/android_test/build.gradle delete mode 100644 extension/android_test/gradle.properties delete mode 100644 extension/android_test/gradle/libs.versions.toml delete mode 100644 extension/android_test/gradle/wrapper/gradle-wrapper.jar delete mode 100644 extension/android_test/gradle/wrapper/gradle-wrapper.properties delete mode 100755 extension/android_test/gradlew delete mode 100644 extension/android_test/gradlew.bat delete mode 100644 extension/android_test/settings.gradle delete mode 100755 extension/android_test/setup.sh delete mode 100644 extension/android_test/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java delete mode 100644 extension/android_test/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java delete mode 100644 extension/android_test/src/androidTest/resources/test.txt delete mode 100644 extension/android_test/src/main/AndroidManifest.xml delete mode 100644 extension/android_test/src/test/java/org/pytorch/executorch/EValueTest.java delete mode 100644 extension/android_test/src/test/java/org/pytorch/executorch/TensorTest.java diff --git a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java index e181398fecd..b3b515d7ed0 100644 --- a/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java +++ b/extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java @@ -34,8 +34,10 @@ import org.apache.commons.io.FileUtils; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.InstrumentationRegistry; +import org.pytorch.executorch.extension.llm.LlmCallback; +import org.pytorch.executorch.extension.llm.LlmModule; -/** Unit tests for {@link LlmModule}. */ +/** Unit tests for {@link org.pytorch.executorch.extension.llm.LlmModule}. */ @RunWith(AndroidJUnit4.class) public class LlmModuleInstrumentationTest implements LlmCallback { private static String TEST_FILE_NAME = "/tinyllama_portable_fp16_h.pte"; diff --git a/extension/android_test/.gitignore b/extension/android_test/.gitignore deleted file mode 100644 index a43b7e827a8..00000000000 --- a/extension/android_test/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -local.properties -.gradle -.idea/* -.externalNativeBuild -src/libs/* -build diff --git a/extension/android_test/TARGETS b/extension/android_test/TARGETS deleted file mode 100644 index 5c4f482b5ea..00000000000 --- a/extension/android_test/TARGETS +++ /dev/null @@ -1 +0,0 @@ -# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd diff --git a/extension/android_test/add_model.py b/extension/android_test/add_model.py deleted file mode 100644 index b7ac3955ee3..00000000000 --- a/extension/android_test/add_model.py +++ /dev/null @@ -1,26 +0,0 @@ -import torch -from executorch.exir import to_edge -from torch.export import export - - -# Start with a PyTorch model that adds two input tensors (matrices) -class Add(torch.nn.Module): - def __init__(self): - super(Add, self).__init__() - - def forward(self, x: torch.Tensor, y: torch.Tensor): - return x + y - - -# 1. torch.export: Defines the program with the ATen operator set. -aten_dialect = export(Add(), (torch.ones(1), torch.ones(1)), strict=True) - -# 2. to_edge: Make optimizations for Edge devices -edge_program = to_edge(aten_dialect) - -# 3. to_executorch: Convert the graph to an ExecuTorch program -executorch_program = edge_program.to_executorch() - -# 4. Save the compiled .pte program -with open("add.pte", "wb") as file: - file.write(executorch_program.buffer) diff --git a/extension/android_test/build.gradle b/extension/android_test/build.gradle deleted file mode 100644 index d2310d8b5fb..00000000000 --- a/extension/android_test/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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. - */ -plugins { - id("com.android.application") version "8.1.0" apply false -} - -group 'org.pytorch.executorch' - -apply plugin: "com.android.application" - -android { - namespace 'org.pytorch.executorch' - compileSdk = 34 - - defaultConfig { - minSdk = 28 - targetSdk = 33 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - sourceSets { - androidTest { - resources.srcDirs += [ 'src/androidTest/resources' ] - } - } -} - -dependencies { - implementation 'com.facebook.soloader:nativeloader:0.10.5' - implementation("com.facebook.fbjni:fbjni:0.5.1") - implementation(files("src/libs/executorch.aar")) - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'commons-io:commons-io:2.4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation 'com.google.gms:google-services:4.3.3' -} - -task('setupNativeLibs', type: Exec){ - commandLine("bash", "setup.sh") -} - -gradle.projectsEvaluated { - preBuild.dependsOn setupNativeLibs -} diff --git a/extension/android_test/gradle.properties b/extension/android_test/gradle.properties deleted file mode 100644 index 2cbd6d19d33..00000000000 --- a/extension/android_test/gradle.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/extension/android_test/gradle/libs.versions.toml b/extension/android_test/gradle/libs.versions.toml deleted file mode 100644 index 561988cb1f6..00000000000 --- a/extension/android_test/gradle/libs.versions.toml +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format - -[versions] -commons-math3 = "3.6.1" -guava = "32.1.3-jre" -junit = "4.13.2" - -[libraries] -commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } -guava = { module = "com.google.guava:guava", version.ref = "guava" } -junit = { module = "junit:junit", version.ref = "junit" } diff --git a/extension/android_test/gradle/wrapper/gradle-wrapper.jar b/extension/android_test/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd4917707c1f8861d8cb53dd15194d4248596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43462 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 diff --git a/extension/android_test/gradle/wrapper/gradle-wrapper.properties b/extension/android_test/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a80b22ce5cf..00000000000 --- a/extension/android_test/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/extension/android_test/gradlew b/extension/android_test/gradlew deleted file mode 100755 index 1aa94a42690..00000000000 --- a/extension/android_test/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/extension/android_test/gradlew.bat b/extension/android_test/gradlew.bat deleted file mode 100644 index 25da30dbdee..00000000000 --- a/extension/android_test/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/extension/android_test/settings.gradle b/extension/android_test/settings.gradle deleted file mode 100644 index 6b1bd4f7f85..00000000000 --- a/extension/android_test/settings.gradle +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation. - */ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} - -rootProject.name = 'executorch' -include('src') diff --git a/extension/android_test/setup.sh b/extension/android_test/setup.sh deleted file mode 100755 index d2c169a5033..00000000000 --- a/extension/android_test/setup.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# 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. - -set -eu - -BUILD_AAR_DIR="$(mktemp -d)" -export BUILD_AAR_DIR - -BASEDIR=$(dirname "$0") -source "$BASEDIR"/../../build/build_android_library.sh - -build_native_library() { - ANDROID_ABI="$1" - CMAKE_OUT="cmake-out-android-${ANDROID_ABI}" - ANDROID_NDK="${ANDROID_NDK:-/opt/ndk}" - EXECUTORCH_CMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE:-Release}" - cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \ - -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \ - -DANDROID_ABI="${ANDROID_ABI}" \ - -DBUILD_TESTING=OFF \ - -DEXECUTORCH_BUILD_XNNPACK=ON \ - -DEXECUTORCH_XNNPACK_SHARED_WORKSPACE=ON \ - -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \ - -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \ - -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \ - -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \ - -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \ - -DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \ - -B"${CMAKE_OUT}" - - cmake --build "${CMAKE_OUT}" -j16 --target install - - cmake extension/android \ - -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}"/build/cmake/android.toolchain.cmake \ - -DANDROID_ABI="${ANDROID_ABI}" \ - -DBUILD_TESTING=OFF \ - -DCMAKE_INSTALL_PREFIX=c"${CMAKE_OUT}" \ - -DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \ - -DEXECUTORCH_BUILD_LLAMA_JNI=ON \ - -B"${CMAKE_OUT}"/extension/android - - cmake --build "${CMAKE_OUT}"/extension/android -j16 - - # Copy artifacts to ABI specific directory - mkdir -p "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}" - cp "${CMAKE_OUT}"/extension/android/*.so "${BUILD_AAR_DIR}/jni/${ANDROID_ABI}/" -} - -pushd "$BASEDIR"/../../ -build_native_library "arm64-v8a" -build_native_library "x86_64" -build_aar -bash examples/models/llama/install_requirements.sh -source ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${BUILD_AAR_DIR} -popd -mkdir -p "$BASEDIR"/src/libs -cp "$BUILD_AAR_DIR/executorch.aar" "$BASEDIR"/src/libs/executorch.aar -python add_model.py -mv "add.pte" "$BASEDIR"/src/androidTest/resources/add.pte -unzip -o "$BUILD_AAR_DIR"/model.zip -d "$BASEDIR"/src/androidTest/resources diff --git a/extension/android_test/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java b/extension/android_test/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java deleted file mode 100644 index 5acdba21521..00000000000 --- a/extension/android_test/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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 com.example.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.List; -import java.util.ArrayList; -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; -import org.pytorch.executorch.extension.llm.LlmModule; -import org.pytorch.executorch.extension.llm.LlmCallback; -import org.pytorch.executorch.Module; -import org.pytorch.executorch.EValue; -import org.pytorch.executorch.Tensor; - -/** Unit tests for {@link LlmModule}. */ -@RunWith(AndroidJUnit4.class) -public class LlmModuleInstrumentationTest implements LlmCallback { - private static String TEST_FILE_NAME = "/tinyllama_portable_fp16_h.pte"; - private static String TOKENIZER_FILE_NAME = "/tokenizer.bin"; - private static String TEST_PROMPT = "Hello"; - private static int OK = 0x00; - private static int SEQ_LEN = 32; - - private final List results = new ArrayList<>(); - private final List tokensPerSecond = new ArrayList<>(); - private LlmModule mModule; - - private static String getTestFilePath(String fileName) { - return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName; - } - - @Before - public void setUp() throws IOException { - // copy zipped test resources to local device - File addPteFile = new File(getTestFilePath(TEST_FILE_NAME)); - InputStream inputStream = getClass().getResourceAsStream(TEST_FILE_NAME); - FileUtils.copyInputStreamToFile(inputStream, addPteFile); - inputStream.close(); - - File tokenizerFile = new File(getTestFilePath(TOKENIZER_FILE_NAME)); - inputStream = getClass().getResourceAsStream(TOKENIZER_FILE_NAME); - FileUtils.copyInputStreamToFile(inputStream, tokenizerFile); - inputStream.close(); - - mModule = new LlmModule(getTestFilePath(TEST_FILE_NAME), getTestFilePath(TOKENIZER_FILE_NAME), 0.0f); - } - - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE); - - @Test - public void testGenerate() throws IOException, URISyntaxException{ - int loadResult = mModule.load(); - // Check that the model can be load successfully - assertEquals(OK, loadResult); - - mModule.generate(TEST_PROMPT, SEQ_LEN, LlmModuleInstrumentationTest.this); - assertEquals(results.size(), SEQ_LEN); - assertTrue(tokensPerSecond.get(tokensPerSecond.size() - 1) > 0); - } - - @Test - public void testGenerateAndStop() throws IOException, URISyntaxException{ - int seqLen = 32; - mModule.generate(TEST_PROMPT, SEQ_LEN, new LlmCallback() { - @Override - public void onResult(String result) { - LlmModuleInstrumentationTest.this.onResult(result); - mModule.stop(); - } - - @Override - public void onStats(float tps) { - LlmModuleInstrumentationTest.this.onStats(tps); - } - }); - - int stoppedResultSize = results.size(); - assertTrue(stoppedResultSize < SEQ_LEN); - } - - @Override - public void onResult(String result) { - results.add(result); - } - - @Override - public void onStats(float tps) { - tokensPerSecond.add(tps); - } -} diff --git a/extension/android_test/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java b/extension/android_test/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java deleted file mode 100644 index e8259969ab1..00000000000 --- a/extension/android_test/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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 com.example.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.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; -import org.pytorch.executorch.Module; -import org.pytorch.executorch.EValue; -import org.pytorch.executorch.Tensor; - -/** Unit tests for {@link Module}. */ -@RunWith(AndroidJUnit4.class) -public class ModuleInstrumentationTest { - private static String TEST_FILE_NAME = "/add.pte"; - private static String MISSING_FILE_NAME = "/missing.pte"; - private static String NON_PTE_FILE_NAME = "/test.txt"; - private static String FORWARD_METHOD = "forward"; - private static String NONE_METHOD = "none"; - private static int OK = 0x00; - private static int INVALID_ARGUMENT = 0x12; - private static int ACCESS_FAILED = 0x22; - - private static String getTestFilePath(String fileName) { - return InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalCacheDir() + fileName; - } - - @Before - public void setUp() throws IOException { - // copy zipped test resources to local device - File addPteFile = new File(getTestFilePath(TEST_FILE_NAME)); - InputStream inputStream = getClass().getResourceAsStream(TEST_FILE_NAME); - FileUtils.copyInputStreamToFile(inputStream, addPteFile); - inputStream.close(); - - File nonPteFile = new File(getTestFilePath(NON_PTE_FILE_NAME)); - inputStream = getClass().getResourceAsStream(NON_PTE_FILE_NAME); - FileUtils.copyInputStreamToFile(inputStream, nonPteFile); - inputStream.close(); - } - - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE); - - @Test - public void testModuleLoadAndForward() throws IOException, URISyntaxException{ - Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); - - EValue[] results = module.forward(); - assertTrue(results[0].isTensor()); - } - - @Test - public void testModuleLoadMethodAndForward() throws IOException{ - Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); - - int loadMethod = module.loadMethod(FORWARD_METHOD); - assertEquals(loadMethod, OK); - - EValue[] results = module.forward(); - assertTrue(results[0].isTensor()); - } - - @Test - public void testModuleLoadForwardExplicit() throws IOException{ - Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); - - EValue[] results = module.execute(FORWARD_METHOD); - assertTrue(results[0].isTensor()); - } - - @Test - public void testModuleLoadNonExistantFile() throws IOException{ - Module module = Module.load(getTestFilePath(MISSING_FILE_NAME)); - - EValue[] results = module.forward(); - assertEquals(null, results); - } - - @Test - public void testModuleLoadMethodNonExistantFile() throws IOException{ - Module module = Module.load(getTestFilePath(MISSING_FILE_NAME)); - - int loadMethod = module.loadMethod(FORWARD_METHOD); - assertEquals(loadMethod, ACCESS_FAILED); - } - - @Test - public void testModuleLoadMethodNonExistantMethod() throws IOException{ - Module module = Module.load(getTestFilePath(TEST_FILE_NAME)); - - int loadMethod = module.loadMethod(NONE_METHOD); - assertEquals(loadMethod, INVALID_ARGUMENT); - } - - @Test - public void testNonPteFile() throws IOException{ - Module module = Module.load(getTestFilePath(NON_PTE_FILE_NAME)); - - int loadMethod = module.loadMethod(FORWARD_METHOD); - assertEquals(loadMethod, INVALID_ARGUMENT); - } -} diff --git a/extension/android_test/src/androidTest/resources/test.txt b/extension/android_test/src/androidTest/resources/test.txt deleted file mode 100644 index 039461e6a9d..00000000000 --- a/extension/android_test/src/androidTest/resources/test.txt +++ /dev/null @@ -1 +0,0 @@ -non pte file diff --git a/extension/android_test/src/main/AndroidManifest.xml b/extension/android_test/src/main/AndroidManifest.xml deleted file mode 100644 index b8ac862938e..00000000000 --- a/extension/android_test/src/main/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/extension/android_test/src/test/java/org/pytorch/executorch/EValueTest.java b/extension/android_test/src/test/java/org/pytorch/executorch/EValueTest.java deleted file mode 100644 index cbeb3a7b634..00000000000 --- a/extension/android_test/src/test/java/org/pytorch/executorch/EValueTest.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * 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.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link EValue}. */ -@RunWith(JUnit4.class) -public class EValueTest { - @Test - public void testNone() { - EValue evalue = EValue.optionalNone(); - assertTrue(evalue.isNone()); - } - - @Test - public void testTensorValue() { - long[] data = {1, 2, 3}; - long[] shape = {1, 3}; - EValue evalue = EValue.from(Tensor.fromBlob(data, shape)); - assertTrue(evalue.isTensor()); - assertTrue(Arrays.equals(evalue.toTensor().shape, shape)); - assertTrue(Arrays.equals(evalue.toTensor().getDataAsLongArray(), data)); - } - - @Test - public void testBoolValue() { - EValue evalue = EValue.from(true); - assertTrue(evalue.isBool()); - assertTrue(evalue.toBool()); - } - - @Test - public void testIntValue() { - EValue evalue = EValue.from(1); - assertTrue(evalue.isInt()); - assertEquals(evalue.toInt(), 1); - } - - @Test - public void testDoubleValue() { - EValue evalue = EValue.from(0.1d); - assertTrue(evalue.isDouble()); - assertEquals(evalue.toDouble(), 0.1d, 0.0001d); - } - - @Test - public void testStringValue() { - EValue evalue = EValue.from("a"); - assertTrue(evalue.isString()); - assertEquals(evalue.toStr(), "a"); - } - - @Test - public void testAllIllegalCast() { - EValue evalue = EValue.optionalNone(); - assertTrue(evalue.isNone()); - - // try Tensor - assertFalse(evalue.isTensor()); - try { - evalue.toTensor(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - } - - // try bool - assertFalse(evalue.isBool()); - try { - evalue.toBool(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - } - - // try int - assertFalse(evalue.isInt()); - try { - evalue.toInt(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - } - - // try double - assertFalse(evalue.isDouble()); - try { - evalue.toDouble(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - } - - // try string - assertFalse(evalue.isString()); - try { - evalue.toStr(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - } - } - - @Test - public void testNoneSerde() { - EValue evalue = EValue.optionalNone(); - byte[] bytes = evalue.toByteArray(); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isNone(), true); - } - - @Test - public void testBoolSerde() { - EValue evalue = EValue.from(true); - byte[] bytes = evalue.toByteArray(); - assertEquals(1, bytes[1]); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isBool(), true); - assertEquals(deser.toBool(), true); - } - - @Test - public void testBoolSerde2() { - EValue evalue = EValue.from(false); - byte[] bytes = evalue.toByteArray(); - assertEquals(0, bytes[1]); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isBool(), true); - assertEquals(deser.toBool(), false); - } - - @Test - public void testIntSerde() { - EValue evalue = EValue.from(1); - byte[] bytes = evalue.toByteArray(); - assertEquals(0, bytes[1]); - assertEquals(0, bytes[2]); - assertEquals(0, bytes[3]); - assertEquals(0, bytes[4]); - assertEquals(0, bytes[5]); - assertEquals(0, bytes[6]); - assertEquals(0, bytes[7]); - assertEquals(1, bytes[8]); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isInt(), true); - assertEquals(deser.toInt(), 1); - } - - @Test - public void testLargeIntSerde() { - EValue evalue = EValue.from(256000); - byte[] bytes = evalue.toByteArray(); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isInt(), true); - assertEquals(deser.toInt(), 256000); - } - - @Test - public void testDoubleSerde() { - EValue evalue = EValue.from(1.345e-2d); - byte[] bytes = evalue.toByteArray(); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isDouble(), true); - assertEquals(1.345e-2d, deser.toDouble(), 1e-6); - } - - @Test - public void testLongTensorSerde() { - long data[] = {1, 2, 3, 4}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - - EValue evalue = EValue.from(tensor); - byte[] bytes = evalue.toByteArray(); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isTensor(), true); - Tensor deserTensor = deser.toTensor(); - long[] deserShape = deserTensor.shape(); - long[] deserData = deserTensor.getDataAsLongArray(); - - for (int i = 0; i < data.length; i++) { - assertEquals(data[i], deserData[i]); - } - - for (int i = 0; i < shape.length; i++) { - assertEquals(shape[i], deserShape[i]); - } - } - - @Test - public void testFloatTensorSerde() { - float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - - EValue evalue = EValue.from(tensor); - byte[] bytes = evalue.toByteArray(); - - EValue deser = EValue.fromByteArray(bytes); - assertEquals(deser.isTensor(), true); - Tensor deserTensor = deser.toTensor(); - long[] deserShape = deserTensor.shape(); - float[] deserData = deserTensor.getDataAsFloatArray(); - - for (int i = 0; i < data.length; i++) { - assertEquals(data[i], deserData[i], 1e-5); - } - - for (int i = 0; i < shape.length; i++) { - assertEquals(shape[i], deserShape[i]); - } - } -} diff --git a/extension/android_test/src/test/java/org/pytorch/executorch/TensorTest.java b/extension/android_test/src/test/java/org/pytorch/executorch/TensorTest.java deleted file mode 100644 index 9811a1d0ff6..00000000000 --- a/extension/android_test/src/test/java/org/pytorch/executorch/TensorTest.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * 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.fail; - -import java.nio.ByteBuffer; -import java.nio.DoubleBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.LongBuffer; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link Tensor}. */ -@RunWith(JUnit4.class) -public class TensorTest { - - @Test - public void testFloatTensor() { - float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.FLOAT); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsFloatArray()[0], 1e-5); - assertEquals(data[1], tensor.getDataAsFloatArray()[1], 1e-5); - assertEquals(data[2], tensor.getDataAsFloatArray()[2], 1e-5); - assertEquals(data[3], tensor.getDataAsFloatArray()[3], 1e-5); - - FloatBuffer floatBuffer = Tensor.allocateFloatBuffer(4); - floatBuffer.put(data); - tensor = Tensor.fromBlob(floatBuffer, shape); - assertEquals(tensor.dtype(), DType.FLOAT); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsFloatArray()[0], 1e-5); - assertEquals(data[1], tensor.getDataAsFloatArray()[1], 1e-5); - assertEquals(data[2], tensor.getDataAsFloatArray()[2], 1e-5); - assertEquals(data[3], tensor.getDataAsFloatArray()[3], 1e-5); - } - - @Test - public void testIntTensor() { - int data[] = {Integer.MIN_VALUE, 0, 1, Integer.MAX_VALUE}; - long shape[] = {1, 4, 1}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.INT32); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsIntArray()[0]); - assertEquals(data[1], tensor.getDataAsIntArray()[1]); - assertEquals(data[2], tensor.getDataAsIntArray()[2]); - assertEquals(data[3], tensor.getDataAsIntArray()[3]); - - IntBuffer intBuffer = Tensor.allocateIntBuffer(4); - intBuffer.put(data); - tensor = Tensor.fromBlob(intBuffer, shape); - assertEquals(tensor.dtype(), DType.INT32); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsIntArray()[0]); - assertEquals(data[1], tensor.getDataAsIntArray()[1]); - assertEquals(data[2], tensor.getDataAsIntArray()[2]); - assertEquals(data[3], tensor.getDataAsIntArray()[3]); - } - - @Test - public void testDoubleTensor() { - double data[] = {Double.MIN_VALUE, 0.0d, 0.1d, Double.MAX_VALUE}; - long shape[] = {1, 4}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.DOUBLE); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsDoubleArray()[0], 1e-5); - assertEquals(data[1], tensor.getDataAsDoubleArray()[1], 1e-5); - assertEquals(data[2], tensor.getDataAsDoubleArray()[2], 1e-5); - assertEquals(data[3], tensor.getDataAsDoubleArray()[3], 1e-5); - - DoubleBuffer doubleBuffer = Tensor.allocateDoubleBuffer(4); - doubleBuffer.put(data); - tensor = Tensor.fromBlob(doubleBuffer, shape); - assertEquals(tensor.dtype(), DType.DOUBLE); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsDoubleArray()[0], 1e-5); - assertEquals(data[1], tensor.getDataAsDoubleArray()[1], 1e-5); - assertEquals(data[2], tensor.getDataAsDoubleArray()[2], 1e-5); - assertEquals(data[3], tensor.getDataAsDoubleArray()[3], 1e-5); - } - - @Test - public void testLongTensor() { - long data[] = {Long.MIN_VALUE, 0L, 1L, Long.MAX_VALUE}; - long shape[] = {4, 1}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.INT64); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsLongArray()[0]); - assertEquals(data[1], tensor.getDataAsLongArray()[1]); - assertEquals(data[2], tensor.getDataAsLongArray()[2]); - assertEquals(data[3], tensor.getDataAsLongArray()[3]); - - LongBuffer longBuffer = Tensor.allocateLongBuffer(4); - longBuffer.put(data); - tensor = Tensor.fromBlob(longBuffer, shape); - assertEquals(tensor.dtype(), DType.INT64); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsLongArray()[0]); - assertEquals(data[1], tensor.getDataAsLongArray()[1]); - assertEquals(data[2], tensor.getDataAsLongArray()[2]); - assertEquals(data[3], tensor.getDataAsLongArray()[3]); - } - - @Test - public void testSignedByteTensor() { - byte data[] = {Byte.MIN_VALUE, (byte) 0, (byte) 1, Byte.MAX_VALUE}; - long shape[] = {1, 1, 4}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.INT8); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsByteArray()[0]); - assertEquals(data[1], tensor.getDataAsByteArray()[1]); - assertEquals(data[2], tensor.getDataAsByteArray()[2]); - assertEquals(data[3], tensor.getDataAsByteArray()[3]); - - ByteBuffer byteBuffer = Tensor.allocateByteBuffer(4); - byteBuffer.put(data); - tensor = Tensor.fromBlob(byteBuffer, shape); - assertEquals(tensor.dtype(), DType.INT8); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsByteArray()[0]); - assertEquals(data[1], tensor.getDataAsByteArray()[1]); - assertEquals(data[2], tensor.getDataAsByteArray()[2]); - assertEquals(data[3], tensor.getDataAsByteArray()[3]); - } - - @Test - public void testUnsignedByteTensor() { - byte data[] = {(byte) 0, (byte) 1, (byte) 2, (byte) 255}; - long shape[] = {4, 1, 1}; - Tensor tensor = Tensor.fromBlobUnsigned(data, shape); - assertEquals(tensor.dtype(), DType.UINT8); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsUnsignedByteArray()[0]); - assertEquals(data[1], tensor.getDataAsUnsignedByteArray()[1]); - assertEquals(data[2], tensor.getDataAsUnsignedByteArray()[2]); - assertEquals(data[3], tensor.getDataAsUnsignedByteArray()[3]); - - ByteBuffer byteBuffer = Tensor.allocateByteBuffer(4); - byteBuffer.put(data); - tensor = Tensor.fromBlobUnsigned(byteBuffer, shape); - assertEquals(tensor.dtype(), DType.UINT8); - assertEquals(shape[0], tensor.shape()[0]); - assertEquals(shape[1], tensor.shape()[1]); - assertEquals(shape[2], tensor.shape()[2]); - assertEquals(4, tensor.numel()); - assertEquals(data[0], tensor.getDataAsUnsignedByteArray()[0]); - assertEquals(data[1], tensor.getDataAsUnsignedByteArray()[1]); - assertEquals(data[2], tensor.getDataAsUnsignedByteArray()[2]); - assertEquals(data[3], tensor.getDataAsUnsignedByteArray()[3]); - } - - @Test - public void testIllegalDataTypeException() { - float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - assertEquals(tensor.dtype(), DType.FLOAT); - - try { - tensor.getDataAsByteArray(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - // expected - } - try { - tensor.getDataAsUnsignedByteArray(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - // expected - } - try { - tensor.getDataAsIntArray(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - // expected - } - try { - tensor.getDataAsDoubleArray(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - // expected - } - try { - tensor.getDataAsLongArray(); - fail("Should have thrown an exception"); - } catch (IllegalStateException e) { - // expected - } - } - - @Test - public void testIllegalArguments() { - float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; - long shapeWithNegativeValues[] = {-1, 2}; - long mismatchShape[] = {1, 2}; - - try { - Tensor tensor = Tensor.fromBlob((float[]) null, mismatchShape); - fail("Should have thrown an exception"); - } catch (IllegalArgumentException e) { - // expected - } - try { - Tensor tensor = Tensor.fromBlob(data, null); - fail("Should have thrown an exception"); - } catch (IllegalArgumentException e) { - // expected - } - try { - Tensor tensor = Tensor.fromBlob(data, shapeWithNegativeValues); - fail("Should have thrown an exception"); - } catch (IllegalArgumentException e) { - // expected - } - try { - Tensor tensor = Tensor.fromBlob(data, mismatchShape); - fail("Should have thrown an exception"); - } catch (IllegalArgumentException e) { - // expected - } - } - - @Test - public void testLongTensorSerde() { - long data[] = {1, 2, 3, 4}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - byte[] bytes = tensor.toByteArray(); - - Tensor deser = Tensor.fromByteArray(bytes); - long[] deserShape = deser.shape(); - long[] deserData = deser.getDataAsLongArray(); - - for (int i = 0; i < data.length; i++) { - assertEquals(data[i], deserData[i]); - } - - for (int i = 0; i < shape.length; i++) { - assertEquals(shape[i], deserShape[i]); - } - } - - @Test - public void testFloatTensorSerde() { - float data[] = {Float.MIN_VALUE, 0f, 0.1f, Float.MAX_VALUE}; - long shape[] = {2, 2}; - Tensor tensor = Tensor.fromBlob(data, shape); - byte[] bytes = tensor.toByteArray(); - - Tensor deser = Tensor.fromByteArray(bytes); - long[] deserShape = deser.shape(); - float[] deserData = deser.getDataAsFloatArray(); - - for (int i = 0; i < data.length; i++) { - assertEquals(data[i], deserData[i], 1e-5); - } - - for (int i = 0; i < shape.length; i++) { - assertEquals(shape[i], deserShape[i]); - } - } -}