diff --git a/docs/Model Plugin Configuration.md b/docs/Model Plugin Configuration.md index f03855c29..c4e2104f0 100644 --- a/docs/Model Plugin Configuration.md +++ b/docs/Model Plugin Configuration.md @@ -54,15 +54,15 @@ backend: - timestamp: 2023-07-06T00:00 duration: 5 cpu-util: 33 - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 - timestamp: 2023-07-06T00:05 duration: 5 cpu-util: 23 - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 - timestamp: 2023-07-06T00:10 duration: 5 cpu-util: 11 - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 ``` In the above example, the model requires the *processor* to calculate each observation. So, every observation has the processor as one of its parameters. @@ -81,7 +81,7 @@ graph: - model-1 config: model-1: - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 tdp: 200 observations: - timestamp: 2023-07-06T00:00 @@ -99,13 +99,13 @@ graph: - model-1 config: model-1: - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 tdp: 200 observations: - timestamp: 2023-07-06T00:00 duration: 5 cpu: 33 - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 tdp: 200 ``` @@ -179,7 +179,7 @@ graph: config: model-1: verbose: false - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 backend: pipeline: - model-1 @@ -200,7 +200,7 @@ graph: config: model-1: verbose: false - processor: Intel Xeon Platinum 8175 + physical-processor: Intel Xeon Platinum 8175 backend: pipeline: - model-1 @@ -214,7 +214,7 @@ backend: cpu: 33 verbose::model-1: true # set on both levels, but only the closest value taken region::model-1: west-us # set just on component node - processor::model-1: Intel Xeon Platinum 8175 # set on root node + physical-processor::model-1: Intel Xeon Platinum 8175 # set on root node ``` The verbose param is set on two levels of the graph, but the lower level config overrides the higher level config. @@ -228,5 +228,5 @@ observations: cpu: 33 verbose: true # set on both levels, but only the closest value taken region: west-us # set just on component node - processor: Intel Xeon Platinum 8175 # set on the root node + physical-processor: Intel Xeon Platinum 8175 # set on the root node ``` \ No newline at end of file diff --git a/examples/impls/boavizta.yml b/examples/impls/boavizta.yml index c43fbbf70..c447991fb 100644 --- a/examples/impls/boavizta.yml +++ b/examples/impls/boavizta.yml @@ -20,7 +20,7 @@ graph: config: boavizta-cpu: core-units: 24 - processor: Intel® Core™ i7-1185G7 + physical-processor: Intel® Core™ i7-1185G7 observations: - timestamp: 2023-07-06T00:00 # [KEYWORD] [NO-SUBFIELDS] time when measurement occurred duration: 3600 # Secs diff --git a/examples/impls/dow_msft.yml b/examples/impls/dow_msft.yml index ee0db4a8e..6038c2258 100644 --- a/examples/impls/dow_msft.yml +++ b/examples/impls/dow_msft.yml @@ -41,7 +41,7 @@ graph: - sci # add cpu and memory components and convert to f.unit config: teads-curve: # use tdp to derive e-cpu (kwh) - processor: Intel-xeon-platinum-8380 + physical-processor: Intel-xeon-platinum-8380 tdp: 270 emem: # mem-util * mem-alloc * mem-energy = emem (kwh) mem-alloc: 32 # GB @@ -90,7 +90,7 @@ graph: tiger-api-cpu: # a leaf component config: teads-curve: - processor: Intel-xeon-platinum-8270 + physical-processor: Intel-xeon-platinum-8270 tdp: 205 emem: mem_alloc: 1.75 @@ -143,7 +143,7 @@ graph: neo4j-api-cpu: # a leaf component config: teads-curve: - processor: Intel-xeon-platinum-8270 + physical-processor: Intel-xeon-platinum-8270 tdp: 205 emem: mem-alloc: 1.75 # GB diff --git a/examples/impls/msft-eshoppen.yaml b/examples/impls/msft-eshoppen.yaml index 572b38b0e..eb25c8e30 100644 --- a/examples/impls/msft-eshoppen.yaml +++ b/examples/impls/msft-eshoppen.yaml @@ -57,7 +57,7 @@ graph: sci-o: grid-ci: 951 # gCO2e/kWh e-cpu: - processor: Intel® Core™ i7-1185G7 + physical-processor: Intel® Core™ i7-1185G7 tdp: 28 # W tdp-coeff: 0.12 n-hours: 1 @@ -87,7 +87,7 @@ graph: sci-o: grid-ci: 951 # gCO2e/kWh e-cpu: - processor: Intel® Xeon® Platinum 8272CL + physical-processor: Intel® Xeon® Platinum 8272CL tdp: 205 tdp-coeff: 0.32 n-hours: 1 @@ -120,7 +120,7 @@ graph: e-cpu: n-hours: 1 n-chips: 1 - processor: Intel® Xeon® Platinum 8160 + physical-processor: Intel® Xeon® Platinum 8160 tdp: 150 # W tdp-coeff: 0.32 sci: diff --git a/examples/impls/msft-green-ai.yaml b/examples/impls/msft-green-ai.yaml index cc4646a53..d3d19e5a5 100644 --- a/examples/impls/msft-green-ai.yaml +++ b/examples/impls/msft-green-ai.yaml @@ -27,7 +27,7 @@ graph: - sci config: sci-o: - processor: nvidia-t4-nc16as-v3 + physical-processor: nvidia-t4-nc16as-v3 grid-ci: 1 # data not provided in case study embodied-carbon: 0 sci: @@ -45,7 +45,7 @@ graph: - sci config: sci-o: - processor: nvidia-t4-nc16as-v3 + physical-processor: nvidia-t4-nc16as-v3 grid-ci: 1 # data not provided in case study embodied-carbon: 0 sci: diff --git a/src/config/units.yaml b/src/config/units.yaml index 8600d89c8..d704215ae 100644 --- a/src/config/units.yaml +++ b/src/config/units.yaml @@ -90,7 +90,7 @@ pe.use: description: Primary energy associated with component use (returned from Boavizta) unit: kWh aggregation: sum -processor: +physical-processor: description: Name of the physical processor unit: None aggregation: None diff --git a/src/lib/boavizta/index.test.ts b/src/lib/boavizta/index.test.ts index 33cf8b33a..56376b760 100644 --- a/src/lib/boavizta/index.test.ts +++ b/src/lib/boavizta/index.test.ts @@ -80,7 +80,7 @@ describe('cpu:initialize with params', () => { const impactModel = new BoaviztaCpuImpactModel(); await expect( impactModel.configure('test', { - processor: 'Intel Xeon Gold 6138f', + 'physical-processor': 'Intel Xeon Gold 6138f', 'core-units': 24, location: 'USA', }) diff --git a/src/lib/boavizta/index.ts b/src/lib/boavizta/index.ts index 00a696a93..05782fd20 100644 --- a/src/lib/boavizta/index.ts +++ b/src/lib/boavizta/index.ts @@ -185,7 +185,7 @@ export class BoaviztaCpuImpactModel staticParams.verbose = undefined; } - if (!('processor' in staticParams)) { + if (!('physical-processor' in staticParams)) { throw new Error('Improper configure: Missing processor parameter'); } diff --git a/src/types/models-universe.ts b/src/types/models-universe.ts index b0e34ad8e..e075222b8 100644 --- a/src/types/models-universe.ts +++ b/src/types/models-universe.ts @@ -7,7 +7,7 @@ type InitializeOptions = { export type GraphOptions = { 'core-units': number; - processor: string; + 'physical-processor': string; }; export type ImplInitializeModel = {