EAP 2.1.20

# Conflicts:
#	benchmarks/build.gradle.kts
#	gradle.properties
#	kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt

benchmarks/build.gradle.kts

@@ -19,6 +19,14 @@ repositories {
 }
 
 kotlin {
+    jvmToolchain(17)
+
+    compilerOptions {
+        optIn.addAll(
+            "space.kscience.kmath.UnstableKMathAPI"
+        )
+    }
+
     jvm()
 
     js(IR) {
@@ -58,7 +66,7 @@ kotlin {
                 implementation(project(":kmath-nd4j"))
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
-                implementation(project(":kmath-jafama"))
+//                implementation(project(":kmath-jafama"))
                 implementation(projects.kmath.kmathTensorflow)
                 implementation("org.tensorflow:tensorflow-core-platform:0.4.0")
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
@@ -152,15 +160,6 @@ benchmark {
     }
 }
 
-kotlin {
-    jvmToolchain(11)
-    compilerOptions {
-        optIn.addAll(
-            "space.kscience.kmath.UnstableKMathAPI"
-        )
-    }
-}
-
 
 private data class JmhReport(
     val jmhVersion: String,

benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt

@@ -1,39 +0,0 @@
-/*
- * Copyright 2018-2024 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.benchmarks
-
-import kotlinx.benchmark.Blackhole
-import org.openjdk.jmh.annotations.Benchmark
-import org.openjdk.jmh.annotations.Scope
-import org.openjdk.jmh.annotations.State
-import space.kscience.kmath.jafama.JafamaDoubleField
-import space.kscience.kmath.jafama.StrictJafamaDoubleField
-import space.kscience.kmath.operations.Float64Field
-import space.kscience.kmath.operations.invoke
-import kotlin.random.Random
-
-@State(Scope.Benchmark)
-internal class JafamaBenchmark {
-    @Benchmark
-    fun jafama(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
-        JafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
-    }
-
-    @Benchmark
-    fun core(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
-        Float64Field { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
-    }
-
-    @Benchmark
-    fun strictJafama(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
-        StrictJafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
-    }
-}
-
-private inline fun invokeBenchmarks(blackhole: Blackhole, expr: (Double) -> Double) {
-    val rng = Random(0)
-    repeat(1000000) { blackhole.consume(expr(rng.nextDouble())) }
-}

build.gradle.kts

@@ -19,6 +19,12 @@ allprojects {
     version = "0.4.1-dev"
 }
 
+dependencies{
+    subprojects.forEach {
+        dokka(it)
+    }
+}
+
 subprojects {
     if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 

examples/build.gradle.kts

@@ -27,8 +27,6 @@ dependencies {
     implementation(project(":kmath-tensors"))
     implementation(project(":kmath-symja"))
     implementation(project(":kmath-for-real"))
-    //jafama
-    implementation(project(":kmath-jafama"))
     //multik
     implementation(project(":kmath-multik"))
     implementation(libs.multik.default)
@@ -54,7 +52,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
     sourceSets.all {
         languageSettings {
             optIn("kotlin.contracts.ExperimentalContracts")

examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt

@@ -9,7 +9,6 @@ import kotlinx.html.br
 import kotlinx.html.h3
 import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
-import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.autodiff
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.asIterable
@@ -20,7 +19,6 @@ import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.chiSquaredExpression
-import space.kscience.kmath.structures.Float64
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
@@ -66,7 +64,7 @@ suspend fun main() {
     val yErr = y.map { sqrt(it) }//RealVector.same(x.size, sigma)
 
     // compute differentiable chi^2 sum for given model ax^2 + bx + c
-    val chi2: DifferentiableExpression<Float64> = Double.autodiff.chiSquaredExpression(x, y, yErr) { arg ->
+    val chi2 = Double.autodiff.chiSquaredExpression(x, y, yErr) { arg ->
         //bind variables to autodiff context
         val a = bindSymbol(a)
         val b = bindSymbol(b)

examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt

@@ -1,15 +0,0 @@
-/*
- * Copyright 2018-2024 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.jafama
-
-import space.kscience.kmath.operations.invoke
-
-fun main() {
-    val a = 2.0
-    val b = StrictJafamaDoubleField { exp(a) }
-    println(JafamaDoubleField { b + a })
-    println(StrictJafamaDoubleField { ln(b) })
-}

gradle.properties

@@ -2,12 +2,15 @@
 # Copyright 2018-2021 KMath contributors.
 # Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 #
-kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
-kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.parallel=true
 org.gradle.workers.max=4
 
-toolsVersion=0.15.4-kotlin-2.0.0
+kotlin.code.style=official
+kotlin.mpp.stability.nowarn=true
+kotlin.native.ignoreDisabledTargets=true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+kotlin.native.enableKlibsCrossCompilation=true
+
+toolsVersion=0.16.0-kotlin-2.1.20-Beta1

kmath-ast/build.gradle.kts

@@ -7,14 +7,18 @@ kscience {
     js{
         nodejs {
             testTask {
-                useMocha().timeout = "0"
+                useMocha {
+                    timeout = "0"
+                }
             }
         }
 
         browser {
             useCommonJs()
             testTask {
-                useMocha().timeout = "0"
+                useMocha {
+                    timeout = "0"
+                }
             }
         }
     }

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt

@@ -7,13 +7,9 @@ package space.kscience.kmath.wasm.internal
 
 import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
-import space.kscience.kmath.expressions.DoubleExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.IntExpression
-import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.internal.binaryen.*
 import space.kscience.kmath.internal.webassembly.Instance
-import space.kscience.kmath.named.SimpleSymbolIndexer
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Float64
 import space.kscience.kmath.internal.binaryen.Module as BinaryenModule

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt

@@ -11,7 +11,6 @@ import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.named.SimpleSymbolIndexer
 import space.kscience.kmath.operations.Float64Field
 import space.kscience.kmath.operations.Int32Ring
 import space.kscience.kmath.structures.Float64

kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt

@@ -12,7 +12,6 @@ import space.kscience.kmath.asm.internal.*
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.named.SimpleSymbolIndexer
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.Float64Field
 import space.kscience.kmath.operations.Int32Ring

kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt

@@ -14,8 +14,6 @@ import org.objectweb.asm.commons.InstructionAdapter
 import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.named.SimpleSymbolIndexer
-import space.kscience.kmath.named.SymbolIndexer
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Float64
 import java.lang.invoke.MethodHandles

kmath-commons/src/jvmMain/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt

@@ -18,9 +18,9 @@ import space.kscience.attributes.AttributesBuilder
 import space.kscience.attributes.SetAttribute
 import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.SymbolIndexer
 import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.named.SymbolIndexer
-import space.kscience.kmath.named.withSymbols
+import space.kscience.kmath.expressions.withSymbols
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.structures.Float64
 import kotlin.collections.set

kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt

@@ -23,7 +23,7 @@ public abstract class Domain1D<T : Comparable<T>>(public val range: ClosedRange<
 
 @UnstableKMathAPI
 public class DoubleDomain1D(
-    public val doubleRange: ClosedFloatingPointRange<Float64>,
+    @Suppress("CanBeParameter") public val doubleRange: ClosedFloatingPointRange<Float64>,
 ) : Domain1D<Float64>(doubleRange), Float64Domain {
     override fun getLowerBound(num: Int): Double {
         require(num == 0)

kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt

@@ -7,7 +7,6 @@ package space.kscience.kmath.expressions
 
 import space.kscience.attributes.SafeType
 import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.named.SymbolIndexer
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer

kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt

@@ -126,7 +126,7 @@ public class DSCompiler<T, out A : Algebra<T>> internal constructor(
      * If all orders are set to 0, then the 0<sup>th</sup> order derivative is returned, which is the value of the
      * function.
      *
-     * The indices of derivatives are between 0 and [getSize] &minus; 1. Their specific order is fixed for a given compiler, but
+     * The indices of derivatives are between 0 and [size] &minus; 1. Their specific order is fixed for a given compiler, but
      * otherwise not publicly specified. There are however some simple cases which have guaranteed indices:
      *
      *  * the index of 0<sup>th</sup> order derivative is always 0

kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt

@@ -9,7 +9,6 @@ import space.kscience.attributes.SafeType
 import space.kscience.attributes.WithType
 import space.kscience.attributes.safeTypeOf
 import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.named.SymbolIndexer
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing

kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt

@@ -5,24 +5,14 @@
 
 @file:OptIn(UnstableKMathAPI::class)
 
-package space.kscience.kmath.named
+package space.kscience.kmath.expressions
 
 import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.structures.getOrNull
 
-/**
- * A square matrix that could be accessed via column and row names.
- *
- * Multiple symbols could in theory reference the same columns or rows. Some columns could be not references at all.
- */
 public class NamedMatrix<T>(public val values: Matrix<T>, public val indexer: SymbolIndexer) : Matrix<T> by values {
-    init {
-        require(values.rows.size == values.columns.size) { "Only square matrices could be named" }
-    }
-
     public operator fun get(i: Symbol, j: Symbol): T = get(indexer.indexOf(i), indexer.indexOf(j))
 
     public companion object {

kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt

@@ -3,10 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.named
+package space.kscience.kmath.expressions
 
 import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.BufferFactory
@@ -70,9 +69,6 @@ public interface SymbolIndexer {
     public fun Map<Symbol, Double>.toDoubleArray(): DoubleArray = DoubleArray(symbols.size) { getValue(symbols[it]) }
 }
 
-@UnstableKMathAPI
-public val SymbolIndexer.size: Int get() = symbols.size
-
 @UnstableKMathAPI
 @JvmInline
 public value class SimpleSymbolIndexer(override val symbols: List<Symbol>) : SymbolIndexer

kmath-core/src/commonMain/kotlin/space/kscience/kmath/named/NamedBuffer.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright 2018-2024 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:OptIn(UnstableKMathAPI::class)
-
-package space.kscience.kmath.named
-
-import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.MutableBuffer
-
-public class NamedBuffer<T>(public val values: Buffer<T>, public val indexer: SymbolIndexer): Buffer<T> by values{
-    public operator fun get(symbol: Symbol): T = values[indexer.indexOf(symbol)]
-}
-
-public class NamedMutableBuffer<T>(public val values: MutableBuffer<T>, public val indexer: SymbolIndexer): MutableBuffer<T> by values{
-    public operator fun get(symbol: Symbol): T = values[indexer.indexOf(symbol)]
-    public operator fun set(symbol: Symbol, value: T) { values[indexer.indexOf(symbol)] = value }
-}

kmath-kotlingrad/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("space.kscience.gradle.mpp")
 }
 
 kotlin.sourceSets
@@ -9,11 +9,18 @@ kotlin.sourceSets
 
 description = "Kotlin∇ integration module"
 
-dependencies {
+kscience{
+    jvm()
+
+    jvmMain{
         api("ai.hypergraph:kaliningraph:0.1.9")
         api("ai.hypergraph:kotlingrad:0.4.7")
         api(project(":kmath-core"))
-    testImplementation(project(":kmath-ast"))
+    }
+
+    jvmTest{
+        implementation(project(":kmath-ast"))
+    }
 }
 
 readme {

kmath-memory/build.gradle.kts

@@ -11,6 +11,10 @@ kscience {
     dependencies {
         api(projects.kmathCore)
     }
+
+    wasmJsMain{
+        api(spclibs.kotlinx.browser)
+    }
 }
 
 readme {

kmath-nd4j/build.gradle.kts

@@ -1,14 +1,21 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("space.kscience.gradle.mpp")
 }
 
 description = "ND4J NDStructure implementation and according NDAlgebra classes"
 
-dependencies {
+
+kscience {
+    jvm()
+
+    jvmMain {
         api(project(":kmath-tensors"))
-    api("org.nd4j:nd4j-api:1.0.0-M1")
-    testImplementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
-    testImplementation("org.slf4j:slf4j-simple:1.7.32")
+        api("org.nd4j:nd4j-api:1.0.0-M2.1")
+    }
+
+    jvmTest{
+        implementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
+    }
 }
 
 readme {

kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt

@@ -6,9 +6,9 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.attributes.*
+import space.kscience.kmath.expressions.NamedMatrix
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.Loggable
-import space.kscience.kmath.named.NamedMatrix
 
 public interface OptimizationAttribute<T> : Attribute<T>
 

kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt

@@ -6,15 +6,9 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.UnstableKMathAPI
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.expressions.withDefaultArgs
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.log
-import space.kscience.kmath.named.NamedMatrix
-import space.kscience.kmath.named.SymbolIndexer
-import space.kscience.kmath.named.named
 import space.kscience.kmath.operations.Float64Field
 import space.kscience.kmath.operations.Float64L2Norm
 import space.kscience.kmath.operations.algebra

kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/MultivariateNormalDistribution.kt

@@ -1,12 +0,0 @@
-/*
- * Copyright 2018-2024 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.distributions
-
-public interface MultivariateNormalDistribution: NamedDistribution<Double> {
-    public companion object{
-
-    }
-}

kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt

@@ -6,7 +6,9 @@
 package space.kscience.kmath.stat
 
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.Float64
+import space.kscience.kmath.structures.indices
 
 /**
  * Arithmetic mean
@@ -42,8 +44,8 @@ public class Mean<T>(
 
     public companion object {
         public fun evaluate(buffer: Buffer<Float64>): Double = Float64Field.mean.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Int32>): Int = Int32Ring.mean.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Int64>): Long = Int64Ring.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Int>): Int = Int32Ring.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Long>): Long = Int64Ring.mean.evaluateBlocking(buffer)
     }
 }
 

kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt

@@ -18,8 +18,7 @@ public class RandomSourceGenerator internal constructor(
     public val source: RandomSource,
     seed: Long?,
 ) : RandomGenerator {
-    internal val random: UniformRandomProvider = seed?.let { source.create(seed) }
-        ?: RandomSource.create(source)
+    internal val random: UniformRandomProvider = seed?.let { source.create(seed) } ?: source.create()
 
     override fun nextBoolean(): Boolean = random.nextBoolean()
     override fun nextDouble(): Double = random.nextDouble()

kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runTest
 import space.kscience.kmath.operations.Float64Field
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.random.chain
@@ -28,21 +27,21 @@ internal class StatisticTest {
     val chunked = data.chunked(1000)
 
     @Test
-    fun singleBlockingMean() = runTest {
-        val first = chunked.first()
-        val res = Float64Field.mean(first)
-        assertEquals(0.5, res, 1e-1)
-    }
-
-    @Test
-    fun singleSuspendMean() = runTest {
+    fun singleBlockingMean() {
         val first = runBlocking { chunked.first() }
         val res = Float64Field.mean(first)
         assertEquals(0.5, res, 1e-1)
     }
 
     @Test
-    fun parallelMean() = runTest {
+    fun singleSuspendMean() = runBlocking {
+        val first = runBlocking { chunked.first() }
+        val res = Float64Field.mean(first)
+        assertEquals(0.5, res, 1e-1)
+    }
+
+    @Test
+    fun parallelMean() = runBlocking {
         val average = Float64Field.mean
             .flow(chunked) //create a flow from evaluated results
             .take(100) // Take 100 data chunks from the source and accumulate them

kmath-symja/build.gradle.kts

@@ -4,38 +4,24 @@
  */
 
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("space.kscience.gradle.mpp")
 }
 
 description = "Symja integration module"
 
-dependencies {
-    api("org.matheclipse:matheclipse-core:2.0.0") {
-        // Incorrect transitive dependencies
-        exclude("org.apfloat", "apfloat")
-        exclude("org.hipparchus", "hipparchus-clustering")
-        exclude("org.hipparchus", "hipparchus-core")
-        exclude("org.hipparchus", "hipparchus-fft")
-        exclude("org.hipparchus", "hipparchus-fitting")
-        exclude("org.hipparchus", "hipparchus-ode")
-        exclude("org.hipparchus", "hipparchus-optim")
-        exclude("org.hipparchus", "hipparchus-stat")
-    }
+kscience{
+    jvm()
 
-    // Replaces for incorrect transitive dependencies
-    api("org.apfloat:apfloat:1.10.0")
-    api("org.hipparchus:hipparchus-clustering:1.8")
-    api("org.hipparchus:hipparchus-core:1.8")
-    api("org.hipparchus:hipparchus-fft:1.8")
-    api("org.hipparchus:hipparchus-fitting:1.8")
-    api("org.hipparchus:hipparchus-ode:1.8")
-    api("org.hipparchus:hipparchus-optim:1.8")
-    api("org.hipparchus:hipparchus-stat:1.8")
+    jvmMain {
+        api("org.matheclipse:matheclipse-core:3.0.0")
 
         api(project(":kmath-core"))
-    testImplementation("org.slf4j:slf4j-simple:1.7.31")
     }
 
+
+}
+
+
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }

kmath-tensors/build.gradle.kts

@@ -7,7 +7,9 @@ kscience {
     js {
         browser {
             testTask {
-                useMocha().timeout = "0"
+                useMocha {
+                    timeout = "0"
+                }
             }
         }
     }

kmath-viktor/build.gradle.kts

@@ -1,13 +1,16 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("space.kscience.gradle.mpp")
 }
 
 description = "Binding for https://github.com/JetBrains-Research/viktor"
 
-dependencies {
+kscience{
+    jvm()
+    jvmMain{
         api(project(":kmath-core"))
         api("org.jetbrains.bio:viktor:1.2.0")
     }
+}
 
 readme {
     maturity = space.kscience.gradle.Maturity.DEPRECATED

settings.gradle.kts

@@ -61,7 +61,6 @@ include(
     ":kmath-tensors",
     ":kmath-jupyter",
     ":kmath-symja",
-    ":kmath-jafama",
     ":examples",
     ":benchmarks",
 )

test-utils/build.gradle.kts

@@ -14,6 +14,7 @@ kotlin.sourceSets {
         dependencies {
             api(projects.kmath.kmathCore)
             api(kotlin("test"))
+            api(spclibs.logback.classic)
         }
     }
 }