From 47357afd16f928260db34d4dd3e686fb9ee7c5ff Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 6 Oct 2022 13:13:10 +0200 Subject: build: Switch to Spotless for formatting This change updates the build configuration to use Spotless for code formating of both Kotlin and Java. --- .../org/opendc/experiments/ServiceRegistryTest.kt | 2 +- .../org/opendc/experiments/capelin/CapelinCli.kt | 3 ++- .../opendc/experiments/capelin/CapelinRunner.kt | 5 ++-- .../capelin/topology/TopologyFactories.kt | 1 + .../experiments/capelin/CapelinIntegrationTest.kt | 12 +++++----- .../experiments/compute/ComputeSchedulers.kt | 1 + .../org/opendc/experiments/compute/ComputeSteps.kt | 1 + .../experiments/compute/ComputeWorkloadLoader.kt | 2 -- .../opendc/experiments/compute/ComputeWorkloads.kt | 1 + .../opendc/experiments/compute/FailureModels.kt | 1 + .../org/opendc/experiments/compute/TraceHelpers.kt | 1 + .../export/parquet/ParquetHostDataWriter.kt | 2 +- .../export/parquet/ParquetServiceDataWriter.kt | 2 +- .../faas/FaaSServiceProvisioningStep.kt | 5 ++-- .../org/opendc/experiments/faas/FaaSSteps.kt | 1 + .../org/opendc/experiments/faas/TraceHelpers.kt | 1 + .../org/opendc/experiments/faas/FaaSExperiment.kt | 2 +- .../opendc/experiments/tf20/core/SimTFDevice.kt | 3 ++- .../experiments/tf20/keras/layer/conv/Conv2D.kt | 2 +- .../tf20/keras/layer/core/ActivationLayer.kt | 2 +- .../org/opendc/experiments/tf20/TensorFlowTest.kt | 28 ++++++++++++++++++---- .../opendc/experiments/workflow/TraceHelpers.kt | 8 ++++--- .../experiments/workflow/WorkflowSchedulerSpec.kt | 2 +- .../workflow/WorkflowServiceProvisioningStep.kt | 2 +- .../opendc/experiments/workflow/WorkflowSteps.kt | 1 + 25 files changed, 62 insertions(+), 29 deletions(-) (limited to 'opendc-experiments') diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/ServiceRegistryTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/ServiceRegistryTest.kt index 67dbaba9..f649b810 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/ServiceRegistryTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/ServiceRegistryTest.kt @@ -94,7 +94,7 @@ class ServiceRegistryTest { assertAll( { assertNull(registry.resolve("opendc.org", String::class.java)) }, - { assertNull(registry.resolve("opendc.org", Int::class.java)) }, + { assertNull(registry.resolve("opendc.org", Int::class.java)) } ) } diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinCli.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinCli.kt index 35a51de5..402d1f3b 100644 --- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinCli.kt +++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinCli.kt @@ -21,6 +21,7 @@ */ @file:JvmName("CapelinCli") + package org.opendc.experiments.capelin import com.github.ajalt.clikt.core.CliktCommand @@ -113,7 +114,7 @@ internal class CapelinCommand : CliktCommand(name = "capelin") { "hor-ver" to { HorVerPortfolio() }, "more-hpc" to { MoreHpcPortfolio() }, "more-velocity" to { MoreVelocityPortfolio() }, - "op-phen" to { OperationalPhenomenaPortfolio() }, + "op-phen" to { OperationalPhenomenaPortfolio() } ) /** diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt index 44079cc2..2c3573dc 100644 --- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt +++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt @@ -90,10 +90,11 @@ public class CapelinRunner( val vms = scenario.workload.source.resolve(workloadLoader, Random(seed)) val operationalPhenomena = scenario.operationalPhenomena val failureModel = - if (operationalPhenomena.failureFrequency > 0) + if (operationalPhenomena.failureFrequency > 0) { grid5000(Duration.ofSeconds((operationalPhenomena.failureFrequency * 60).roundToLong())) - else + } else { null + } service.replay(clock, vms, seed, failureModel = failureModel, interference = operationalPhenomena.hasInterference) } diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/topology/TopologyFactories.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/topology/TopologyFactories.kt index c78925a1..08d4a7e0 100644 --- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/topology/TopologyFactories.kt +++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/topology/TopologyFactories.kt @@ -21,6 +21,7 @@ */ @file:JvmName("TopologyFactories") + package org.opendc.experiments.capelin.topology import org.opendc.experiments.compute.topology.HostSpec diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt index b39f68fd..70363b6c 100644 --- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt @@ -98,7 +98,7 @@ class CapelinIntegrationTest { provisioner.runSteps( setupComputeService(serviceDomain = "compute.opendc.org", { computeScheduler }), registerComputeMonitor(serviceDomain = "compute.opendc.org", monitor), - setupHosts(serviceDomain = "compute.opendc.org", topology), + setupHosts(serviceDomain = "compute.opendc.org", topology) ) val service = provisioner.registry.resolve("compute.opendc.org", ComputeService::class.java)!! @@ -124,7 +124,7 @@ class CapelinIntegrationTest { { assertEquals(66977508, monitor.activeTime) { "Incorrect active time" } }, { assertEquals(3160381, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, - { assertEquals(5.840939264814157E9, monitor.energyUsage, 0.01) { "Incorrect power draw" } }, + { assertEquals(5.840939264814157E9, monitor.energyUsage, 0.01) { "Incorrect power draw" } } ) } @@ -142,7 +142,7 @@ class CapelinIntegrationTest { provisioner.runSteps( setupComputeService(serviceDomain = "compute.opendc.org", { computeScheduler }), registerComputeMonitor(serviceDomain = "compute.opendc.org", monitor), - setupHosts(serviceDomain = "compute.opendc.org", topology), + setupHosts(serviceDomain = "compute.opendc.org", topology) ) val service = provisioner.registry.resolve("compute.opendc.org", ComputeService::class.java)!! @@ -181,7 +181,7 @@ class CapelinIntegrationTest { provisioner.runSteps( setupComputeService(serviceDomain = "compute.opendc.org", { computeScheduler }), registerComputeMonitor(serviceDomain = "compute.opendc.org", monitor), - setupHosts(serviceDomain = "compute.opendc.org", topology), + setupHosts(serviceDomain = "compute.opendc.org", topology) ) val service = provisioner.registry.resolve("compute.opendc.org", ComputeService::class.java)!! @@ -220,7 +220,7 @@ class CapelinIntegrationTest { provisioner.runSteps( setupComputeService(serviceDomain = "compute.opendc.org", { computeScheduler }), registerComputeMonitor(serviceDomain = "compute.opendc.org", monitor), - setupHosts(serviceDomain = "compute.opendc.org", topology), + setupHosts(serviceDomain = "compute.opendc.org", topology) ) val service = provisioner.registry.resolve("compute.opendc.org", ComputeService::class.java)!! @@ -233,7 +233,7 @@ class CapelinIntegrationTest { { assertEquals(8539158, monitor.activeTime) { "Active time incorrect" } }, { assertEquals(0, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, - { assertEquals(2328039558, monitor.uptime) { "Uptime incorrect" } }, + { assertEquals(2328039558, monitor.uptime) { "Uptime incorrect" } } ) } diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSchedulers.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSchedulers.kt index 9ed2e564..bbc70489 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSchedulers.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSchedulers.kt @@ -21,6 +21,7 @@ */ @file:JvmName("ComputeSchedulers") + package org.opendc.experiments.compute import org.opendc.compute.service.scheduler.ComputeScheduler diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSteps.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSteps.kt index 3ae4b0df..690156e2 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSteps.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeSteps.kt @@ -21,6 +21,7 @@ */ @file:JvmName("ComputeSteps") + package org.opendc.experiments.compute import org.opendc.compute.service.ComputeService diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloadLoader.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloadLoader.kt index daf6b505..9aa544cb 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloadLoader.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloadLoader.kt @@ -116,7 +116,6 @@ public class ComputeWorkloadLoader(private val baseDir: File) { return try { while (reader.nextRow()) { - val id = reader.getString(idCol)!! if (!fragments.containsKey(id)) { continue @@ -195,7 +194,6 @@ public class ComputeWorkloadLoader(private val baseDir: File) { val ref = cache.compute(name) { key, oldVal -> val inst = oldVal?.get() if (inst == null) { - val path = baseDir.resolve(key) logger.info { "Loading trace $key at $path" } diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloads.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloads.kt index 732f761e..4b3a6089 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloads.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/ComputeWorkloads.kt @@ -21,6 +21,7 @@ */ @file:JvmName("ComputeWorkloads") + package org.opendc.experiments.compute import org.opendc.experiments.compute.internal.CompositeComputeWorkload diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/FailureModels.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/FailureModels.kt index 7480e116..ff747066 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/FailureModels.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/FailureModels.kt @@ -21,6 +21,7 @@ */ @file:JvmName("FailureModels") + package org.opendc.experiments.compute import org.apache.commons.math3.distribution.LogNormalDistribution diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/TraceHelpers.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/TraceHelpers.kt index 9562baf5..e98636fa 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/TraceHelpers.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/TraceHelpers.kt @@ -21,6 +21,7 @@ */ @file:JvmName("TraceHelpers") + package org.opendc.experiments.compute import kotlinx.coroutines.coroutineScope diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetHostDataWriter.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetHostDataWriter.kt index df0163d2..979aebeb 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetHostDataWriter.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetHostDataWriter.kt @@ -206,7 +206,7 @@ public class ParquetHostDataWriter(path: File, bufferSize: Int) : .named("guests_error"), Types .required(PrimitiveType.PrimitiveTypeName.INT32) - .named("guests_invalid"), + .named("guests_invalid") ) .named("host") } diff --git a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetServiceDataWriter.kt b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetServiceDataWriter.kt index 6f1d5ad5..39bc2d11 100644 --- a/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetServiceDataWriter.kt +++ b/opendc-experiments/opendc-experiments-compute/src/main/kotlin/org/opendc/experiments/compute/export/parquet/ParquetServiceDataWriter.kt @@ -124,7 +124,7 @@ public class ParquetServiceDataWriter(path: File, bufferSize: Int) : .named("attempts_failure"), Types .required(PrimitiveType.PrimitiveTypeName.INT32) - .named("attempts_error"), + .named("attempts_error") ) .named("service") } diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt index 301ea8c3..3b4200c8 100644 --- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt +++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt @@ -51,10 +51,11 @@ public class FaaSServiceProvisioningStep internal constructor( private val coldStartModel: ColdStartModel? ) : ProvisioningStep { override fun apply(ctx: ProvisioningContext): AutoCloseable { - val delayInjector = if (coldStartModel != null) + val delayInjector = if (coldStartModel != null) { StochasticDelayInjector(coldStartModel, Random(ctx.seeder.nextLong())) - else + } else { ZeroDelayInjector + } val deployer = SimFunctionDeployer(ctx.coroutineContext, ctx.clock, machineModel, delayInjector) val service = FaaSService( ctx.coroutineContext, diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt index 40e5627b..53cd9c3e 100644 --- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt +++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt @@ -21,6 +21,7 @@ */ @file:JvmName("FaaSSteps") + package org.opendc.experiments.faas import org.opendc.experiments.provisioner.ProvisioningContext diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt index cf278606..c4001e2e 100644 --- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt +++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt @@ -21,6 +21,7 @@ */ @file:JvmName("TraceHelpers") + package org.opendc.experiments.faas import kotlinx.coroutines.coroutineScope diff --git a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt index 6f212825..2342c3f6 100644 --- a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt +++ b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt @@ -70,7 +70,7 @@ class FaaSExperiment { assertAll( { assertEquals(14, stats.totalInvocations) }, { assertEquals(2, stats.timelyInvocations) }, - { assertEquals(12, stats.delayedInvocations) }, + { assertEquals(12, stats.delayedInvocations) } ) } } diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt index 9b50758b..c71c4520 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt @@ -71,7 +71,8 @@ public class SimTFDevice( * The [SimMachine] representing the device. */ private val machine = SimBareMetalMachine( - FlowEngine(scope.coroutineContext, clock), MachineModel(listOf(pu), listOf(memory)), + FlowEngine(scope.coroutineContext, clock), + MachineModel(listOf(pu), listOf(memory)), SimplePowerDriver(powerModel) ) diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/conv/Conv2D.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/conv/Conv2D.kt index bf4725b7..74124bbd 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/conv/Conv2D.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/conv/Conv2D.kt @@ -39,7 +39,7 @@ public class Conv2D( public val strides: LongArray = LongArray(4), // [1, stride_h, stride_w, 1] public val activation: Activation = Activation.Relu, public val padding: ConvPadding = ConvPadding.VALID, - name: String = "", + name: String = "" ) : Layer(name) { private var padHeight: Double = 0.0 diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/core/ActivationLayer.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/core/ActivationLayer.kt index fd25cea6..60b0f754 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/core/ActivationLayer.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/layer/core/ActivationLayer.kt @@ -31,7 +31,7 @@ import org.opendc.experiments.tf20.keras.shape.TensorShape */ public class ActivationLayer( public val activation: Activation = Activation.Relu, - name: String = "", + name: String = "" ) : Layer(name) { override fun build(inputShape: TensorShape) { 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 f5d35fa4..c4698058 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 @@ -46,7 +46,12 @@ class TensorFlowTest { val def = MLEnvironmentReader().readEnvironment(envInput).first() val device = SimTFDevice( - def.uid, def.meta["gpu"] as Boolean, coroutineContext, clock, def.model.cpus[0], def.model.memory[0], + def.uid, + def.meta["gpu"] as Boolean, + coroutineContext, + clock, + def.model.cpus[0], + def.model.memory[0], LinearPowerModel(250.0, 60.0) ) val strategy = OneDeviceStrategy(device) @@ -76,7 +81,12 @@ class TensorFlowTest { val def = MLEnvironmentReader().readEnvironment(envInput).first() val device = SimTFDevice( - def.uid, def.meta["gpu"] as Boolean, coroutineContext, clock, def.model.cpus[0], def.model.memory[0], + def.uid, + def.meta["gpu"] as Boolean, + coroutineContext, + clock, + def.model.cpus[0], + def.model.memory[0], LinearPowerModel(250.0, 60.0) ) val strategy = OneDeviceStrategy(device) @@ -106,12 +116,22 @@ class TensorFlowTest { val def = MLEnvironmentReader().readEnvironment(envInput).first() val deviceA = SimTFDevice( - def.uid, def.meta["gpu"] as Boolean, coroutineContext, clock, def.model.cpus[0], def.model.memory[0], + def.uid, + def.meta["gpu"] as Boolean, + coroutineContext, + clock, + def.model.cpus[0], + def.model.memory[0], LinearPowerModel(250.0, 60.0) ) val deviceB = SimTFDevice( - UUID.randomUUID(), def.meta["gpu"] as Boolean, coroutineContext, clock, def.model.cpus[0], def.model.memory[0], + UUID.randomUUID(), + def.meta["gpu"] as Boolean, + coroutineContext, + clock, + def.model.cpus[0], + def.model.memory[0], LinearPowerModel(250.0, 60.0) ) diff --git a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/TraceHelpers.kt b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/TraceHelpers.kt index d1009d44..2ae69949 100644 --- a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/TraceHelpers.kt +++ b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/TraceHelpers.kt @@ -21,6 +21,7 @@ */ @file:JvmName("TraceHelpers") + package org.opendc.experiments.workflow import kotlinx.coroutines.coroutineScope @@ -65,10 +66,11 @@ public fun Trace.toJobs(): List { val workflow = jobs.computeIfAbsent(workflowId) { id -> Job(UUID(0L, id), "", HashSet(), HashMap()) } val id = reader.getString(TASK_ID)!!.toLong() - val grantedCpus = if (reader.resolve(TASK_ALLOC_NCPUS) != 0) + val grantedCpus = if (reader.resolve(TASK_ALLOC_NCPUS) != 0) { reader.getInt(TASK_ALLOC_NCPUS) - else + } else { reader.getInt(TASK_REQ_NCPUS) + } val submitTime = reader.getInstant(TASK_SUBMIT_TIME)!! val runtime = reader.getDuration(TASK_RUNTIME)!! val flops: Long = 4000 * runtime.seconds * grantedCpus @@ -81,7 +83,7 @@ public fun Trace.toJobs(): List { "workload" to workload, WORKFLOW_TASK_CORES to grantedCpus, WORKFLOW_TASK_DEADLINE to runtime.toMillis() - ), + ) ) tasks[id] = task diff --git a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSchedulerSpec.kt b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSchedulerSpec.kt index cb8056a7..8bd087e7 100644 --- a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSchedulerSpec.kt +++ b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSchedulerSpec.kt @@ -36,5 +36,5 @@ public data class WorkflowSchedulerSpec( val jobAdmissionPolicy: JobAdmissionPolicy, val jobOrderPolicy: JobOrderPolicy, val taskEligibilityPolicy: TaskEligibilityPolicy, - val taskOrderPolicy: TaskOrderPolicy, + val taskOrderPolicy: TaskOrderPolicy ) diff --git a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowServiceProvisioningStep.kt b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowServiceProvisioningStep.kt index a2d6a172..5cee9abf 100644 --- a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowServiceProvisioningStep.kt +++ b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowServiceProvisioningStep.kt @@ -54,7 +54,7 @@ public class WorkflowServiceProvisioningStep internal constructor( jobAdmissionPolicy = scheduler.jobAdmissionPolicy, jobOrderPolicy = scheduler.jobOrderPolicy, taskEligibilityPolicy = scheduler.taskEligibilityPolicy, - taskOrderPolicy = scheduler.taskOrderPolicy, + taskOrderPolicy = scheduler.taskOrderPolicy ) ctx.registry.register(serviceDomain, WorkflowService::class.java, service) diff --git a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSteps.kt b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSteps.kt index 7aae3a9f..87c743f0 100644 --- a/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSteps.kt +++ b/opendc-experiments/opendc-experiments-workflow/src/main/kotlin/org/opendc/experiments/workflow/WorkflowSteps.kt @@ -21,6 +21,7 @@ */ @file:JvmName("WorkflowSteps") + package org.opendc.experiments.workflow import org.opendc.experiments.provisioner.ProvisioningStep -- cgit v1.2.3