From f054a4c039c4d402807352466fdd38e1de3d40d6 Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Thu, 11 Feb 2021 23:34:48 +0700 Subject: [PATCH 1/2] Fix JVM signature of generated invoke method --- .../jvmMain/kotlin/kscience/kmath/asm/internal/AsmBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmath-ast/src/jvmMain/kotlin/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/kscience/kmath/asm/internal/AsmBuilder.kt index 93d8d1143..cd1236b70 100644 --- a/kmath-ast/src/jvmMain/kotlin/kscience/kmath/asm/internal/AsmBuilder.kt +++ b/kmath-ast/src/jvmMain/kotlin/kscience/kmath/asm/internal/AsmBuilder.kt @@ -83,7 +83,7 @@ internal class AsmBuilder( ACC_PUBLIC or ACC_FINAL, "invoke", getMethodDescriptor(tType, MAP_TYPE), - "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}${if (Modifier.isFinal(classOfT.modifiers)) "" else "+"}${tType.descriptor}>;)${tType.descriptor}", + "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}", null, ).instructionAdapter { invokeMethodVisitor = this From 0e42cc9f5c5252a8e956ca61581d87f1ac374416 Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Thu, 11 Feb 2021 23:35:45 +0700 Subject: [PATCH 2/2] Update README --- README.md | 4 ++-- kmath-ast/README.md | 8 ++++---- kmath-ast/docs/README-TEMPLATE.md | 2 +- kmath-complex/README.md | 6 +++--- kmath-core/README.md | 6 +++--- kmath-for-real/README.md | 6 +++--- kmath-functions/README.md | 6 +++--- kmath-nd4j/README.md | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d47016a2a..586d2185f 100644 --- a/README.md +++ b/README.md @@ -257,8 +257,8 @@ repositories { } dependencies { - api("kscience.kmath:kmath-core:0.2.0-dev-6") - // api("kscience.kmath:kmath-core-jvm:0.2.0-dev-6") for jvm-specific version + api("kscience.kmath:kmath-core:0.2.0-dev-7") + // api("kscience.kmath:kmath-core-jvm:0.2.0-dev-7") for jvm-specific version } ``` diff --git a/kmath-ast/README.md b/kmath-ast/README.md index 8499f7171..c54c4afb1 100644 --- a/kmath-ast/README.md +++ b/kmath-ast/README.md @@ -12,7 +12,7 @@ This subproject implements the following features: > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-ast:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-ast:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-ast/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-ast/_latestVersion) > @@ -30,7 +30,7 @@ This subproject implements the following features: > } > > dependencies { -> implementation 'kscience.kmath:kmath-ast:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-ast:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -44,7 +44,7 @@ This subproject implements the following features: > } > > dependencies { -> implementation("kscience.kmath:kmath-ast:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-ast:0.2.0-dev-7") > } > ``` @@ -75,7 +75,7 @@ import kscience.kmath.expressions.Symbol; public final class AsmCompiledExpression_45045_0 implements Expression { private final Object[] constants; - public final Double invoke(Map arguments) { + public final Double invoke(Map arguments) { return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2); } diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md index 3227a2ad3..ebaa6246a 100644 --- a/kmath-ast/docs/README-TEMPLATE.md +++ b/kmath-ast/docs/README-TEMPLATE.md @@ -33,7 +33,7 @@ import kscience.kmath.expressions.Symbol; public final class AsmCompiledExpression_45045_0 implements Expression { private final Object[] constants; - public final Double invoke(Map arguments) { + public final Double invoke(Map arguments) { return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2); } diff --git a/kmath-complex/README.md b/kmath-complex/README.md index eecb6b205..8e5320225 100644 --- a/kmath-complex/README.md +++ b/kmath-complex/README.md @@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath: > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-complex:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-complex:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-complex/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-complex/_latestVersion) > @@ -26,7 +26,7 @@ Complex and hypercomplex number systems in KMath: > } > > dependencies { -> implementation 'kscience.kmath:kmath-complex:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-complex:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -40,6 +40,6 @@ Complex and hypercomplex number systems in KMath: > } > > dependencies { -> implementation("kscience.kmath:kmath-complex:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-complex:0.2.0-dev-7") > } > ``` diff --git a/kmath-core/README.md b/kmath-core/README.md index 504171fe2..a38b3acaa 100644 --- a/kmath-core/README.md +++ b/kmath-core/README.md @@ -15,7 +15,7 @@ performance calculations to code generation. > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-core:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-core:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-core/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-core/_latestVersion) > @@ -33,7 +33,7 @@ performance calculations to code generation. > } > > dependencies { -> implementation 'kscience.kmath:kmath-core:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-core:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -47,6 +47,6 @@ performance calculations to code generation. > } > > dependencies { -> implementation("kscience.kmath:kmath-core:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-core:0.2.0-dev-7") > } > ``` diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md index 9b191121d..c291be3a1 100644 --- a/kmath-for-real/README.md +++ b/kmath-for-real/README.md @@ -7,7 +7,7 @@ > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-for-real:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-for-real:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-for-real/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-for-real/_latestVersion) > @@ -25,7 +25,7 @@ > } > > dependencies { -> implementation 'kscience.kmath:kmath-for-real:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-for-real:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -39,6 +39,6 @@ > } > > dependencies { -> implementation("kscience.kmath:kmath-for-real:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-for-real:0.2.0-dev-7") > } > ``` diff --git a/kmath-functions/README.md b/kmath-functions/README.md index 3e3d96fe9..f5462e09f 100644 --- a/kmath-functions/README.md +++ b/kmath-functions/README.md @@ -10,7 +10,7 @@ Functions and interpolations: > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-functions:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-functions:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-functions/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-functions/_latestVersion) > @@ -28,7 +28,7 @@ Functions and interpolations: > } > > dependencies { -> implementation 'kscience.kmath:kmath-functions:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-functions:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -42,6 +42,6 @@ Functions and interpolations: > } > > dependencies { -> implementation("kscience.kmath:kmath-functions:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-functions:0.2.0-dev-7") > } > ``` diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md index 5ef42bab3..9011ef3c5 100644 --- a/kmath-nd4j/README.md +++ b/kmath-nd4j/README.md @@ -9,7 +9,7 @@ This subproject implements the following features: > #### Artifact: > -> This module artifact: `kscience.kmath:kmath-nd4j:0.2.0-dev-6`. +> This module artifact: `kscience.kmath:kmath-nd4j:0.2.0-dev-7`. > > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-nd4j/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-nd4j/_latestVersion) > @@ -27,7 +27,7 @@ This subproject implements the following features: > } > > dependencies { -> implementation 'kscience.kmath:kmath-nd4j:0.2.0-dev-6' +> implementation 'kscience.kmath:kmath-nd4j:0.2.0-dev-7' > } > ``` > **Gradle Kotlin DSL:** @@ -41,7 +41,7 @@ This subproject implements the following features: > } > > dependencies { -> implementation("kscience.kmath:kmath-nd4j:0.2.0-dev-6") +> implementation("kscience.kmath:kmath-nd4j:0.2.0-dev-7") > } > ```