Pipeline fixes

Signed-off-by: Gnanakeethan Balasubramaniam <[email protected]>
Green-Software-Foundation · Sep 13, 2023 · c4ea5b1 · c4ea5b1
1 parent 64f5480
commit c4ea5b1
Showing 1 changed file with 40 additions and 27 deletions.
diff --git a/examples/impls/msft-eshoppen.yaml b/examples/impls/msft-eshoppen.yaml
@@ -6,7 +6,7 @@ tags:
   category: cloud
 initialize:
   models:
-   - name: eshoppen-cpu # calculates e due to memory util ((mem-util * mem-allocated * mem-energy)/1000 = e-mem)
+    - name: eshoppen-cpu # calculates e due to memory util ((mem-util * mem-allocated * mem-energy)/1000 = e-mem)
       kind: e-cpu
       path: false
       verbose: false
@@ -21,47 +21,47 @@ initialize:
     - name: sci-e # sums e-cpu and e-mem
       kind: builtin
       path: ''
-      verbose: false  
+      verbose: false
     - name: sci-m # a model that calculates m from te, tir, el, rr and rtor
-      kind: builtin  
+      kind: builtin
       path: ''
       verbose: false
     - name: sci-o # takes in total e and outputs operational emissions
-      kind: builtin      
-      path: ''       
+      kind: builtin
+      path: ''
     - name: sci # sums SCI components and converts to f.unit
       kind: builtin
       path: ''
 graph:
   children:
     front-end:
-      pipeline: 
+      pipeline:
         - eshoppen-cpu # tdp & cpu -> energy
-        - eshoppen-mem # n-hour * n-chip * tdp-mem * tdp-coeff
+        - eshoppen-mem # n-hours * n-chips * tdp-mem * tdp-coeff
         - sci-m # duration & config -> embodied
         - sci-e # energy & grid-carbon-intensity & embodied -> carbon
         - sci-o # e -> c
         - sci # -> f.unit
       config:
         e-mem-tdp:
-          n-hour: 1
-          n-chip: 1
+          n-hours: 1
+          n-chips: 1
           tdp-mem: 12.16
           tdp-coeff: 0.12
         sci-m:
           te: 350 # kgCO2eq
           tir: 3600 # == the duration field
-          el: 126144000 # 4 years in seconds        
+          el: 126144000 # 4 years in seconds
           rr: 1
           tor: 1
         sci-o:
-          i: 951 # gCO2e/kWh
+          grid-ci: 951 # gCO2e/kWh
         e-cpu:
           processor: Intel® Core™ i7-1185G7
           tdp: 28 # W
           tdp-coeff: 0.12
-          n-hour: 1
-          n-chip: 1
+          n-hours: 1
+          n-chips: 1
         sci:
           time: hour # signal to convert /s -> /hr
           factor: 500 # factor to convert per time to per f.unit ()
@@ -70,26 +70,26 @@ graph:
           duration: 3600 # Secs
           cpu-util: 0
     app-server:
-      pipeline: # note: no e-mem calc applied here 
+      pipeline: # note: no e-mem calc applied here
         - eshoppen-cpu # tdp & cpu -> energy
         - sci-e # sums e components
         - sci-m # duration & config -> embodied
-        - sci-o # energy & grid-carbon-intensity & embodied -> carbon  
+        - sci-o # energy & grid-carbon-intensity & embodied -> carbon
       config:
         sci-m:
           te: 1205.52 # kgCO2eq
           tir: 3600 # == duration field
-          el: 126144000 # 4 years in seconds    
+          el: 126144000 # 4 years in seconds
           rr: 2 # using cores
           tor: 26 # the original report has a typo, says 16 but actually has 26 cores.
-        sci-c:
-          i: 951 # gCO2e/kWh
+        sci-o:
+          grid-ci: 951 # gCO2e/kWh
         e-cpu:
           processor: Intel® Xeon® Platinum 8272CL
           tdp: 205
           tdp-coeff: 0.32
-          n-hour: 1
-          n-chip: 1
+          n-hours: 1
+          n-chips: 1
         sci:
           time: hour # signal to convert /s -> /hr
           factor: 500 # factor to convert per time to per f.unit ()
@@ -102,20 +102,22 @@ graph:
         - eshoppen-cpu # tdp & cpu & duration-> energy
         - sci-e # sums e-components
         - sci-m # duration & config -> embodied
-        - sci-o # energy & grid-carbon-intensity & embodied -> carbon  
+        - sci-o # energy & grid-carbon-intensity & embodied -> carbon
       config:
+        sci-o:
+          grid-ci: 1000 # gCO2e/kWh
         sci-m:
           te: 1433.12 # kgCO2eq
           tir: 3600 # == duration field
-          el: 126144000 # 4 years in seconds    
+          el: 126144000 # 4 years in seconds
           rr: 2 # using cores
-          tor: 24 # total cores  
+          tor: 24 # total cores
         sci-c:
           i: 951
         e-cpu:
-          n-hour: 1
-          n-chip: 1
-          processor:  Intel® Xeon® Platinum 8160
+          n-hours: 1
+          n-chips: 1
+          processor: Intel® Xeon® Platinum 8160
           tdp: 150 # W
           tdp-coeff: 0.32
         sci:
@@ -125,17 +127,28 @@ graph:
         - timestamp: 2023-07-06T00:00 # [KEYWORD] [NO-SUBFIELDS] time when measurement occurred
           duration: 3600
           cpu-util: 10
+          grid-ci: 1000
     network:
-      pipeline: 
+      pipeline:
         - eshoppen-net
         - sci-e # sums e components
+        - sci-o
+        - sci-m
         - sci
       config:
+        sci-m:
+          te: 1433.12 # kgCO2eq
+          tir: 3600 # == duration field
+          el: 126144000 # 4 years in seconds
+          rr: 2 # using cores
+          tor: 24 # total cores
         e-net:
           net-energy: 0.001 #kwh/GB
         sci:
           time: hour
           factor: 500
+        sci-o:
+          grid-ci: 1000
       observations:
         - timestamp: 2023-07-06T00:00
           duration: 3600