diff --git a/HelloWorldApp/README.md b/HelloWorldApp/README.md index ccf5745b..63b9c082 100644 --- a/HelloWorldApp/README.md +++ b/HelloWorldApp/README.md @@ -54,8 +54,8 @@ repositories { } dependencies { - implementation 'org.pytorch:pytorch_android_lite:1.9.0' - implementation 'org.pytorch:pytorch_android_torchvision:1.9.0' + implementation 'org.pytorch:pytorch_android_lite:1.13.0' + implementation 'org.pytorch:pytorch_android_torchvision:1.13.0' } ``` Where `org.pytorch:pytorch_android` is the main dependency with PyTorch Android API, including libtorch native library for all 4 android abis (armeabi-v7a, arm64-v8a, x86, x86_64). diff --git a/HelloWorldApp/app/build.gradle b/HelloWorldApp/app/build.gradle index c8df4c09..478ce71d 100644 --- a/HelloWorldApp/app/build.gradle +++ b/HelloWorldApp/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 33 buildToolsVersion "29.0.2" defaultConfig { applicationId "org.pytorch.helloworld" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 33 versionCode 1 versionName "1.0" } @@ -18,7 +18,14 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'org.pytorch:pytorch_android_lite:1.9.0' - implementation 'org.pytorch:pytorch_android_torchvision:1.9.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3' + + implementation 'org.pytorch:pytorch_android_lite:1.13.0' + implementation 'org.pytorch:pytorch_android_torchvision_lite:1.13.0' + +// Uncomment below lines for using libs built from src + // implementation(name:'pytorch_android-release', ext:'aar') + // implementation(name:'pytorch_android_torchvision-release', ext:'aar') + } diff --git a/HelloWorldApp/app/src/main/AndroidManifest.xml b/HelloWorldApp/app/src/main/AndroidManifest.xml index 0df4e194..19dac122 100644 --- a/HelloWorldApp/app/src/main/AndroidManifest.xml +++ b/HelloWorldApp/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/HelloWorldApp/app/src/main/assets/model.pt b/HelloWorldApp/app/src/main/assets/model.pt index c6ad3c9c..5e8cfb77 100644 Binary files a/HelloWorldApp/app/src/main/assets/model.pt and b/HelloWorldApp/app/src/main/assets/model.pt differ diff --git a/HelloWorldApp/build.gradle b/HelloWorldApp/build.gradle index 462b7120..c76e29a1 100644 --- a/HelloWorldApp/build.gradle +++ b/HelloWorldApp/build.gradle @@ -1,19 +1,21 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.4' } } allprojects { repositories { google() - jcenter() - + mavenCentral() + flatDir { + dirs 'libs' + } } } diff --git a/HelloWorldApp/trace_model.py b/HelloWorldApp/trace_model.py index f26d12ca..4b46c4e9 100644 --- a/HelloWorldApp/trace_model.py +++ b/HelloWorldApp/trace_model.py @@ -2,7 +2,7 @@ import torchvision from torch.utils.mobile_optimizer import optimize_for_mobile -model = torchvision.models.mobilenet_v3_small(pretrained=True) +model = torchvision.models.mobilenet_v3_small(weights=torchvision.models.MobileNet_V3_Small_Weights.DEFAULT, progress=True) model.eval() example = torch.rand(1, 3, 224, 224) traced_script_module = torch.jit.trace(model, example)