Move IO op to kotlinx-io library

Author: michalharakal

gguf/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(libs.okio)
+                implementation(libs.kotlinx.io.core)
             }
         }
         val commonTest by getting {

gguf/src/commonMain/kotlin/sk/ai/net/gguf/GGUFReader.kt

@@ -1,6 +1,8 @@
 package sk.ai.net.gguf
 
-import okio.BufferedSource
+import kotlinx.io.Buffer
+import kotlinx.io.Source
+import kotlinx.io.readByteArray
 import sk.ai.net.gguf.utils.Endian
 import sk.ai.net.gguf.utils.numberOfBytes
 import sk.ai.net.gguf.utils.readDataByType
@@ -51,7 +53,7 @@ data class FieldParts(
 )
 
 @OptIn(ExperimentalUnsignedTypes::class)
-class GGUFReader(bufferedSource: BufferedSource) {
+class GGUFReader(bufferedSource: Source) {
     // Properties
     var byteOrder: Char = 'I' // 'I' - same as host, 'S' - swapped
     var alignment: Int = GGUF_DEFAULT_ALIGNMENT

gguf/src/jvmTest/kotlin/sk/ai/net/gguf/GGUFReaderTest.kt

@@ -1,7 +1,7 @@
 package sk.ai.net.gguf
 
-import okio.buffer
-import okio.source
+import kotlinx.io.asSource
+import kotlinx.io.buffered
 import org.junit.Assert
 import org.junit.Test
 import sk.ai.net.gguf.utils.reshape
@@ -46,8 +46,9 @@ class GGUFReaderTest {
         javaClass.getResourceAsStream("/test_experiment.gguf").use { inputStream ->
             assertNotNull(inputStream, "Test resource file not found!")
 
+            // Convert it to a RawSource and then buffer it to get a Source:
 
-            val reader = GGUFReader(inputStream.source().buffer())
+            val reader = GGUFReader(inputStream.asSource().buffered())
             // List all key-value pairs in a columned format
             println("Key-Value Pairs:")
             val maxKeyLength = reader.fields.keys.maxOf { it.length }

gradle/libs.versions.toml

@@ -8,8 +8,7 @@ kotlinxSerializationJson = "1.8.0"
 nexus-publish = "2.0.0"
 jetbrainsKotlinJvm = "1.9.22"
 testng = "7.10.2"
-okio = "3.9.1"
-okioNodefilesystem = "3.9.0"
+kotlinxIo = "0.6.0"
 binaryCompatibility = "0.17.0"
 picnic = "0.7.0"
 
@@ -20,8 +19,8 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" }
 picnic = { module = "com.jakewharton.picnic:picnic", version.ref = "picnic" }
 testng = { group = "org.testng", name = "testng", version.ref = "testng" }
-okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
-okio-nodefilesystem = { module = "com.squareup.okio:okio-nodefilesystem", version.ref = "okioNodefilesystem" }
+kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinxIo" }
+kotlinx-io-bytestring = { module = "org.jetbrains.kotlinx:kotlinx-io-bytestring", version.ref = "kotlinxIo" }
 
 [plugins]
 androidLibrary = { id = "com.android.library", version.ref = "agp" }

io/build.gradle.kts

@@ -31,7 +31,8 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(project(":core"))
-                implementation(libs.okio)
+                implementation(libs.kotlinx.io.core)
+
                 implementation(libs.kotlinx.serialization.json)
             }
         }

io/src/commonMain/kotlin/sk/ai/net/io/csv/CsvParameterLoader.kt

@@ -1,22 +1,25 @@
 package sk.ai.net.io.csv
 
+import kotlinx.io.Source
+import kotlinx.io.readByteArray
+import kotlinx.io.readString
 import kotlinx.serialization.json.Json
-import okio.BufferedSource
-import okio.use
 import sk.ai.net.Shape
 
 import sk.ai.net.Tensor
 import sk.ai.net.impl.DoublesTensor
 import sk.ai.net.io.ParametersLoader
 
-class CsvParametersLoader(private val handleSource: () -> BufferedSource) :
+class CsvParametersLoader(private val handleSource: () -> Source) :
     ParametersLoader {
     override suspend fun load(onTensorLoaded: (String, Tensor) -> Unit) {
-        handleSource().use { source ->
+
+        handleSource().use { source: Source ->
             // Initialize Json object
             val json = Json { ignoreUnknownKeys = true }
             // Deserialize JSON to Kotlin objects
-            json.decodeFromString<List<Parameter>>(source.readUtf8()).also { values ->
+
+            json.decodeFromString<List<Parameter>>(source.readString()).also { values ->
                 values.forEach { (name, array) ->
                     val tensor = DoublesTensor(Shape(*array.shape.toIntArray()), array.values.toDoubleArray())
                     onTensorLoaded(name, tensor)

io/src/jvmTest/kotlin/sk/ai/net/io/CsvParametersLoaderTest.kt

@@ -2,9 +2,9 @@ package sk.ai.net.io
 
 import junit.framework.TestCase.assertTrue
 import kotlinx.coroutines.runBlocking
-import okio.buffer
-import okio.source
-import org.junit.Test
+import kotlinx.io.asSource
+import kotlinx.io.buffered
+
 import sk.ai.net.Shape
 import sk.ai.net.dsl.network
 import sk.ai.net.impl.DoublesTensor
@@ -16,9 +16,11 @@ import sk.ai.net.nn.reflection.flattenParams
 import sk.ai.net.nn.reflection.summary
 import sk.ai.net.nn.reflection.toVisualString
 import java.io.InputStream
+import kotlin.io.path.Path
 import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
+import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class CsvParametersLoaderTest {
@@ -47,7 +49,12 @@ class CsvParametersLoaderTest {
         print(sineModule.toVisualString())
 
         javaClass.getResourceAsStream("/sinus-approximator.json")?.use { inputStream: InputStream ->
-            val parametersLoader = CsvParametersLoader { inputStream.source().buffer() }
+
+            // Convert it to a RawSource and then buffer it to get a Source:
+            val source = inputStream.asSource().buffered()
+
+            // Convert the InputStream to a kotlinx-io Input:
+            val parametersLoader = CsvParametersLoader { source }
 
             val mapper = NamesBasedValuesModelMapper()