summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-tf20
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-05-18 15:51:13 +0200
committerGitHub <noreply@github.com>2021-05-18 15:51:13 +0200
commit02776c958a3254735b2be7d9fb1627f75e7f80cd (patch)
tree155d96b0f1a5173e4ac884ac6c9cbccea011918f /opendc-experiments/opendc-experiments-tf20
parent1ce710ebaa8b071a3b30447d431f4af422f25156 (diff)
parent7cbb401a0939cc58daae8b481a97f4b05140ec3b (diff)
build: Add support for Java 16
This pull request adds support for building OpenDC using Java 16. To make this possible, we have upgraded the following dependencies: - Kotlin from 1.4.3 to 1.5.0 - Jacoco from 0.8.6 to 0.8.7 - Gradle from 7.0 to 7.0.2
Diffstat (limited to 'opendc-experiments/opendc-experiments-tf20')
-rw-r--r--opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt4
-rw-r--r--opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt2
2 files changed, 3 insertions, 3 deletions
diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
index 411ddb59..83995fa1 100644
--- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
+++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
@@ -49,10 +49,10 @@ public class Sequential(vararg layers: Layer) : TrainableModel(*layers) {
}
override fun forward(): Double {
- return layers.sumByDouble { it.forward() }
+ return layers.sumOf { it.forward() }
}
override fun backward(): Double {
- return layers.sumByDouble { it.backward() }
+ return layers.sumOf { it.backward() }
}
}
diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
index 75b11423..9771cc20 100644
--- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
+++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
@@ -82,7 +82,7 @@ public class NetworkController(context: CoroutineContext, clock: Clock) : AutoCl
val target = channels[to] ?: return // Drop if destination not found
- scheduler.startSingleTimer(message, delayTime) { target.offer(message) }
+ scheduler.startSingleTimer(message, delayTime) { target.trySend(message) }
}
/**