Added Number of CPU cores to config

Author: kzscisoft

simvue/eco/config.py

@@ -31,6 +31,7 @@ class EcoConfig(pydantic.BaseModel):
 
     co2_signal_api_token: pydantic.SecretStr | None = None
     cpu_thermal_design_power: pydantic.PositiveInt | None = None
+    cpu_n_cores: pydantic.PositiveInt | None = None
     gpu_thermal_design_power: pydantic.PositiveInt | None = None
     local_data_directory: pydantic.DirectoryPath | None = pydantic.Field(
         None, validate_default=True

simvue/eco/emissions_monitor.py

@@ -42,6 +42,7 @@ class CO2Monitor(pydantic.BaseModel):
     """
 
     thermal_design_power_per_cpu: pydantic.PositiveFloat | None
+    n_cores_per_cpu: pydantic.PositiveInt | None
     thermal_design_power_per_gpu: pydantic.PositiveFloat | None
     local_data_directory: pydantic.DirectoryPath
     intensity_refresh_interval: int | None | str
@@ -87,6 +88,8 @@ def __init__(self, *args, **kwargs) -> None:
         ----------
         thermal_design_power_per_cpu: float | None
             the TDP value for each CPU, default is 80W.
+        n_cores_per_cpu: int | None
+            the number of cores in each CPU, default is 4.
         thermal_design_power_per_gpu: float | None
             the TDP value for each GPU, default is 130W.
         local_data_directory: pydantic.DirectoryPath
@@ -111,6 +114,12 @@ def __init__(self, *args, **kwargs) -> None:
                 "⚠️  No TDP value provided for current CPU, will use arbitrary value of 80W."
             )
 
+        if not isinstance(kwargs.get("n_cores_per_cpu"), float):
+            kwargs["n_cores_per_cpu"] = 4
+            _logger.warning(
+                "⚠️  No core count provided for current CPU, will use arbitrary value of 4."
+            )
+
         if not isinstance(kwargs.get("thermal_design_power_per_gpu"), float):
             kwargs["thermal_design_power_per_gpu"] = 130.0
             _logger.warning(
@@ -244,9 +253,9 @@ def estimate_co2_emissions(
         _process.gpu_percentage = gpu_percent
         _process.cpu_percentage = cpu_percent
         _previous_energy: float = _process.total_energy
-        _process.power_usage = (
-            _process.cpu_percentage / 100.0
-        ) * self.thermal_design_power_per_cpu
+        _process.power_usage = (_process.cpu_percentage / 100.0) * (
+            self.thermal_design_power_per_cpu / self.n_cores_per_cpu
+        )
 
         if _process.gpu_percentage and self.thermal_design_power_per_gpu:
             _process.power_usage += (