Add passing modelKindDescription to the copy functions (Kotlin#368)

Author: ermolenkodev

api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/summary/ModelSummary.kt

@@ -1,7 +1,5 @@
 package org.jetbrains.kotlinx.dl.api.summary
 
-import org.jetbrains.kotlinx.dl.api.inference.loaders.ModelType
-
 /**
  * Common interface for model summary.
  */
@@ -36,14 +34,14 @@ public class EmptySummary : ModelSummary {
 
 /**
  * The summary for the models from ModelHub.
- * It appends corresponding [ModelType] to the header of the model summary.
+ * It appends corresponding [modelKindDescription] to the header of the model summary.
  *
  * @property [modelType] type of the model, aka. model architecture. E.g. VGG16, ResNet50, etc.
  * @property [internalSummary] summary of the internal model used for inference
  */
 public class ModelHubModelSummary(
     private val internalSummary: ModelSummary,
-    private val modelKindDescription: String?
+    private val modelKindDescription: String? = null
 ) : ModelSummary {
     override fun format(
         columnSeparator: String,
@@ -61,7 +59,7 @@ public class ModelHubModelSummary(
         val separator = thickLineSeparatorSymbol.toString().repeat(tableWidth)
 
         val tableWithHeader = mutableListOf(separator, modelTypeHeader)
-        table.forEach(tableWithHeader::add)
+        tableWithHeader.addAll(table)
 
         return tableWithHeader
     }

impl/src/commonMain/kotlin/org/jetbrains/kotlinx/dl/impl/inference/imagerecognition/ImageRecognitionModelBase.kt

@@ -16,7 +16,8 @@ import org.jetbrains.kotlinx.dl.api.summary.ModelSummary
 /**
  * Base class for image classification models.
  * @property [internalModel] model used for prediction
- * @property [modelKindDescription] High-level description of the model. Used for model summary printing. For the models from [OnnxModels] it equals to the string representation of [OnnxModelType]
+ * @property [modelKindDescription] High-level description of the model. Used for model summary printing.
+ * For the models from ModelHub it equals to the string representation of [ModelType].
  */
 public abstract class ImageRecognitionModelBase<I>(
     protected val internalModel: InferenceModel,

onnx/src/androidMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/facealignment/FaceDetectionModel.kt

@@ -38,7 +38,10 @@ public class FaceDetectionModel(
             .call(ONNXModels.FaceDetection.defaultPreprocessor)
 
     override fun copy(copiedModelName: String?, saveOptimizerState: Boolean, copyWeights: Boolean): InferenceModel {
-        return FaceDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return FaceDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }
 

onnx/src/androidMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/facealignment/Fan2D106FaceAlignmentModel.kt

@@ -42,7 +42,10 @@ public class Fan2D106FaceAlignmentModel(
         .toFloatArray { layout = TensorLayout.NCHW }
 
     override fun copy(copiedModelName: String?, saveOptimizerState: Boolean, copyWeights: Boolean): InferenceModel {
-        return Fan2D106FaceAlignmentModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return Fan2D106FaceAlignmentModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }
 

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/facealignment/FaceDetectionModel.kt

@@ -39,6 +39,9 @@ public class FaceDetectionModel(
             .call(ONNXModels.FaceDetection.defaultPreprocessor)
 
     override fun copy(copiedModelName: String?, saveOptimizerState: Boolean, copyWeights: Boolean): InferenceModel {
-        return FaceDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return FaceDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/facealignment/Fan2D106FaceAlignmentModel.kt

@@ -62,7 +62,10 @@ public class Fan2D106FaceAlignmentModel(
         saveOptimizerState: Boolean,
         copyWeights: Boolean
     ): Fan2D106FaceAlignmentModel {
-        return Fan2D106FaceAlignmentModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return Fan2D106FaceAlignmentModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }
 

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/objectdetection/EfficientDetObjectDetectionModel.kt

@@ -70,6 +70,9 @@ public class EfficientDetObjectDetectionModel(
         saveOptimizerState: Boolean,
         copyWeights: Boolean
     ): EfficientDetObjectDetectionModel {
-        return EfficientDetObjectDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return EfficientDetObjectDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/objectdetection/SSDMobileNetV1ObjectDetectionModel.kt

@@ -79,6 +79,9 @@ public class SSDMobileNetV1ObjectDetectionModel(
         saveOptimizerState: Boolean,
         copyWeights: Boolean
     ): SSDMobileNetV1ObjectDetectionModel {
-        return SSDMobileNetV1ObjectDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return SSDMobileNetV1ObjectDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/objectdetection/SSDObjectDetectionModel.kt

@@ -110,6 +110,9 @@ public class SSDObjectDetectionModel(
         saveOptimizerState: Boolean,
         copyWeights: Boolean
     ): SSDObjectDetectionModel {
-        return SSDObjectDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return SSDObjectDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }

onnx/src/jvmMain/kotlin/org/jetbrains/kotlinx/dl/onnx/inference/posedetection/MultiPoseDetectionModel.kt

@@ -66,6 +66,9 @@ public class MultiPoseDetectionModel(
         saveOptimizerState: Boolean,
         copyWeights: Boolean
     ): MultiPoseDetectionModel {
-        return MultiPoseDetectionModel(internalModel.copy(copiedModelName, saveOptimizerState, copyWeights))
+        return MultiPoseDetectionModel(
+            internalModel.copy(copiedModelName, saveOptimizerState, copyWeights),
+            modelKindDescription
+        )
     }
 }