diff options
| author | Radu Nicolae <rnicolae04@gmail.com> | 2024-04-22 13:51:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 13:51:39 +0200 |
| commit | d4c1d8468a17eb7adf8bf20949c2fdc4b2f93fec (patch) | |
| tree | 3ab47cd41633615ae187c2a2923ac09ae48ccbd3 /opendc-experiments/opendc-experiments-portfolio/src/main/resources/env | |
| parent | d652fa2fa76556edd81d3b8087a0c943d462ec49 (diff) | |
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
Diffstat (limited to 'opendc-experiments/opendc-experiments-portfolio/src/main/resources/env')
| -rw-r--r-- | opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json | 66 | ||||
| -rw-r--r-- | opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json | 26 |
2 files changed, 0 insertions, 92 deletions
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 - } - } - ] - } - ] -} - - |