diff --git a/app/build.gradle b/app/build.gradle index 75e81cd..43a8dd9 100644 --- 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 index 8221b15..e2b423f 100644 --- 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 + 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!! } } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index d467137..19a6f7a 100644 --- 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 index f7bb074..f864a8a 100644 --- 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 index 9f42c23..e6e9e07 100644 --- 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 index f7dd7a8..34cb8d3 100644 --- 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 index dfffa68..21b9b15 100644 --- 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'