Skip to content

Commit f3a8e6b

Browse files
authored
Merge pull request #216 from JetBrains-Research/pre-release-fixes
Pre release fixes
2 parents da43ae9 + cefaf07 commit f3a8e6b

File tree

38 files changed

+53
-52
lines changed

38 files changed

+53
-52
lines changed

examples/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ kotlin {
1919
implementation("org.jetbrains.kotlinx:kotlin-deeplearning-api:0.5.2")
2020
implementation("org.jetbrains.kotlinx:kotlin-deeplearning-dataset:0.5.2") // Dataset support
2121

22-
implementation("io.ktor:ktor-client-core:2.3.12")
23-
implementation("io.ktor:ktor-client-cio:2.3.12") // JVM Engine
22+
implementation("io.ktor:ktor-client-core:3.0.1")
23+
implementation("io.ktor:ktor-client-cio:3.0.1") // JVM Engine
2424

2525
api("org.slf4j:slf4j-api:2.0.9")
2626
api("org.slf4j:slf4j-simple:2.0.9")
2727

28-
implementation("ai.djl:api:0.28.0")
29-
implementation("ai.djl.huggingface:tokenizers:0.28.0")
28+
implementation("ai.djl:api:0.31.1")
29+
implementation("ai.djl.huggingface:tokenizers:0.31.1")
3030
}
3131
}
3232
}

examples/src/jvmMain/kotlin/io/kinference/examples/classification/KIClassificationMain.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import io.kinference.core.data.tensor.asTensor
66
import io.kinference.examples.downloadFile
77
import io.kinference.examples.cacheDirectory
88
import io.kinference.ndarray.arrays.*
9-
import io.kinference.ndarray.arrays.FloatNDArray.Companion.invoke
10-
import io.kinference.utils.CommonDataLoader
119
import io.kinference.utils.PredictionConfigs
1210
import io.kinference.utils.inlines.InlineInt
1311
import okio.Path.Companion.toPath
@@ -119,4 +117,6 @@ suspend fun main() {
119117
displayTopPredictions(predictions, classLabels, dataClass.key)
120118
}
121119
}
120+
121+
model.close()
122122
}

examples/src/jvmMain/kotlin/io/kinference/examples/classification/ORTClassificationMain.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ package io.kinference.examples.classification
33
import io.kinference.examples.downloadFile
44
import io.kinference.examples.cacheDirectory
55
import io.kinference.ndarray.arrays.*
6-
import io.kinference.ndarray.arrays.FloatNDArray.Companion.invoke
76
import io.kinference.ort.ORTEngine
87
import io.kinference.ort.data.tensor.ORTTensor
9-
import io.kinference.utils.CommonDataLoader
108
import io.kinference.utils.inlines.InlineInt
119
import io.kinference.utils.toLongArray
1210
import okio.Path.Companion.toPath
@@ -118,4 +116,6 @@ suspend fun main() {
118116
displayTopPredictions(predictions, classLabels, dataClass.key)
119117
}
120118
}
119+
120+
model.close()
121121
}

examples/src/jvmMain/kotlin/io/kinference/examples/lm/KIGPT2Main.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import io.kinference.examples.extractTopToken
88
import io.kinference.examples.cacheDirectory
99
import io.kinference.ndarray.arrays.LongNDArray
1010
import io.kinference.ndarray.arrays.NDArrayCore
11-
import io.kinference.utils.CommonDataLoader
1211
import io.kinference.utils.PredictionConfigs
1312
import io.kinference.utils.inlines.InlineInt
1413
import okio.Path.Companion.toPath
@@ -54,5 +53,7 @@ suspend fun main() {
5453
currentContext = currentContext.concat(listOf(newTokenArray.unsqueeze(0)), axis = -1)
5554
print(tokenizer.decode(longArrayOf(outputTokens[idx])))
5655
}
56+
57+
model.close()
5758
println("\n\nDone")
5859
}

examples/src/jvmMain/kotlin/io/kinference/examples/lm/ORTGPT2Main.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import io.kinference.examples.downloadFile
77
import io.kinference.examples.extractTopToken
88
import io.kinference.examples.cacheDirectory
99
import io.kinference.ndarray.arrays.FloatNDArray
10-
import io.kinference.ndarray.arrays.FloatNDArray.Companion.invoke
1110
import io.kinference.ort.ORTData
1211
import io.kinference.ort.ORTEngine
1312
import io.kinference.ort.data.tensor.ORTTensor
14-
import io.kinference.utils.CommonDataLoader
1513
import io.kinference.utils.inlines.InlineInt
1614
import io.kinference.utils.toIntArray
1715
import okio.Path.Companion.toPath
@@ -57,6 +55,8 @@ suspend fun main() {
5755
currentContext = ORTTensor(newTokenArray, longArrayOf(1, 1, tokensSize + idx + 1L), INPUT_TENSOR_NAME)
5856
print(tokenizer.decode(longArrayOf(outputTokens[idx])))
5957
}
58+
59+
model.close()
6060
println("\n\nDone")
6161
}
6262

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kotlin = "2.0.0"
33

44
apache-commons = "4.0-beta1"
5-
aws = "1.12.761"
5+
aws = "1.12.787"
66
kmath = "0.3.1"
77
kotlin-atomicfu = "0.23.2"
88
kotlin-coroutines = "1.9.0"

inference/inference-core/src/jvmMain/kotlin/io/kinference.core/data/map/KIONNXMap.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class KIONNXMap(name: String?, data: Map<Any, KIONNXData<*>>, val info: ValueTyp
2020
val valueType: ValueTypeInfo?
2121
get() = info.valueType
2222

23-
override suspend fun close() {
23+
override fun close() {
2424
data.values.forEach { it.close() }
2525
}
2626

inference/inference-core/src/jvmMain/kotlin/io/kinference.core/data/seq/KIONNXSequence.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class KIONNXSequence(name: String?, data: List<KIONNXData<*>>, val info: ValueTy
1313

1414
override val backend = CoreBackend
1515

16-
override suspend fun close() {
16+
override fun close() {
1717
data.forEach { it.close() }
1818
}
1919

inference/inference-core/src/jvmMain/kotlin/io/kinference.core/data/tensor/KITensor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import io.kinference.types.ValueTypeInfo
1616
class KITensor(name: String?, override val data: NDArrayCore, val info: ValueTypeInfo.TensorTypeInfo, private var context: ManualAllocatorContext? = null) : ONNXTensor<NDArrayCore, CoreBackend>(name, data) {
1717
constructor(data: NDArrayCore, info: ValueInfo) : this(info.name, data, info.typeInfo as ValueTypeInfo.TensorTypeInfo)
1818

19-
override suspend fun close() {
19+
override fun close() {
2020
context?.returnNDArray(data)
2121
data.close()
2222
}

inference/inference-core/src/jvmMain/kotlin/io/kinference.core/model/KIModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class KIModel(
4747
return results.associateBy { it.name!! }
4848
}
4949

50-
override suspend fun close() {
50+
override fun close() {
5151
graph.close()
5252
predictionContextDispatcher.close()
5353
}

0 commit comments

Comments
 (0)