From d4c1d8468a17eb7adf8bf20949c2fdc4b2f93fec Mon Sep 17 00:00:00 2001 From: Radu Nicolae Date: Mon, 22 Apr 2024 13:51:39 +0200 Subject: Merged scenario and portfolio (#220) * sync with the master branch * rebase * multimodel - simulation is currently run as many times as you can see a model * factory method - handles models without given params * removed redundant flags * modelType * flags removed * implemented output into a folder * multimodel ipynb setup - to be implemented and also ran as a python script, when the simulation occurs * towards a mutimodel python implementation - issue observed - the saved files have same data? * json parsing handles now lists for topology, workloads, allocaitonPolicies, powerModels * scenarioFile inputs lists, and creates multiple combinations of scenarios * multi-model prediction repaired, now we predict using multiple models * commit before removing powerModel from scenario * commit after removing powerModel from scenario * commit after removing powerModel from scenario (and actually running) * powermodels now can output their name and full name (with min and max) * now we can select where to output (seed or output folder) * input files - clear naming + output naming improved * minimal changes * all tests passing + json files from tests updated to the new json format * json files from topology now accept only one power model (instead of list) * json files from topology now accept only one power model (instead of list) * multi and single input from tests updated to match the format * tests passed locally * spotless applies * demo folder removed --- .../bitbrains-small/interference-model.json | 21 ------- .../resources/bitbrains-small/trace/meta.parquet | Bin 2723 -> 0 bytes .../resources/bitbrains-small/trace/trace.parquet | Bin 2163354 -> 0 bytes .../src/main/resources/env/multi.json | 66 --------------------- .../src/main/resources/env/single.json | 26 -------- .../src/main/resources/log4j2.xml | 43 -------------- .../src/main/resources/portfolio.json | 31 ---------- 7 files changed, 187 deletions(-) delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml delete mode 100644 opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json (limited to 'opendc-experiments/opendc-experiments-portfolio/src/main/resources') diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json deleted file mode 100644 index 51fc6366..00000000 --- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "vms": [ - "141", - "379", - "851", - "116" - ], - "minServerLoad": 0.0, - "performanceScore": 0.8830158730158756 - }, - { - "vms": [ - "205", - "116", - "463" - ], - "minServerLoad": 0.0, - "performanceScore": 0.7133055555552751 - } -] diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet deleted file mode 100644 index 9cded35f..00000000 Binary files a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet deleted file mode 100644 index 9d953956..00000000 Binary files a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json deleted file mode 100644 index 721005b0..00000000 --- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpus": - [ - { - "coreCount": 32, - "coreSpeed": 3200 - } - ], - "memory": { - "memorySize": 256000 - } - } - ] - }, - { - "name": "C02", - "hosts" : - [ - { - "name": "H02", - "count": 6, - "cpus": - [ - { - "coreCount": 8, - "coreSpeed": 2930 - } - ], - "memory": { - "memorySize": 64000 - } - } - ] - }, - { - "name": "C03", - "hosts" : - [ - { - "name": "H03", - "count": 2, - "cpus": - [ - { - "coreCount": 16, - "coreSpeed": 3200 - } - ], - "memory": { - "memorySize": 128000 - } - } - ] - } - ] -} - - diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json deleted file mode 100644 index a1c8d95a..00000000 --- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpus": - [ - { - "coreCount": 8, - "coreSpeed": 3200 - } - ], - "memory": { - "memorySize": 128000 - } - } - ] - } - ] -} - - diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml deleted file mode 100644 index e479f2ca..00000000 --- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json deleted file mode 100644 index a1320b39..00000000 --- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "scenarios": [ - { - "runs": 5, - "topology": { - "pathToFile": "resources/env/single.json" - }, - "workload": { - "pathToFile": "resources/bitbrains-small", - "type": "ComputeWorkload" - }, - "allocationPolicy": { - "policyType": "Mem" - } - }, - { - "runs": 5, - "name": "TESTTTT", - "topology": { - "pathToFile": "resources/env/single.json" - }, - "workload": { - "pathToFile": "resources/bitbrains-small", - "type": "ComputeWorkload" - }, - "allocationPolicy": { - "policyType": "Mem" - } - } - ] -} -- cgit v1.2.3