Move flattenFloats function to a separate file

Kotlin · Aug 1, 2022 · 1fe55f3 · 1fe55f3
1 parent 35ebbab
commit 1fe55f3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/core/shape/ShapeFunctions.kt b/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/core/shape/ShapeFunctions.kt
@@ -99,22 +99,4 @@ internal fun numElementsInShape(shape: LongArray): Long {
         prod *= abs(shape[i])
     }
     return prod
-}
-
-/**
- * Flattens the given array of float values.
- * @return flattened array
- */
-public fun Array<*>.flattenFloats(): FloatArray {
-    val result = mutableListOf<Float>()
-
-    fun flatten(array: Any?): Unit = when (array) {
-        is FloatArray -> array.forEach { result.add(it) }
-        is Array<*> -> array.forEach { flatten(it) }
-        else -> throw IllegalArgumentException("Cannot flatten object: '$array'")
-    }
-
-    flatten(this)
-
-    return result.toFloatArray()
 }
diff --git a/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/core/util/ArrayUtil.kt b/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/core/util/ArrayUtil.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 JetBrains s.r.o. and Kotlin Deep Learning project contributors. All Rights Reserved.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlinx.dl.api.core.util
+
+/**
+ * Flattens the given array of float values.
+ * @return flattened array
+ */
+public fun Array<*>.flattenFloats(): FloatArray {
+    val result = mutableListOf<Float>()
+
+    fun flatten(array: Any?): Unit = when (array) {
+        is FloatArray -> array.forEach { result.add(it) }
+        is Array<*> -> array.forEach { flatten(it) }
+        else -> throw IllegalArgumentException("Cannot flatten object: '$array'")
+    }
+
+    flatten(this)
+
+    return result.toFloatArray()
+}
diff --git a/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/inference/keras/loaders/LoadersUtil.kt b/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/inference/keras/loaders/LoadersUtil.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlinx.dl.api.inference.keras.loaders
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import com.beust.klaxon.Parser
-import org.jetbrains.kotlinx.dl.api.core.shape.flattenFloats
+import org.jetbrains.kotlinx.dl.api.core.util.flattenFloats
 import org.jetbrains.kotlinx.dl.api.inference.InferenceModel
 
 /**

diff --git a/api/src/test/kotlin/org/jetbrains/kotlinx/dl/api/core/layer/ConvLayerTest.kt b/api/src/test/kotlin/org/jetbrains/kotlinx/dl/api/core/layer/ConvLayerTest.kt
@@ -6,9 +6,9 @@
 package org.jetbrains.kotlinx.dl.api.core.layer
 
 import org.jetbrains.kotlinx.dl.api.core.activation.EPS
-import org.jetbrains.kotlinx.dl.api.core.shape.flattenFloats
 import org.jetbrains.kotlinx.dl.api.core.shape.shape
 import org.jetbrains.kotlinx.dl.api.core.shape.toLongArray
+import org.jetbrains.kotlinx.dl.api.core.util.flattenFloats
 import org.jetbrains.kotlinx.dl.api.extension.convertTensorToFlattenFloatArray
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.tensorflow.Graph

diff --git a/api/src/test/kotlin/org/jetbrains/kotlinx/dl/api/core/layer/LayerTest.kt b/api/src/test/kotlin/org/jetbrains/kotlinx/dl/api/core/layer/LayerTest.kt
@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlinx.dl.api.core.layer
 
-import org.jetbrains.kotlinx.dl.api.core.shape.flattenFloats
 import org.jetbrains.kotlinx.dl.api.core.shape.shape
 import org.jetbrains.kotlinx.dl.api.core.shape.toLongArray
+import org.jetbrains.kotlinx.dl.api.core.util.flattenFloats
 import org.jetbrains.kotlinx.dl.api.extension.convertTensorToFlattenFloatArray
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.tensorflow.*