Merge pull request google-ai-edge#23 from googlesamples/alpha4

Updated dependencies to alpha-4, updated options for image classifica…
arttupii · Dec 2, 2022 · 7501ba3 · 7501ba3
2 parents 10b15cb + f99aecc
commit 7501ba3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/examples/gesture_recognizer/android/app/build.gradle b/examples/gesture_recognizer/android/app/build.gradle
@@ -98,5 +98,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Mediapipe Library
-    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-3'
+    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-4'
 }
diff --git a/examples/hand_landmarker/android/app/build.gradle b/examples/hand_landmarker/android/app/build.gradle
@@ -95,5 +95,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // MediaPipe Library
-    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-3'
+    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-4'
 }
diff --git a/examples/image_classification/android/app/build.gradle b/examples/image_classification/android/app/build.gradle
@@ -107,5 +107,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-3'
+    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-4'
 }
diff --git a/.../src/main/java/com/google/mediapipe/examples/imageclassification/ImageClassifierHelper.kt b/.../src/main/java/com/google/mediapipe/examples/imageclassification/ImageClassifierHelper.kt
@@ -70,11 +70,6 @@ class ImageClassifierHelper(
     // the GPU delegate needs to be used on the thread that initialized the
     // classifier
     fun setupImageClassifier() {
-        val classifierOptions = ClassifierOptions.builder()
-            .setMaxResults(maxResults)
-            .setScoreThreshold(threshold)
-            .build()
-
         val baseOptionsBuilder = BaseOptions.builder()
         when (currentDelegate) {
             DELEGATE_CPU -> {
@@ -112,7 +107,8 @@ class ImageClassifierHelper(
             val baseOptions = baseOptionsBuilder.build()
             val optionsBuilder =
                 ImageClassifier.ImageClassifierOptions.builder()
-                    .setClassifierOptions(classifierOptions)
+                    .setScoreThreshold(threshold)
+                    .setMaxResults(maxResults)
                     .setRunningMode(runningMode)
                     .setBaseOptions(baseOptions)
 

diff --git a/examples/object_detection/android/app/build.gradle b/examples/object_detection/android/app/build.gradle
@@ -116,5 +116,5 @@ dependencies {
     androidTestImplementation "androidx.test:runner:1.4.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 
-    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-2'
+    implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-4'
 }