diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-09-16 11:29:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-16 11:29:26 +0200 |
| commit | 4a010c6b9e033314a2624a0756dcdc7f17010d9d (patch) | |
| tree | 70dc26e98cf8421eb5db7f62cf63d4ea2399c505 /opendc-experiments/opendc-experiments-tf20/src/test | |
| parent | 5047e4a25a0814f96852882f02c4017e1d5f81e7 (diff) | |
All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability. (#255)
Diffstat (limited to 'opendc-experiments/opendc-experiments-tf20/src/test')
2 files changed, 10 insertions, 12 deletions
diff --git a/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/TensorFlowTest.kt b/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/TensorFlowTest.kt index 28a77c2e..447827e9 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/TensorFlowTest.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/TensorFlowTest.kt @@ -49,8 +49,8 @@ class TensorFlowTest { def.uid, def.meta["gpu"] as Boolean, dispatcher, - def.model.cpus[0], - def.model.memory[0], + def.model.cpu, + def.model.memory, CpuPowerModels.linear(250.0, 60.0), ) val strategy = OneDeviceStrategy(device) @@ -84,8 +84,8 @@ class TensorFlowTest { def.uid, def.meta["gpu"] as Boolean, dispatcher, - def.model.cpus[0], - def.model.memory[0], + def.model.cpu, + def.model.memory, CpuPowerModels.linear(250.0, 60.0), ) val strategy = OneDeviceStrategy(device) @@ -119,8 +119,8 @@ class TensorFlowTest { def.uid, def.meta["gpu"] as Boolean, dispatcher, - def.model.cpus[0], - def.model.memory[0], + def.model.cpu, + def.model.memory, CpuPowerModels.linear(250.0, 60.0), ) @@ -129,8 +129,8 @@ class TensorFlowTest { UUID.randomUUID(), def.meta["gpu"] as Boolean, dispatcher, - def.model.cpus[0], - def.model.memory[0], + def.model.cpu, + def.model.memory, CpuPowerModels.linear(250.0, 60.0), ) diff --git a/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/core/SimTFDeviceTest.kt b/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/core/SimTFDeviceTest.kt index 76473868..e0c4599a 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/core/SimTFDeviceTest.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/test/kotlin/org/opendc/experiments/tf20/core/SimTFDeviceTest.kt @@ -27,9 +27,8 @@ import kotlinx.coroutines.launch import org.junit.jupiter.api.Assertions.assertAll import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import org.opendc.simulator.compute.model.Cpu import org.opendc.simulator.compute.model.MemoryUnit -import org.opendc.simulator.compute.model.ProcessingNode -import org.opendc.simulator.compute.model.ProcessingUnit import org.opendc.simulator.compute.power.CpuPowerModels import org.opendc.simulator.kotlin.runSimulation import java.util.UUID @@ -41,8 +40,7 @@ internal class SimTFDeviceTest { @Test fun testSmoke() = runSimulation { - val puNode = ProcessingNode("NVIDIA", "Tesla V100", "unknown", 1) - val pu = ProcessingUnit(puNode, 0, 960 * 1230.0) + val pu = Cpu(0, 1, 960 * 1230.0, "NVIDIA", "Tesla V100", "unknown") val memory = MemoryUnit("NVIDIA", "Tesla V100", 877.0, 32_000) val device = |