From 8a73406d2c6e3b5c0c4601b1064a04a53fb884d6 Mon Sep 17 00:00:00 2001
From: SPC-code <112205870+SPC-code@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:20:22 +0300
Subject: [PATCH 1/3] Update pages.yml
---
.github/workflows/pages.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index ba1f5d1e3..45eca5a60 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3.0.0
- uses: actions/setup-java@v3.0.0
with:
- java-version: 11
+ java-version: 17
distribution: liberica
- name: Cache konan
uses: actions/cache@v3.0.1
From 345f4f2acfe6276e9005771d5118949a286dfcbf Mon Sep 17 00:00:00 2001
From: SPC-code <112205870+SPC-code@users.noreply.github.com>
Date: Sun, 12 Jan 2025 15:12:02 +0300
Subject: [PATCH 2/3] Update pages.yml
---
.github/workflows/pages.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 45eca5a60..cfc952b73 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -24,8 +24,8 @@ jobs:
${{ runner.os }}-gradle-
- uses: gradle/gradle-build-action@v2.4.2
with:
- arguments: dokkaHtmlMultiModule --no-parallel
+ arguments: dokkaGenerateModuleHtml --no-parallel
- uses: JamesIves/github-pages-deploy-action@v4.3.0
with:
branch: gh-pages
- folder: build/dokka/htmlMultiModule
+ folder: build/dokka/html
From f9f6b51772e85c23523f17e505acd95c724ff64e Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 22 Jan 2025 01:14:05 +0100
Subject: [PATCH 3/3] Move ND4J dependencies to libs.versions.toml, API dump in
kmath-nd4j
---
gradle/libs.versions.toml | 4 ++++
kmath-nd4j/api/kmath-nd4j.api | 28 ++++++++++++++--------------
kmath-nd4j/build.gradle.kts | 6 +++---
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a9026d45b..265f28016 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
commons-rng = "1.6"
multik = "0.2.3"
+nd4j = "1.0.0-M2.1"
[libraries]
attributes = "space.kscience:attributes-kt:0.3.0"
@@ -14,6 +15,9 @@ commons-rng-sampling = { module = "org.apache.commons:commons-rng-sampling", ver
multik-core = { module = "org.jetbrains.kotlinx:multik-core", version.ref = "multik" }
multik-default = { module = "org.jetbrains.kotlinx:multik-default", version.ref = "multik" }
+nd4j-api = { module = "org.nd4j:nd4j-api", version.ref = "nd4j" }
+nd4j-native-platform = { module = "org.nd4j:nd4j-native-platform", version.ref = "nd4j" }
+
ojalgo = "org.ojalgo:ojalgo:55.1.0"
[plugins]
\ No newline at end of file
diff --git a/kmath-nd4j/api/kmath-nd4j.api b/kmath-nd4j/api/kmath-nd4j.api
index 5a9a7985d..75c4d1b89 100644
--- a/kmath-nd4j/api/kmath-nd4j.api
+++ b/kmath-nd4j/api/kmath-nd4j.api
@@ -1,6 +1,6 @@
public final class space/kscience/kmath/nd4j/DoubleNd4jArrayField : space/kscience/kmath/nd4j/DoubleNd4jArrayFieldOps, space/kscience/kmath/nd/FieldND {
- public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- public fun getShape-IIYLAfE ()[I
+ public fun <init> (Lspace/kscience/kmath/nd/ShapeND;)V
+ public fun getShape ()Lspace/kscience/kmath/nd/ShapeND;
}
public class space/kscience/kmath/nd4j/DoubleNd4jArrayFieldOps : space/kscience/kmath/nd4j/Nd4jArrayExtendedFieldOps {
@@ -42,8 +42,8 @@ public final class space/kscience/kmath/nd4j/DoubleNd4jTensorAlgebra : space/ksc
public synthetic fun mean (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Object;
public fun min (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Double;
public synthetic fun min (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Object;
- public synthetic fun mutableStructureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/MutableStructureND;
- public fun mutableStructureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
+ public synthetic fun mutableStructureND (Lspace/kscience/kmath/nd/ShapeND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/MutableStructureND;
+ public fun mutableStructureND (Lspace/kscience/kmath/nd/ShapeND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public fun std (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Double;
public synthetic fun std (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Object;
public fun sum (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/Double;
@@ -56,8 +56,8 @@ public final class space/kscience/kmath/nd4j/DoubleNd4jTensorAlgebra : space/ksc
}
public final class space/kscience/kmath/nd4j/FloatNd4jArrayField : space/kscience/kmath/nd4j/FloatNd4jArrayFieldOps, space/kscience/kmath/nd/RingND {
- public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- public fun getShape-IIYLAfE ()[I
+ public fun <init> (Lspace/kscience/kmath/nd/ShapeND;)V
+ public fun getShape ()Lspace/kscience/kmath/nd/ShapeND;
}
public class space/kscience/kmath/nd4j/FloatNd4jArrayFieldOps : space/kscience/kmath/nd4j/Nd4jArrayExtendedFieldOps {
@@ -87,8 +87,8 @@ public final class space/kscience/kmath/nd4j/FloatNd4jArrayFieldOps$Companion :
}
public final class space/kscience/kmath/nd4j/IntNd4jArrayRing : space/kscience/kmath/nd4j/IntNd4jArrayRingOps, space/kscience/kmath/nd/RingND {
- public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- public fun getShape-IIYLAfE ()[I
+ public fun <init> (Lspace/kscience/kmath/nd/ShapeND;)V
+ public fun getShape ()Lspace/kscience/kmath/nd/ShapeND;
}
public class space/kscience/kmath/nd4j/IntNd4jArrayRingOps : space/kscience/kmath/nd4j/Nd4jArrayRingOps {
@@ -117,8 +117,8 @@ public abstract interface class space/kscience/kmath/nd4j/Nd4jArrayAlgebra : spa
public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public synthetic fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
- public synthetic fun mutableStructureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/MutableStructureND;
- public fun mutableStructureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
+ public synthetic fun mutableStructureND (Lspace/kscience/kmath/nd/ShapeND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/MutableStructureND;
+ public fun mutableStructureND (Lspace/kscience/kmath/nd/ShapeND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public abstract fun wrap (Lorg/nd4j/linalg/api/ndarray/INDArray;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public synthetic fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
@@ -248,7 +248,7 @@ public final class space/kscience/kmath/nd4j/Nd4jArrayRingOps$Companion {
public abstract class space/kscience/kmath/nd4j/Nd4jArrayStructure : space/kscience/kmath/nd/MutableStructureND {
public fun elements ()Lkotlin/sequences/Sequence;
public abstract fun getNdArray ()Lorg/nd4j/linalg/api/ndarray/INDArray;
- public fun getShape-IIYLAfE ()[I
+ public fun getShape ()Lspace/kscience/kmath/nd/ShapeND;
}
public final class space/kscience/kmath/nd4j/Nd4jArrayStructureKt {
@@ -332,7 +332,7 @@ public abstract interface class space/kscience/kmath/nd4j/Nd4jTensorAlgebra : sp
public fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Number;)V
public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
public fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/StructureND;)V
- public abstract fun mutableStructureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
+ public abstract fun mutableStructureND (Lspace/kscience/kmath/nd/ShapeND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public fun plus (Ljava/lang/Number;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
public synthetic fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -383,8 +383,8 @@ public abstract interface class space/kscience/kmath/nd4j/Nd4jTensorAlgebra : sp
public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
public fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public fun variance (Lspace/kscience/kmath/nd/StructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
- public synthetic fun view-waz_sdI (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
- public fun view-waz_sdI (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
+ public synthetic fun view (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/ShapeND;)Lspace/kscience/kmath/nd/MutableStructureND;
+ public fun view (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/ShapeND;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
public fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
public abstract fun wrap (Lorg/nd4j/linalg/api/ndarray/INDArray;)Lspace/kscience/kmath/nd4j/Nd4jArrayStructure;
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index fcfbf62f9..e63d32835 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -10,11 +10,11 @@ kscience {
jvmMain {
api(project(":kmath-tensors"))
- api("org.nd4j:nd4j-api:1.0.0-M2.1")
+ api(libs.nd4j.api)
}
- jvmTest{
- implementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
+ jvmTest {
+ implementation(libs.nd4j.native.platform)
}
}