fixing dependencies

trinath3 · May 14, 2021 · 4008e3c · 4008e3c
1 parent a3e9ae4
commit 4008e3c
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 21 deletions.
diff --git a/audio_classification/codelab1/android/final/.gitignore b/audio_classification/codelab1/android/final/.gitignore
@@ -0,0 +1,16 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+.idea
diff --git a/audio_classification/codelab1/android/final/app/build.gradle b/audio_classification/codelab1/android/final/app/build.gradle
@@ -41,11 +41,7 @@ repositories {
 
 dependencies {
 
-//    compile(name:'tflite-support', ext:'aar')
-    compile(name:'task-library-audio', ext:'aar')
-    compile(name:'libbase-task-api', ext:'jar')
-    compile(name:'libtensorflowlite_support_java', ext:'jar')
-    implementation "org.tensorflow:tensorflow-lite:2.4.0"
+    implementation 'org.tensorflow:tensorflow-lite-task-audio:0.2.0-rc2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'

diff --git a/audio_classification/codelab1/android/starter/.gitignore b/audio_classification/codelab1/android/starter/.gitignore
@@ -0,0 +1,16 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+.idea
diff --git a/audio_classification/codelab1/android/starter/app/build.gradle b/audio_classification/codelab1/android/starter/app/build.gradle
@@ -41,11 +41,7 @@ repositories {
 
 dependencies {
 
-//    compile(name:'tflite-support', ext:'aar')
-    compile(name:'task-library-audio', ext:'aar')
-    compile(name:'libbase-task-api', ext:'jar')
-    compile(name:'libtensorflowlite_support_java', ext:'jar')
-    implementation "org.tensorflow:tensorflow-lite:2.4.0"
+    implementation 'org.tensorflow:tensorflow-lite-task-audio:0.2.0-rc2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'

diff --git a/audio_classification/codelab2/android/final/.gitignore b/audio_classification/codelab2/android/final/.gitignore
@@ -0,0 +1,16 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+.idea
diff --git a/.../final/.idea/libraries/Gradle__org_tensorflow_tensorflow_lite_task_base_0_2_0_rc2_aar.xml b/.../final/.idea/libraries/Gradle__org_tensorflow_tensorflow_lite_task_base_0_2_0_rc2_aar.xml
diff --git a/audio_classification/codelab2/android/final/app/build.gradle b/audio_classification/codelab2/android/final/app/build.gradle
@@ -41,11 +41,7 @@ repositories {
 
 dependencies {
 
-//    compile(name:'tflite-support', ext:'aar')
-    compile(name:'task-library-audio', ext:'aar')
-    compile(name:'libbase-task-api', ext:'jar')
-    compile(name:'libtensorflowlite_support_java', ext:'jar')
-    implementation "org.tensorflow:tensorflow-lite:2.4.0"
+    implementation 'org.tensorflow:tensorflow-lite-task-audio:0.2.0-rc2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'

diff --git a/audio_classification/codelab2/android/starter/.gitignore b/audio_classification/codelab2/android/starter/.gitignore
@@ -0,0 +1,16 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+.idea
diff --git a/audio_classification/codelab2/android/starter/app/build.gradle b/audio_classification/codelab2/android/starter/app/build.gradle
@@ -41,11 +41,7 @@ repositories {
 
 dependencies {
 
-//    compile(name:'tflite-support', ext:'aar')
-    compile(name:'task-library-audio', ext:'aar')
-    compile(name:'libbase-task-api', ext:'jar')
-    compile(name:'libtensorflowlite_support_java', ext:'jar')
-    implementation "org.tensorflow:tensorflow-lite:2.4.0"
+    implementation 'org.tensorflow:tensorflow-lite-task-audio:0.2.0-rc2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'

diff --git a/...elab2/android/starter/app/src/main/java/com/example/mysoundclassification/MainActivity.kt b/...elab2/android/starter/app/src/main/java/com/example/mysoundclassification/MainActivity.kt
@@ -14,7 +14,7 @@ class MainActivity : AppCompatActivity() {
     var TAG = "MainActivity"
 
     // TODO 1: define your model name
-    //var modelPath = "birds_model.tflite"
+    //var modelPath = "my_birds_model.tflite"
 
     var probabilityThreshold: Float = 0.3f