Skip to content

Commit 8ec18c8

Browse files
REBOOTERSREBOOTERS
committed
remove tensorflow lite use tensor liteRt
1 parent 70b996e commit 8ec18c8

File tree

5 files changed

+64
-45
lines changed

5 files changed

+64
-45
lines changed

‎subs/ai/build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ dependencies {
5454

5555
// AndroidDraw Library
5656
implementation 'com.github.divyanshub024:AndroidDraw:v0.1'
57-
implementation('org.tensorflow:tensorflow-lite:2.17.0') {
58-
exclude group: "com.google.inject", module: "guice"
59-
}
6057
implementation 'com.google.android.gms:play-services-tasks:18.2.0'
6158

6259

6360
implementation 'org.pytorch:pytorch_android_lite:2.1.0'
6461
implementation 'org.pytorch:pytorch_android_torchvision_lite:2.1.0'
6562
// implementation 'org.pytorch:pytorch_android:1.10.0'
6663
// implementation 'org.pytorch:pytorch_android_torchvision:1.10.0'
64+
65+
// LiteRT dependencies for Google Play services
66+
implementation 'com.google.android.gms:play-services-tflite-java:16.4.0'
67+
// Optional: include LiteRT Support Library
68+
implementation 'com.google.android.gms:play-services-tflite-support:16.4.0'
6769
}

‎subs/ai/src/main/java/com/engineer/ai/DigitalClassificationActivity.kt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ package com.engineer.ai
22

33
import android.annotation.SuppressLint
44
import android.graphics.Color
5-
import androidx.appcompat.app.AppCompatActivity
65
import android.os.Bundle
76
import android.util.Log
87
import android.view.MotionEvent
98
import android.widget.Button
109
import android.widget.TextView
10+
import androidx.activity.enableEdgeToEdge
11+
import androidx.appcompat.app.AppCompatActivity
1112
import com.divyanshu.draw.widget.DrawView
1213
import com.engineer.ai.util.DigitClassifier
13-
import org.tensorflow.lite.TensorFlowLite
14+
import com.engineer.ai.util.toast
1415

