Skip to content

Commit

Permalink
drop notebook integration until Kotlin/kotlin-jupyter#147 can be reso…
Browse files Browse the repository at this point in the history
…lved
  • Loading branch information
breandan committed Mar 6, 2021
1 parent 9b4f759 commit 82f50f7
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 26 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ repositories {
}

dependencies {
implementation("com.github.breandan:kotlingrad:0.4.0")
implementation("com.github.breandan:kotlingrad:0.4.1")
}
```

Expand All @@ -99,7 +99,7 @@ dependencies {
<dependency>
<groupId>com.github.breandan</groupId>
<artifactId>kotlingrad</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
</dependency>
</project>
```
Expand Down
5 changes: 1 addition & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ idea.module {

dependencies {
// implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
api("com.github.breandan:kaliningraph")
api("com.github.breandan:kaliningraph:0.1.5")

// Mathematical libraries
implementation("ch.obermuhlner:big-math:2.3.0")
Expand All @@ -38,9 +38,6 @@ dependencies {
// val tfVersion by extra { "-SNAPSHOT" }
// testImplementation("com.github.tensorflow:java:$tfVersion")
// testImplementation("com.github.tensorflow:tensorflow-core-platform:$tfVersion")
val ejmlVersion = "0.4.0"
testImplementation("org.ejml:ejml-kotlin:$ejmlVersion")
testImplementation("org.ejml:ejml-all:$ejmlVersion")
testImplementation("com.github.breandan:tensor:master-SNAPSHOT")

// Property-based testing
Expand Down
2 changes: 1 addition & 1 deletion core/kotlingrad.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"link": "https://github.com/breandan/kotlingrad",
"description": "A shape-safe symbolic differentiation framework for Kotlin",
"dependencies": [
"com.github.breandan:kotlingrad:0.4.0",
"com.github.breandan:kotlingrad:0.4.1",
"com.github.breandan:kaliningraph:0.1.5"
],
"imports": [
Expand Down
38 changes: 19 additions & 19 deletions core/src/main/kotlin/edu/umontreal/kotlingrad/api/KotlinJupyter.kt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package edu.umontreal.kotlingrad.api

import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
import org.jetbrains.kotlinx.jupyter.api.*
import org.jetbrains.kotlinx.jupyter.api.libraries.*

@JupyterLibrary
internal class Integration: JupyterIntegration() {
override fun Builder.onLoaded() {
listOf(
"edu.umontreal.kotlingrad.api.*",
"edu.mcgill.kaliningraph.*"
).forEach { import(it) }

render<Fun<*>> { HTML(it.render().toString()) }

// https://github.com/Kotlin/kotlin-jupyter/blob/master/docs/libraries.md#integration-using-kotlin-api
// https://github.com/nikitinas/dataframe/blob/master/src/main/kotlin/org/jetbrains/dataframe/jupyter/Integration.kt
// https://github.com/mipt-npm/visionforge/blob/dev/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
}
}
//import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
//import org.jetbrains.kotlinx.jupyter.api.*
//import org.jetbrains.kotlinx.jupyter.api.libraries.*
//
//@JupyterLibrary
//class Integration: JupyterIntegration() {
// override fun Builder.onLoaded() {
// listOf(
// "edu.umontreal.kotlingrad.api.*",
//// "edu.mcgill.kaliningraph.*"
// ).forEach { import(it) }
//
//// render<Fun<*>> { HTML(it.render().toString()) }
//
// // https://github.com/Kotlin/kotlin-jupyter/blob/master/docs/libraries.md#integration-using-kotlin-api
// // https://github.com/nikitinas/dataframe/blob/master/src/main/kotlin/org/jetbrains/dataframe/jupyter/Integration.kt
// // https://github.com/mipt-npm/visionforge/blob/dev/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
// }
//}

0 comments on commit 82f50f7

Please sign in to comment.