ndkVersion warning, disable tf_mobile and mace

gordinmitya · Nov 27, 2022 · 27a5348 · 27a5348
1 parent 7c91b48
commit 27a5348
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 30 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,7 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         applicationId "ru.gordinmitya.dnnbenchmark"
@@ -94,19 +95,19 @@ dependencies {
     implementation 'com.google.firebase:firebase-common-ktx'
     implementation 'com.google.firebase:firebase-firestore-ktx'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
-    testImplementation 'io.mockk:mockk:1.9.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'io.mockk:mockk:1.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 
     implementation project(path: ':common')
     implementation project(path: ':mnn')
-    implementation project(path: ':tf_mobile')
     implementation project(path: ':tflite')
     implementation project(path: ':ncnn')
     implementation project(path: ':pytorch')
     implementation project(path: ':opencv')
-    implementation project(path: ':mace')
-//    implementation project(path: ':snpe')
     implementation project(path: ':onnxruntime')
+//    implementation project(path: ':mace')
+//    implementation project(path: ':tf_mobile')
+//    implementation project(path: ':snpe')
 }
diff --git a/app/src/main/java/ru/gordinmitya/dnnbenchmark/App.kt b/app/src/main/java/ru/gordinmitya/dnnbenchmark/App.kt
@@ -7,7 +7,16 @@ import ru.gordinmitya.common.segmentation.DeepLabModel
 import kotlin.reflect.KClass
 
 class App : Application() {
-    lateinit var frameworks: List<String>
+    val frameworks = listOf(
+        "ru.gordinmitya.mnn.MNNFramework",
+        "ru.gordinmitya.ncnn.NCNNFramework",
+        "ru.gordinmitya.tflite.TFLiteFramework",
+        "ru.gordinmitya.onnxruntime.ONNXFramework",
+        "ru.gordinmitya.pytorch.PytorchFramework",
+        "ru.gordinmitya.opencv.OpenCVFramework",
+//        "ru.gordinmitya.mace.MACEFramework",
+//        "ru.gordinmitya.tf_mobile.TFMobileFramework",
+    )
     val models = listOf(
         MobileNetModel,
 //        DeepLabModel
@@ -20,27 +29,6 @@ class App : Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
-//        val frameworkClassess = listOf(
-//            NCNNFramework::class,
-//            MNNFramework::class,
-//            TFLiteFramework::class,
-//            PytorchFramework::class,
-//            OpenCVFramework::class,
-//            ONNXFramework::class,
-//            MACEFramework()::class,
-//            TFMobileFramework()::class,
-//        )
-//        frameworks = frameworkClassess.map { it.simpleName!! to it.qualifiedName!! }
-        frameworks = arrayListOf(
-            "ru.gordinmitya.mnn.MNNFramework",
-            "ru.gordinmitya.ncnn.NCNNFramework",
-            "ru.gordinmitya.tflite.TFLiteFramework",
-            "ru.gordinmitya.onnxruntime.ONNXFramework",
-            "ru.gordinmitya.pytorch.PytorchFramework",
-            "ru.gordinmitya.opencv.OpenCVFramework",
-//            "ru.gordinmitya.mace.MACEFramework",
-//            "ru.gordinmitya.tf_mobile.TFMobileFramework"
-        )
     }
 
     @Suppress("SimplifyBooleanWithConstants")
@@ -55,4 +43,4 @@ class App : Application() {
             return kclass.qualifiedName!!
         }
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -36,4 +36,5 @@ ext {
     compileSdkVersion = 33
     minSdkVersion = 21
     targetSdkVersion = 31
+    ndkVersion = "25.0.8775105"
 }
diff --git a/mnn/build.gradle b/mnn/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/ncnn/build.gradle b/ncnn/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/onnxruntime/build.gradle b/onnxruntime/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/settings.gradle b/settings.gradle
@@ -1,12 +1,12 @@
 include ':app',
         ':common',
         ':mnn',
-        ':tf_mobile',
         ':tflite',
         ':ncnn',
         ':pytorch',
         ':opencv',
-        ':mace',
         ':onnxruntime'
+//        ':tf_mobile',
+//        ':mace',
 //        ':snpe'
 rootProject.name='DnnBenchmark'