rid Room

client/app/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
 }
 
 android {
@@ -14,13 +13,6 @@ android {
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                // Tell Room where to export schema so it can generate auto-migrations.
-                arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
     }
     buildTypes {
         debug { minifyEnabled false }
@@ -61,13 +53,6 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    // Room.
-    def room_version = '2.5.2'
-    implementation("androidx.room:room-runtime:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-    implementation("androidx.room:room-ktx:$room_version")
-    testImplementation("androidx.room:room-testing:$room_version")
-
     // Local dependencies.
     implementation project(path: ':FedCampus')
 

client/app/src/main/java/flwr/android_client/MainActivity.kt

@@ -5,7 +5,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import androidx.room.Room
 import flwr.android_client.databinding.ActivityMainBinding
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -26,11 +25,9 @@ class MainActivity : AppCompatActivity() {
     lateinit var flowerClient: FlowerClient<Float3DArray, FloatArray>
     private lateinit var binding: ActivityMainBinding
     val dateFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
-    lateinit var db: Db
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        db = Room.databaseBuilder(this, Db::class.java, "model-db").build()
         setContentView(R.layout.activity_main)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)

client/fedcampus/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
     id 'com.google.protobuf'
-    id 'kotlin-kapt'
 }
 
 android {
@@ -71,13 +70,6 @@ dependencies {
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'com.google.protobuf:protoc:3.23.4'
 
-    // Room.
-    def room_version = '2.5.2'
-    implementation("androidx.room:room-runtime:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-    implementation("androidx.room:room-ktx:$room_version")
-    testImplementation("androidx.room:room-testing:$room_version")
-
     // TensorFlow Lite.
     implementation 'org.tensorflow:tensorflow-lite:2.13.0'
     implementation 'org.tensorflow:tensorflow-lite-gpu:2.13.0'

client/fedcampus/src/main/java/org/eu/fedcampus/train/Train.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.util.Log
 import io.grpc.ManagedChannel
 import kotlinx.coroutines.*
-import org.eu.fedcampus.train.db.ModelDao
 import org.eu.fedcampus.train.db.TFLiteModel
 import retrofit2.http.*
 import java.io.File
@@ -15,7 +14,6 @@ class Train<X : Any, Y : Any> constructor(
     val context: Context,
     backendUrl: String,
     val sampleSpec: SampleSpec<X, Y>,
-    val modelDao: ModelDao? = null
 ) {
     var sessionId: Int? = null
     var telemetry = false
@@ -52,9 +50,11 @@ class Train<X : Any, Y : Any> constructor(
         return model
     }
 
+    @Suppress("UNUSED_PARAMETER")
     @Throws
-    suspend fun modelDownloaded(model: TFLiteModel): Boolean {
-        return modelDao?.findById(model.id)?.equals(model.toDbModel()) ?: false
+    fun modelDownloaded(model: TFLiteModel): Boolean {
+        // TODO: Save model to DB.
+        return false
     }
 
     /**
@@ -78,7 +78,6 @@ class Train<X : Any, Y : Any> constructor(
         }
         val fileDir = client.downloadFile(fileUrl, modelDir, fileName)
         Log.i(downloadModelFileTag, "$fileUrl -> ${fileDir.absolutePath}")
-        modelDao?.upsertAll(model.toDbModel())
         return fileDir
     }
 

client/fedcampus/src/main/java/org/eu/fedcampus/train/background/BaseTrainWorker.kt

@@ -19,7 +19,6 @@ import kotlinx.coroutines.withContext
 import org.eu.fedcampus.train.FlowerClient
 import org.eu.fedcampus.train.SampleSpec
 import org.eu.fedcampus.train.Train
-import org.eu.fedcampus.train.db.ModelDao
 import org.eu.fedcampus.train.helpers.loadMappedFile
 import java.util.concurrent.TimeUnit
 
@@ -35,7 +34,6 @@ open class BaseTrainWorker<X : Any, Y : Any>(
     val dataType: String,
     val loadData: suspend (Context, FlowerClient<X, Y>, Int) -> Unit,
     val trainCallback: (String) -> Unit,
-    val modelDao: ModelDao? = null,
     val useTLS: Boolean = false,
 ) : CoroutineWorker(context, params) {
     val data = inputData
@@ -55,7 +53,7 @@ open class BaseTrainWorker<X : Any, Y : Any>(
         val flowerHost = data.getString("flowerHost")!!
         val participantId = data.getInt("participantId", 1)
 
-        train = Train(context, backendUrl, sampleSpec, modelDao)
+        train = Train(context, backendUrl, sampleSpec)
         if (deviceId != 0L) train.enableTelemetry(deviceId)
         Log.i(TAG, "Starting with backend $backendUrl for $dataType.")
 

client/fedcampus/src/main/java/org/eu/fedcampus/train/db/TFLiteModel.kt

@@ -1,7 +1,6 @@
 package org.eu.fedcampus.train.db
 
 import android.content.Context
-import androidx.room.*
 import java.io.File
 
 // Always change together with Python `train.models.TFLiteModel`.
@@ -15,37 +14,4 @@ data class TFLiteModel(
     fun getModelDir(context: Context): File {
         return context.getExternalFilesDir("models/$name/")!!
     }
-
-    fun toDbModel(): Model {
-        return Model(id, name, file_path, layers_sizes.size.toLong())
-    }
-}
-
-/**
- * Simplified version of [TFLiteModel] to save in database.
- */
-@Entity
-data class Model(
-    @PrimaryKey val id: Long,
-    @ColumnInfo val name: String,
-    @ColumnInfo val file_path: String,
-    @ColumnInfo val n_layers: Long,
-)
-
-@Dao
-interface ModelDao {
-    @Query("SELECT * FROM model")
-    suspend fun getAll(): List<Model>
-
-    @Query("SELECT * FROM model WHERE id = :id")
-    suspend fun findById(id: Long): Model?
-
-    @Query("SELECT * FROM model WHERE name LIKE :name")
-    suspend fun findByName(name: String): List<Model>
-
-    @Upsert
-    suspend fun upsertAll(vararg models: Model)
-
-    @Delete
-    suspend fun deleteAll(vararg models: Model)
 }