-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
M3SA - Multi-Meta-Model Simulation Analyzer #251
Changes from 29 commits
52f3738
be9011f
1122bb4
42ff227
cf91362
f26cce2
8b7de0b
0932a99
918cc5c
3dd068a
3ba2843
c93cf01
70f4952
33ab751
864c1c4
2b67e2e
904faea
36fbcc7
1e401a9
b9107b1
8909923
2ef3776
5be1008
f129706
59fbd93
f73c1db
9da4144
bcf7d12
da6c2f4
82ca406
64ec4ab
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -115,3 +115,6 @@ gradle-app.setting | |
|
||
# Cache of project | ||
.gradletasknamecache | ||
|
||
# Demo files | ||
demo/* |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. m3sa should not touch ExperimentSpec There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is also unclear what m3saSetup does, and why it is needed in ExperimentCli There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please suggest a better alternative, what files to change and with which code There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [TOTALK#2] There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. m3saSetup in ExperimentSpec -- non mandatory to setup, but part of an experiment, used when parsing the JSON file. this is part of the JSON file parser. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Copyright (c) 2020 AtLarge Research | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
description = "Multi-Meta-Model Simulation Analysis (M3SA) used across OpenDC modules" | ||
|
||
// Build configuration | ||
plugins { | ||
`kotlin-library-conventions` | ||
} | ||
|
||
dependencies { | ||
api(libs.kotlinx.coroutines) | ||
|
||
testImplementation(projects.opendcSimulator.opendcSimulatorCore) | ||
api(projects.opendcCompute.opendcComputeService) | ||
api(projects.opendcCompute.opendcComputeSimulator) | ||
|
||
implementation(libs.clikt) | ||
|
||
implementation(project(":opendc-experiments:opendc-experiments-base")) | ||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") | ||
implementation(libs.progressbar) | ||
implementation(project(mapOf("path" to ":opendc-simulator:opendc-simulator-core"))) | ||
|
||
implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-workload"))) | ||
implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-telemetry"))) | ||
implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-topology"))) | ||
implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-carbon"))) | ||
implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-failure"))) | ||
|
||
runtimeOnly(libs.log4j.core) | ||
runtimeOnly(libs.log4j.slf4j) | ||
} | ||
|
||
sourceSets { | ||
main { | ||
kotlin.srcDirs("src/main/kotlin", "src/main/python") | ||
resources.srcDir("src/main/resources") | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright (c) 2024 AtLarge Research | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
import kotlin.io.path.Path | ||
|
||
/** | ||
* This constant variable should be changed depending on the root folder that is being run. | ||
* PATH_TO_PYTHON_MAIN should point to the main python file, ran when the analysis starts. | ||
*/ | ||
|
||
public val ANALYSIS_SCRIPTS_DIRECTORY: String = "./opendc-experiments/opendc-experiments-m3sa/src/main/python" | ||
public val ABSOLUTE_SCRIPT_PATH: String = | ||
Path("$ANALYSIS_SCRIPTS_DIRECTORY/main.py").toAbsolutePath().normalize().toString() | ||
public val SCRIPT_LANGUAGE: String = Path("$ANALYSIS_SCRIPTS_DIRECTORY/venv/bin/python3").toAbsolutePath().normalize().toString() | ||
|
||
public fun m3saAnalyze( | ||
outputFolderPath: String, | ||
m3saSetupPath: String, | ||
) { | ||
val process = | ||
ProcessBuilder( | ||
SCRIPT_LANGUAGE, | ||
ABSOLUTE_SCRIPT_PATH, | ||
outputFolderPath, | ||
m3saSetupPath, | ||
).directory(Path(ANALYSIS_SCRIPTS_DIRECTORY).toFile()) | ||
.start() | ||
|
||
val exitCode = process.waitFor() | ||
if (exitCode == 0) { | ||
println("[M3SA says] M3SA operation(s) completed successfully.") | ||
} else { | ||
val errors = process.errorStream.bufferedReader().readText() | ||
println("[M3SA says] Exit code $exitCode; Error(s): $errors") | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Copyright (c) 2022 AtLarge Research | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
@file:JvmName("M3SACli") | ||
|
||
package org.opendc.experiments.base.runner | ||
|
||
import com.github.ajalt.clikt.core.CliktCommand | ||
import com.github.ajalt.clikt.parameters.options.default | ||
import com.github.ajalt.clikt.parameters.options.defaultLazy | ||
import com.github.ajalt.clikt.parameters.options.option | ||
import com.github.ajalt.clikt.parameters.types.file | ||
import com.github.ajalt.clikt.parameters.types.int | ||
import m3saAnalyze | ||
import org.opendc.experiments.base.scenario.getExperiment | ||
import org.opendc.experiments.m3sa.scenario.getOutputFolder | ||
import java.io.File | ||
|
||
/** | ||
* Main entrypoint of the application. | ||
*/ | ||
public fun main(args: Array<String>): Unit = M3SACommand().main(args) | ||
|
||
/** | ||
* Represents the command for the Scenario experiments. | ||
*/ | ||
internal class M3SACommand : CliktCommand(name = "experiment") { | ||
/** | ||
* The path to the environment directory. | ||
*/ | ||
private val scenarioPath by option("--experiment-path", help = "path to experiment file") | ||
.file(canBeDir = false, canBeFile = true) | ||
.defaultLazy { File("resources/experiment.json") } | ||
|
||
/** | ||
* The number of threads to use for parallelism. | ||
*/ | ||
private val parallelism by option("-p", "--parallelism", help = "number of worker threads") | ||
.int() | ||
.default(Runtime.getRuntime().availableProcessors() - 1) | ||
|
||
private val m3saPath by option("-m", "--m3sa-setup-path", help = "path to m3sa setup file") | ||
.file(canBeDir = false, canBeFile = true) | ||
.defaultLazy { File("") } | ||
|
||
override fun run() { | ||
println("The provided m3saPath is $m3saPath") | ||
|
||
val experiment = getExperiment(scenarioPath) | ||
runExperiment(experiment, parallelism) | ||
|
||
if (m3saPath.toString().isNotEmpty()) { | ||
m3saAnalyze( | ||
outputFolderPath = getOutputFolder(scenarioPath), | ||
m3saSetupPath = m3saPath.toString(), | ||
) | ||
} else { | ||
println( | ||
"\n" + | ||
"===================================================\n" + | ||
"|M3SA path is not provided. Skipping M3SA analysis.|\n" + | ||
"===================================================", | ||
) | ||
} | ||
} | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As far as I can see, this file is not needed. You can just import runExperiment from experiment-base There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you want to do something different here at some point, you can create it later. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright (c) 2024 AtLarge Research | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
@file:JvmName("M3saCliKt") | ||
|
||
package org.opendc.experiments.base.runner | ||
|
||
import org.opendc.experiments.base.scenario.Scenario | ||
import java.util.concurrent.ForkJoinPool | ||
|
||
/** | ||
* Run scenario when no pool is available for parallel execution | ||
* | ||
* @param experiment The scenarios to run | ||
* @param parallelism The number of scenarios that can be run in parallel | ||
*/ | ||
public fun runExperiment( | ||
experiment: List<Scenario>, | ||
parallelism: Int, | ||
) { | ||
val ansiReset = "\u001B[0m" | ||
val ansiGreen = "\u001B[32m" | ||
val ansiBlue = "\u001B[34m" | ||
|
||
setupOutputFolderStructure(experiment[0].outputFolder) | ||
|
||
for (scenario in experiment) { | ||
val pool = ForkJoinPool(parallelism) | ||
println( | ||
"\n\n$ansiGreen================================================================================$ansiReset", | ||
) | ||
println("$ansiBlue Running scenario: ${scenario.name} $ansiReset") | ||
println("$ansiGreen================================================================================$ansiReset") | ||
runScenario( | ||
scenario, | ||
pool, | ||
) | ||
} | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why does this have to be a different file than just the ExperimentFactory? |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Copyright (c) 2024 AtLarge Research | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
package org.opendc.experiments.m3sa.scenario | ||
|
||
import org.opendc.experiments.base.scenario.ExperimentReader | ||
import java.io.File | ||
|
||
private val experimentReader = ExperimentReader() | ||
|
||
/** | ||
* Returns a list of Scenarios from a given file path (input). | ||
* | ||
* @param filePath The path to the file containing the scenario specifications. | ||
* @return A list of Scenarios. | ||
*/ | ||
public fun getOutputFolder(file: File): String { | ||
return experimentReader.read(file).outputFolder + "/outputs" | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does experiment-base implement m3sa?
As far as I understand, m3sa uses base, not the other way around.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both m3sa and experiment-base use, in one way or another, each other.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In which way does experiment-base use m3sa?
Also this would be circular importing, which is not possible.