Merge pull request #1072 from mlco2/feat/rocm

AMD ROCm support

Author: benoit-cty

CONTRIBUTING.md

@@ -258,7 +258,7 @@ flake8...................................................................Passed
 
 If any of the linters/formatters fail, check the difference with `git diff`, add the differences if there is no behavior changes (isort and black might have change some coding style or import order, this is expected it is their job) with `git add` and finally try to commit again `git commit ...`.
 
-You can also run `pre-commit` with `uv run pre-commit run -v` if you have some changes staged but you are not ready yet to commit.
+You can also run `pre-commit` with `uv run pre-commit run --all-file` to check all file.
 
 
 <!-- TOC --><a name="dependencies-management"></a>
@@ -363,6 +363,18 @@ cp /data/tests/test_package_integrity.py .
 pytest test_package_integrity.py
 ```
 
+### Contribute to a fork branch
+
+When a user open a PR from a fork, we are allowed to push to the fork branch.
+
+If you want to do so, do the following:
+
+```bash
+git remote add <user_name> https://github.com/<user_name>/codecarbon.git
+git fetch <user_name> <git_branch>
+git checkout -b <git_branch> <user_name>/<git_branch>
+```
+
 <!-- TOC --><a name="api-and-dashboard"></a>
 ## API and Dashboard
 

codecarbon/cli/main.py

@@ -345,7 +345,8 @@ def monitor(
     if offline:
         if not country_iso_code:
             print(
-                "ERROR: country_iso_code is required for offline mode", file=sys.stderr
+                "ERROR: Country ISO code is required for offline mode. Add it to your configuration or provide it via the command line: `--country-iso-code FRA`",
+                file=sys.stderr,
             )
             raise typer.Exit(1)
 
@@ -358,7 +359,7 @@ def monitor(
         experiment_id = get_existing_local_exp_id()
         if api and experiment_id is None:
             print(
-                "ERROR: No experiment id, call 'codecarbon config' first.",
+                "ERROR: No experiment id, call 'codecarbon config' first. Or run in offline mode with `--offline --country-iso-code FRA` flag if you don't want to connect to the API.",
                 file=sys.stderr,
             )
             raise typer.Exit(1)

codecarbon/core/config.py

@@ -1,7 +1,7 @@
 import configparser
 import os
 from pathlib import Path
-from typing import List, Union
+from typing import List, Optional, Union
 
 from codecarbon.external.logger import logger
 
@@ -73,6 +73,43 @@ def parse_gpu_ids(gpu_ids: Union[str, List[int]]) -> List[str]:
         )
 
 
+def normalize_gpu_ids(
+    gpu_ids: Optional[Union[str, List[Union[int, str]]]],
+) -> Optional[List[Union[int, str]]]:
+    """
+    Normalize GPU IDs from config/user input into a list of ids consumable by hardware
+    resolution code.
+
+    Supports:
+    - comma-separated string values (sanitized via parse_gpu_ids)
+    - lists containing ints and/or strings
+    """
+    if gpu_ids is None:
+        return None
+
+    if isinstance(gpu_ids, str):
+        return parse_gpu_ids(gpu_ids)
+
+    if isinstance(gpu_ids, list):
+        normalized_gpu_ids: List[Union[int, str]] = []
+        for gpu_id in gpu_ids:
+            if isinstance(gpu_id, int):
+                normalized_gpu_ids.append(gpu_id)
+            elif isinstance(gpu_id, str):
+                normalized_gpu_ids.extend(parse_gpu_ids(gpu_id))
+            else:
+                logger.warning(
+                    "Ignoring invalid gpu_id entry of type %s; expected int or str.",
+                    type(gpu_id).__name__,
+                )
+        return normalized_gpu_ids
+
+    logger.warning(
+        "Invalid gpu_ids format. Expected a string or a list of ints/strings."
+    )
+    return None
+
+
 def get_hierarchical_config():
     """
     Get the user-defined codecarbon configuration ConfigParser dictionnary

codecarbon/core/cpu.py

@@ -17,7 +17,7 @@
 
 from codecarbon.core.rapl import RAPLFile
 from codecarbon.core.units import Time
-from codecarbon.core.util import detect_cpu_model
+from codecarbon.core.util import count_cpus, detect_cpu_model
 from codecarbon.external.logger import logger
 from codecarbon.input import DataSource
 
@@ -1001,7 +1001,7 @@ def _main(self) -> Tuple[str, int]:
             )
             if is_psutil_available():
                 # Count thread of the CPU
-                threads = psutil.cpu_count(logical=True)
+                threads = count_cpus()
                 estimated_tdp = threads * DEFAULT_POWER_PER_CORE
                 logger.warning(
                     f"We will use the default power consumption of {DEFAULT_POWER_PER_CORE} W per thread for your {threads} CPU, so {estimated_tdp}W."