Skip to content

Fix x86_64 emulator stuck issue and enable tests #10218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 55 commits into from
Apr 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
57c5547
Use stories15m
kirklandsign Apr 15, 2025
2bdf065
Test
kirklandsign Apr 15, 2025
7341a30
Test
kirklandsign Apr 16, 2025
e98b4c1
just mv2
kirklandsign Apr 16, 2025
ce75d8f
E2
kirklandsign Apr 16, 2025
ee75b55
cat result
kirklandsign Apr 16, 2025
3f02650
test 2
kirklandsign Apr 16, 2025
c2f6b06
memory
kirklandsign Apr 16, 2025
139651b
memory
kirklandsign Apr 16, 2025
5474dc5
memory
kirklandsign Apr 16, 2025
098b672
memory
kirklandsign Apr 16, 2025
ce9e085
memory
kirklandsign Apr 16, 2025
50a583e
artifact
kirklandsign Apr 16, 2025
b242e3a
artifact
kirklandsign Apr 16, 2025
f0be939
ram
kirklandsign Apr 16, 2025
461716c
ram
kirklandsign Apr 16, 2025
a6c9fef
ram
kirklandsign Apr 16, 2025
2b7796a
ram
kirklandsign Apr 16, 2025
6e71091
no xnnpack
kirklandsign Apr 16, 2025
ba329ad
Merge branch 'android-e2e' into fix-android-instrumentation
kirklandsign Apr 16, 2025
04c43fc
Merge remote-tracking branch 'origin/main' into fix-android-instrumen…
kirklandsign Apr 16, 2025
601d079
Merge remote-tracking branch 'origin/main' into fix-android-instrumen…
kirklandsign Apr 16, 2025
972af53
ram
kirklandsign Apr 16, 2025
a46fbc2
logcat
kirklandsign Apr 16, 2025
b3650ea
new zip
kirklandsign Apr 16, 2025
3a156c8
regression
kirklandsign Apr 16, 2025
34bedb0
regression
kirklandsign Apr 16, 2025
1111255
regresion
kirklandsign Apr 16, 2025
6039263
regresion
kirklandsign Apr 16, 2025
d835793
regresion
kirklandsign Apr 16, 2025
719a984
regresion
kirklandsign Apr 16, 2025
28a4bcb
regresion fixed
kirklandsign Apr 16, 2025
491368e
update
kirklandsign Apr 16, 2025
2211893
40 second data
kirklandsign Apr 16, 2025
22cd82e
40 second data non llm
kirklandsign Apr 16, 2025
82429a0
just load
kirklandsign Apr 16, 2025
bee3ab1
just load
kirklandsign Apr 16, 2025
9576714
and generate
kirklandsign Apr 17, 2025
28da20c
and test
kirklandsign Apr 17, 2025
1d84bf7
and llm test
kirklandsign Apr 17, 2025
18cbb67
and just load
kirklandsign Apr 17, 2025
7e27145
and just load
kirklandsign Apr 17, 2025
c2de8d7
and just load
kirklandsign Apr 17, 2025
c8d2202
Merge remote-tracking branch 'origin/main' into fix-android-instrumen…
kirklandsign Apr 17, 2025
f995bfe
load only
kirklandsign Apr 17, 2025
7904488
trigger ci?
kirklandsign Apr 17, 2025
6ae1fba
trigger
kirklandsign Apr 17, 2025
066a813
load forward
kirklandsign Apr 17, 2025
b16bb30
fp32
kirklandsign Apr 17, 2025
1d4e864
fp32
kirklandsign Apr 17, 2025
87dbb98
again
kirklandsign Apr 17, 2025
88d6397
Now it should fix
kirklandsign Apr 17, 2025
5bda99f
Now it should fix
kirklandsign Apr 17, 2025
7361896
Now it should fix
kirklandsign Apr 17, 2025
f553bcd
Enable test
kirklandsign Apr 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/android/jni/jni_layer_llama.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass<ExecuTorchLlmJni> {
facebook::jni::alias_ref<jstring> data_path = nullptr) {
#if defined(ET_USE_THREADPOOL)
// Reserve 1 thread for the main thread.
uint32_t num_performant_cores =
int32_t num_performant_cores =
::executorch::extension::cpuinfo::get_num_performant_cores() - 1;
if (num_performant_cores > 0) {
ET_LOG(Info, "Resetting threadpool to %d threads", num_performant_cores);
Expand Down
3 changes: 1 addition & 2 deletions scripts/run_android_emulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ adb uninstall org.pytorch.executorch.test || true
adb install -t android-test-debug-androidTest.apk

adb logcat -c
adb shell am instrument -w -r -e \
class org.pytorch.executorch.ModuleInstrumentationTest,org.pytorch.executorch.ModuleE2ETest \
adb shell am instrument -w -r \
org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner >result.txt 2>&1
adb logcat -d > logcat.txt
cat logcat.txt
Expand Down
Loading