Skip to content
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.

Sign up for GitHub

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

Simplify logic in SCI plugin #743

Merged
merged 12 commits into from
May 31, 2024
Merged

Simplify logic in SCI plugin #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
62dacb7
fix(lib): update readme for sci
jmcook1186 May 29, 2024
92f8b4b
fix(lib): simplify source code for sci
jmcook1186 May 29, 2024
e457331
fix(lib): update unit tetss for sci
jmcook1186 May 29, 2024
ea1ab6b
fix(lib): update plugin manifests
jmcook1186 May 29, 2024
c319356
fix(lib): update example manifests with new sci
jmcook1186 May 29, 2024
d512dd3
fix(lib): address review comments - refactor conditional statement an…
jmcook1186 May 31, 2024
c36bd6c
Update manifests/examples/nesting.yml
jmcook1186 May 31, 2024
98d6db3
Update src/builtins/sci/README.md
jmcook1186 May 31, 2024
b543961
feat(lib): add check that functional unit value is +ve int
jmcook1186 May 31, 2024
d4c8abf
feat(lib): add unit test to cover negative functional unit value
jmcook1186 May 31, 2024
249499c
Merge branch 'main' into simplify-sci
jmcook1186 May 31, 2024
188e5e7
Apply suggestions from code review
jmcook1186 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions manifests/examples/nesting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ aggregation:
type: "both"
params:
initialize:
#outputs: ['yaml']
outputs: ['yaml']
plugins:
teads-curve:
path: "@grnsft/if-unofficial-plugins"
Expand All @@ -37,7 +37,14 @@ initialize:
method: Sci
global-config:
functional-unit: "requests"
functional-unit-time: "1 minute"
"sum-carbon":
path: "builtin"
method: Sum
global-config:
input-parameters:
- carbon-operational
- carbon-embodied
output-parameter: carbon
time-sync:
method: TimeSync
path: "builtin"
Expand All @@ -62,6 +69,7 @@ tree:
- sum
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
inputs:
Expand All @@ -71,24 +79,28 @@ tree:
duration: 1
cpu/utilization: 50
network/energy: 0.000001
requests: 50
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 60
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 70
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
network/energy: 0.000001
requests: 55
child-1:
defaults:
cpu/thermal-design-power: 100
Expand All @@ -103,6 +115,7 @@ tree:
- sum
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
inputs:
Expand All @@ -112,24 +125,28 @@ tree:
duration: 1
cpu/utilization: 50
network/energy: 0.000001
requests: 10
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 90
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 30
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
network/energy: 0.000001
requests: 22
child-2:
children:
child-2-0:
Expand All @@ -146,6 +163,7 @@ tree:
- sum
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
inputs:
Expand All @@ -155,24 +173,28 @@ tree:
duration: 1
cpu/utilization: 50
network/energy: 0.000001
requests: 50
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 65
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 80
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
network/energy: 0.000001
requests: 40
child-2-1:
defaults:
cpu/thermal-design-power: 100
Expand All @@ -187,6 +209,7 @@ tree:
- sum
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
inputs:
Expand All @@ -196,21 +219,25 @@ tree:
duration: 1
cpu/utilization: 50
network/energy: 0.000001
requests: 50
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 50
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
network/energy: 0.000001
requests: 60
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
network/energy: 0.000001
requests: 40
14 changes: 11 additions & 3 deletions manifests/examples/pipeline-teads-sci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,15 @@ initialize:
path: "builtin"
method: Sci
global-config:
functional-unit: ""
functional-unit-time: "1-day"
functional-unit: "component"
"sum-carbon":
path: "builtin"
method: Sum
global-config:
input-parameters:
- carbon-operational
- carbon-embodied
output-parameter: carbon
"time-sync":
method: TimeSync
path: "builtin"
Expand All @@ -44,7 +51,7 @@ tree:
- sum
- sci-embodied
- sci-o
- time-sync
- sum-carbon
- sci
config:
defaults:
Expand All @@ -55,6 +62,7 @@ tree:
device/expected-lifespan: 94608000 # 3 years in seconds
resources-reserved: 1
resources-total: 8
component: 1
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
Expand Down
21 changes: 18 additions & 3 deletions manifests/examples/pipeline-with-aggregate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ initialize:
method: Sci
global-config:
functional-unit: "requests"
functional-unit-time: "1 minute"
"sum-carbon":
path: "builtin"
method: Sum
global-config:
input-parameters:
- carbon-operational
- carbon-embodied
output-parameter: carbon
"time-sync":
method: TimeSync
path: "builtin"
Expand All @@ -46,6 +53,7 @@ tree:
- sci-e
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
config:
Expand All @@ -61,34 +69,38 @@ tree:
device/expected-lifespan: 94608000 # 3 years in seconds
resources-reserved: 1
resources-total: 8
functional-unit-time: "1 min"
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
cloud/region: uk-west
duration: 1
cpu/utilization: 10
requests: 10
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
requests: 5
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
requests: 15
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
requests: 30
child-2:
pipeline:
- teads-curve
- sci-e
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
config:
Expand All @@ -104,25 +116,28 @@ tree:
device/expected-lifespan: 94608000 # 3 years in seconds
resources-reserved: 1
resources-total: 8
functional-unit-time: "1 min"
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
duration: 1
cpu/utilization: 30
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 28
cloud/instance-type: A1
cloud/region: uk-west
requests: 150
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 40
cloud/instance-type: A1
cloud/region: uk-west
requests: 110
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cpu/utilization: 33
cloud/instance-type: A1
cloud/region: uk-west
requests: 180
21 changes: 19 additions & 2 deletions manifests/examples/pipeline-with-mocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,19 @@ initialize:
"sci-o":
path: "@grnsft/if-plugins"
method: SciO
"sum-carbon":
path: "builtin"
method: Sum
global-config:
input-parameters:
- carbon-operational
- carbon-embodied
output-parameter: carbon
"sci":
path: "builtin"
method: Sci
global-config:
functional-unit: "requests"
functional-unit-time: "1 minute"
"time-sync":
method: TimeSync
path: "builtin"
Expand All @@ -56,7 +63,7 @@ initialize:
"group-by":
path: builtin
method: GroupBy
outputs: ['yaml']
# outputs: ['yaml']
tree:
children:
child-1:
Expand All @@ -65,6 +72,7 @@ tree:
- sci-e
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
config:
Expand All @@ -87,27 +95,32 @@ tree:
cloud/region: uk-west
duration: 1
cpu/utilization: 10
requests: 30
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
requests: 40
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
requests: 30
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
requests: 50
child-2:
pipeline:
- teads-curve
- sci-e
- sci-embodied
- sci-o
- sum-carbon
- time-sync
- sci
config:
Expand All @@ -130,18 +143,22 @@ tree:
cpu/utilization: 30
cloud/instance-type: A1
cloud/region: uk-west
requests: 30
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 28
cloud/instance-type: A1
cloud/region: uk-west
requests: 40
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 40
cloud/instance-type: A1
cloud/region: uk-west
requests: 50
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cpu/utilization: 33
cloud/instance-type: A1
cloud/region: uk-west
requests: 60
Loading