1516
class DigitalClassificationActivity : AppCompatActivity() {
1617
private var drawView: DrawView? = null
@@ -22,6 +23,7 @@ class DigitalClassificationActivity : AppCompatActivity() {
2223
@SuppressLint("ClickableViewAccessibility")
2324
override fun onCreate(savedInstanceState: Bundle?) {
2425
super.onCreate(savedInstanceState)
26+
enableEdgeToEdge()
2527
setContentView(R.layout.activity_digital_classification)
2628

2729
// Setup view instances.
@@ -52,12 +54,13 @@ class DigitalClassificationActivity : AppCompatActivity() {
5254

5355
true
5456
}
55-
Log.d(TAG,"ver ${TensorFlowLite.schemaVersion()}")
56-
Log.d(TAG,"ver ${TensorFlowLite.runtimeVersion()}")
57+
58+
5759
// Setup digit classifier.
5860
initButton?.setOnClickListener {
59-
digitClassifier.initialize()
60-
.addOnFailureListener { e -> Log.e(TAG, "Error to setting up digit classifier.", e) }
61+
digitClassifier.initialize {
62+
runOnUiThread { if (it) "init success".toast(this) else "init fail".toast(this) }
63+
}
6164
}
6265

6366
}

‎subs/ai/src/main/java/com/engineer/ai/util/AndroidAssetsFileUtil.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ package com.engineer.ai.util
22

33
import android.content.Context
44
import android.view.View
5+
import android.widget.Toast
56
import java.io.File
67
import java.io.FileOutputStream
78

9+
fun String.toast(context: Context) {
10+
Toast.makeText(context, this, Toast.LENGTH_SHORT).show()
11+
}
12+
813
object AndroidAssetsFileUtil {
914

1015

‎subs/ai/src/main/java/com/engineer/ai/util/DigitClassifier.kt‎

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@ import android.graphics.Bitmap
1919
import android.util.Log
2020
import com.google.android.gms.tasks.Task
2121
import com.google.android.gms.tasks.TaskCompletionSource
22-
import org.tensorflow.lite.Interpreter
22+
import com.google.android.gms.tflite.java.TfLite
23+
import org.tensorflow.lite.InterpreterApi
24+
import org.tensorflow.lite.TensorFlowLite
2325
import java.io.FileInputStream
2426
import java.io.IOException
2527
import java.nio.ByteBuffer
2628
import java.nio.ByteOrder
2729
import java.nio.channels.FileChannel
2830
import java.util.concurrent.ExecutorService
2931
import java.util.concurrent.Executors
32+
import androidx.core.graphics.scale
3033

3134
class DigitClassifier(private val context: Context) {
3235

33-
private var interpreter: Interpreter? = null
36+
// private var interpreter: Interpreter? = null
3437

3538
var isInitialized = false
3639
private set
@@ -42,34 +45,41 @@ class DigitClassifier(private val context: Context) {
4245
private var inputImageHeight: Int = 0 // will be inferred from TF Lite model.
4346
private var modelInputSize: Int = 0 // will be inferred from TF Lite model.
4447

45-
fun initialize(): Task<Void?> {
46-
val task = TaskCompletionSource<Void?>()
47-
executorService.execute {
48-
try {
49-
initializeInterpreter()
50-
task.setResult(null)
51-
} catch (e: IOException) {
52-
task.setException(e)
53-
}
54-
}
55-
return task.task
56-
}
48+
private val initializeTask: Task<Void> by lazy { TfLite.initialize(context) }
49+
private var interpreter: InterpreterApi? = null
5750

58-
@Throws(IOException::class)
59-
private fun initializeInterpreter() {
51+
fun initialize(cb: (Boolean) -> Unit) {
6052
val assetManager = context.assets
6153
val model = loadModelFile(assetManager, "mnist.tflite")
62-
val interpreter = Interpreter(model)
63-
// Read input shape from model file
64-
val inputShape = interpreter.getInputTensor(0).shape()
65-
inputImageWidth = inputShape[1]
66-
inputImageHeight = inputShape[2]
67-
modelInputSize = FLOAT_TYPE_SIZE * inputImageWidth * inputImageHeight * PIXEL_SIZE
68-
69-
// Finish interpreter initialization
70-
this.interpreter = interpreter
71-
isInitialized = true
72-
Log.d(TAG, "Initialized TFLite interpreter.")
54+
55+
initializeTask.addOnSuccessListener {
56+
val interpreterOption =
57+
InterpreterApi.Options().setRuntime(InterpreterApi.Options.TfLiteRuntime.FROM_SYSTEM_ONLY)
58+
interpreter = InterpreterApi.create(model, interpreterOption)
59+
60+
Log.d(TAG, "ver ${TensorFlowLite.schemaVersion(InterpreterApi.Options.TfLiteRuntime.FROM_SYSTEM_ONLY)}")
61+
Log.d(TAG, "ver ${TensorFlowLite.runtimeVersion(InterpreterApi.Options.TfLiteRuntime.FROM_SYSTEM_ONLY)}")
62+
// Read input shape from model file
63+
interpreter?.let {
64+
val inputShape = it.getInputTensor(0).shape()
65+
inputImageWidth = inputShape[1]
66+
inputImageHeight = inputShape[2]
67+
modelInputSize = FLOAT_TYPE_SIZE * inputImageWidth * inputImageHeight * PIXEL_SIZE
68+
69+
70+
isInitialized = true
71+
Log.d(TAG, "Initialized TFLite interpreter.")
72+
cb(true)
73+
} ?: run {
74+
Log.d(TAG, "Initialized TFLite fail.")
75+
}
76+
77+
}.addOnFailureListener { e ->
78+
cb(false)
79+
Log.e(TAG, "Cannot initialize interpreter", e)
80+
}
81+
82+
7383
}
7484

7585
@Throws(IOException::class)
@@ -87,9 +97,7 @@ class DigitClassifier(private val context: Context) {
8797

8898

8999
// Preprocessing: resize the input image to match the model input shape.
90-
val resizedImage = Bitmap.createScaledBitmap(
91-
bitmap, inputImageWidth, inputImageHeight, true
92-
)
100+
val resizedImage = bitmap.scale(inputImageWidth, inputImageHeight)
93101
val byteBuffer = convertBitmapToByteBuffer(resizedImage)
94102
// Define an array to store the model output.
95103
val output = Array(1) { FloatArray(OUTPUT_CLASSES_COUNT) }
@@ -99,7 +107,7 @@ class DigitClassifier(private val context: Context) {
99107
// Post-processing: find the digit that has the highest probability
100108
// and return it a human-readable string.
101109
val result = output[0]
102-
val maxIndex = result.indices.maxBy { result[it] } ?: -1
110+
val maxIndex = result.indices.maxBy { result[it] }
103111
val resultString = "Prediction Result: %d\nConfidence: %2f".format(maxIndex, result[maxIndex])
104112

105113
return resultString

‎subs/ai/src/main/res/layout/activity_digital_classification.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/draw_view"
1111
android:layout_width="match_parent"
1212
android:layout_height="0dp"
13-
app:layout_constraintDimensionRatio="1:1"
13+
app:layout_constraintDimensionRatio="1:1.2"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

1616
<TextView
@@ -29,18 +29,19 @@
2929
android:id="@+id/clear_button"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
32+
android:layout_margin="10dp"
3233
android:text="@string/clear_button_text"
3334
app:layout_constraintBottom_toBottomOf="parent"
34-
app:layout_constraintLeft_toLeftOf="parent"
35-
app:layout_constraintRight_toRightOf="parent" />
35+
app:layout_constraintRight_toRightOf="parent"
36+
app:layout_constraintStart_toStartOf="parent" />
3637

3738
<Button
3839
android:id="@+id/init_model"
3940
android:layout_width="wrap_content"
4041
android:layout_height="wrap_content"
42+
android:layout_margin="10dp"
4143
android:text="init_model"
4244
app:layout_constraintBottom_toBottomOf="parent"
43-
app:layout_constraintLeft_toLeftOf="parent"
44-
app:layout_constraintStart_toEndOf="@id/clear_button" />
45+
app:layout_constraintEnd_toEndOf="parent" />
4546

4647
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)