Merge pull request #787 from mlco2/cpu_AMD_EPYC_7R13

benoit-cty · web-flow · commit ab080e6bfe11 · 2025-02-20T16:34:09.000+01:00
Add AMD EPYC 7R13
diff --git a/codecarbon/_version.py b/codecarbon/_version.py
@@ -1 +1 @@
-__version__ = "3.0.0_rc2"
+__version__ = "3.0.0_rc3"
diff --git a/codecarbon/data/hardware/cpu_power.csv b/codecarbon/data/hardware/cpu_power.csv
@@ -581,6 +581,7 @@ AMD EPYC 7F32,180
 AMD EPYC 7F52,240
 AMD EPYC 7F72,240
 AMD EPYC 7H12,280
+AMD EPYC 7R13,225
 AMD EPYC 8024P,90
 AMD EPYC 8024PN,80
 AMD EPYC 8124P,125
diff --git a/codecarbon/external/hardware.py b/codecarbon/external/hardware.py
@@ -213,15 +213,15 @@ def _get_power_from_cpu_load(self):
             cpu_load = psutil.cpu_percent(interval=0.5)
             power = self._calculate_power_from_cpu_load(tdp, cpu_load, self._model)
             logger.debug(
-                f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power} W for whole machine."
+                f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power:1f} W for whole machine."
             )
         elif self._tracking_mode == "process":
             cpu_load = self._process.cpu_percent(interval=0.5) / self._cpu_count
             power = self._calculate_power_from_cpu_load(
                 self._tdp, cpu_load, self._model
             )
             logger.debug(
-                f"A TDP of {self._tdp} W and a CPU load of {cpu_load * 100:.1f}% give an estimation of {power} W for process {self._pid}."
+                f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power:1f} W for process {self._pid}."
             )
         else:
             raise Exception(f"Unknown tracking_mode {self._tracking_mode}")
diff --git a/docs/edit/conf.py b/docs/edit/conf.py
@@ -23,7 +23,7 @@
 author = "BCG GAMMA, Comet.ml, Haverford College, MILA, Data For Good"
 
 # The full version, including alpha/beta/rc tags
-release = "3.0.0_rc2"
+release = "3.0.0_rc3"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
@@ -183,7 +183,7 @@ include = [
 ]
 
 [tool.bumpver]
-current_version = "3.0.0_rc2"
+current_version = "3.0.0_rc3"
 version_pattern = "MAJOR.MINOR.PATCH[_TAGNUM]"
 
 [tool.bumpver.file_patterns]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "3.0.0_rc2"`
	`1`	`+__version__ = "3.0.0_rc3"`
Original file line number	Diff line number	Diff line change
`@@ -213,15 +213,15 @@ def _get_power_from_cpu_load(self):`
`213`	`213`	`cpu_load = psutil.cpu_percent(interval=0.5)`
`214`	`214`	`power = self._calculate_power_from_cpu_load(tdp, cpu_load, self._model)`
`215`	`215`	`logger.debug(`
`216`		`- f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power} W for whole machine."`
	`216`	`+ f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power:1f} W for whole machine."`
`217`	`217`	`)`
`218`	`218`	`elif self._tracking_mode == "process":`
`219`	`219`	`cpu_load = self._process.cpu_percent(interval=0.5) / self._cpu_count`
`220`	`220`	`power = self._calculate_power_from_cpu_load(`
`221`	`221`	`self._tdp, cpu_load, self._model`
`222`	`222`	`)`
`223`	`223`	`logger.debug(`
`224`		`- f"A TDP of {self._tdp} W and a CPU load of {cpu_load * 100:.1f}% give an estimation of {power} W for process {self._pid}."`
	`224`	`+ f"A TDP of {self._tdp} W and a CPU load of {cpu_load:.1f}% give an estimation of {power:1f} W for process {self._pid}."`
`225`	`225`	`)`
`226`	`226`	`else:`
`227`	`227`	`raise Exception(f"Unknown tracking_mode {self._tracking_mode}")`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ include = [`
`183`	`183`	`]`
`184`	`184`
`185`	`185`	`[tool.bumpver]`
`186`		`-current_version = "3.0.0_rc2"`
	`186`	`+current_version = "3.0.0_rc3"`
`187`	`187`	`version_pattern = "MAJOR.MINOR.PATCH[_TAGNUM]"`
`188`	`188`
`189`	`189`	`[tool.bumpver.file_patterns]`