Merge branch 'main' into if-env

Green-Software-Foundation · Jun 20, 2024 · f3cd231 · f3cd231
2 parents 041098c + a4688fd
commit f3cd231
Show file tree

Hide file tree

Showing 43 changed files with 677 additions and 300 deletions.
diff --git a/manifests/bugs/aggregation-error-wrong-metric.yml b/manifests/bugs/aggregation-error-wrong-metric.yml
@@ -12,15 +12,23 @@ initialize:
       method: TeadsCurve
       global-config:
         interpolation: spline
-    "sci-e":
-      path: "@grnsft/if-plugins"
-      method: SciE
+    "sum-energy-components":
+      path: "builtin"
+      method: Sum
+      global-config:
+        input-parameters:
+          - cpu/energy
+          - network/energy
+        output-parameter: energy
     "sci-embodied":
       path: "builtin"
       method: SciEmbodied
-    "sci-o":
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "sci":
       path: "builtin"
       method: Sci
@@ -43,9 +51,9 @@ tree:
     child-1:
       pipeline:
         - teads-curve
-        - sci-e
+        - sum-energy-components
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - time-sync
         - sci
       config:

diff --git a/manifests/bugs/azure-importer-ignoring-defaults.yml b/manifests/bugs/azure-importer-ignoring-defaults.yml
@@ -28,9 +28,12 @@ initialize:
         input-parameter: network/energy
         coefficient: 1000
         output-parameter: network/energy
-    "sci-o":
-      method: SciO
-      path: "@grnsft/if-plugins"
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "group-by":
       path: "builtin"
       method: GroupBy

diff --git a/manifests/bugs/azure-importer-incorrect-calculation.yml b/manifests/bugs/azure-importer-incorrect-calculation.yml
@@ -20,9 +20,12 @@ initialize:
         input-parameter: network/energy
         coefficient: 1000
         output-parameter: network/energy
-    sci-o:
-      path: '@grnsft/if-plugins'
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     group-by:
       path: builtin
       method: GroupBy

diff --git a/manifests/bugs/pipeline-ordering-error.yml b/manifests/bugs/pipeline-ordering-error.yml
@@ -19,9 +19,12 @@ initialize:
     "sci-embodied":
       path: "builtin"
       method: SciEmbodied
-    "sci-o":
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu/energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "sci":
       path: "builtin"
       method: Sci
@@ -41,7 +44,7 @@ tree:
     child-1:
       pipeline:
         - teads-curve
-        - sci-o
+        - operational-carbon
         - sum
         - sci-embodied
         - time-sync

diff --git a/manifests/examples/basic.yml b/manifests/examples/basic.yml
diff --git a/manifests/examples/instance-metadata.yml b/manifests/examples/instance-metadata.yml
@@ -1,23 +1,6 @@
 name: csv-demo
-<<<<<<< add-tdp-manifest
 description:
 tags:
-initialize:
-  plugins:
-    cloud-instance-metadata:
-      method: CSVLookup
-      path: "builtin"
-      global-config:
-        filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv
-        query:
-          instance-class: "cloud/instance-type"
-        output: "*"
-    extract-processor-name:
-      method: Regex
-      path: "builtin"
-=======
-description: null
-tags: null
 initialize:
   plugins:
     cloud-instance-metadata:
@@ -32,16 +15,12 @@ initialize:
     extract-processor-name:
       path: builtin
       method: Regex
->>>>>>> main
       global-config:
         parameter: cpu-model-name
         match: /^([^,])+/g
         output: cpu/name
-<<<<<<< add-tdp-manifest
-=======
-  outputs:
-    - yaml
->>>>>>> main
+  # outputs:
+  #   - yaml
 tree:
   children:
     child:

diff --git a/manifests/examples/mock-cpu-util-to-carbon.yml b/manifests/examples/mock-cpu-util-to-carbon.yml
@@ -21,8 +21,14 @@ initialize:
       global-config:
         interpolation: spline  
     cloud-metadata:
-      method: CloudMetadata
-      path: "@grnsft/if-plugins"   
+      path: builtin
+      method: CSVLookup
+      global-config:
+        filepath: >-
+          https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv
+        query:
+          instance-class: cloud/instance-type
+        output: ['cpu-cores-utilized', 'vcpus-allocated']
     mock-observations:
       path: 'builtin'
       method: MockObservations

diff --git a/manifests/examples/nesting.yml b/manifests/examples/nesting.yml
@@ -29,9 +29,12 @@ initialize:
     sci-embodied:
       path: "builtin"
       method: SciEmbodied
-    sci-o:
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     sci:
       path: "builtin"
       method: Sci
@@ -68,7 +71,7 @@ tree:
         - teads-curve
         - sum
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - time-sync
         - sci

diff --git a/manifests/examples/pipeline-teads-sci.yml b/manifests/examples/pipeline-teads-sci.yml
@@ -19,9 +19,12 @@ initialize:
     "sci-embodied":
       path: "builtin"
       method: SciEmbodied
-    "sci-o":
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu/energy", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "sci":
       path: "builtin"
       method: Sci
@@ -50,7 +53,7 @@ tree:
         - teads-curve
         - sum
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - sci
       config: