Merge remote-tracking branch 'upstream/master'

Author: cianc

codecarbon/data/private_infra/2023/canada_energy_mix.json

@@ -0,0 +1,171 @@
+{
+    "british columbia": {
+        "naturalGas": 2.8,
+        "nuclear": 0.0,
+        "petroleum": 0.1,
+        "biomass": 6.7,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.6,
+        "tidal": 0.0,
+        "total": 99.9,
+        "wind": 2.9,
+        "hydro": 86.8
+    },
+    "newfoundland and labrador": {
+        "naturalGas": 0.2,
+        "nuclear": 0.0,
+        "petroleum": 0.4,
+        "biomass": 0.0,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.0,
+        "tidal": 0.0,
+        "total": 100.0,
+        "wind": 0.4,
+        "hydro": 99.0
+    },
+    "saskatchewan": {
+        "naturalGas": 50.7,
+        "nuclear": 0.0,
+        "petroleum": 0.0,
+        "biomass": 1.2,
+        "coal": 27.9,
+        "other": 0.0,
+        "solar": 0.6,
+        "tidal": 0.0,
+        "total": 100.0,
+        "wind": 3.0,
+        "hydro": 16.6
+    },
+    "prince edward island": {
+        "naturalGas": 0.0,
+        "nuclear": 0.0,
+        "petroleum": 2.2,
+        "biomass": 0.6,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.1,
+        "tidal": 0.0,
+        "total": 100.2,
+        "wind": 97.3,
+        "hydro": 0.0
+    },
+    "ontario": {
+        "naturalGas": 8.6,
+        "nuclear": 50.1,
+        "petroleum": 0.1,
+        "biomass": 1.0,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 5.2,
+        "tidal": 0.0,
+        "total": 100.1,
+        "wind": 11.7,
+        "hydro": 23.4
+    },
+    "nova scotia": {
+        "naturalGas": 13.9,
+        "nuclear": 0.0,
+        "petroleum": 0.0,
+        "biomass": 3.5,
+        "coal": 47.5,
+        "other": 0.0,
+        "solar": 0.02,
+        "tidal": 0,
+        "total": 100.02,
+        "wind": 24.2,
+        "hydro": 10.9
+    },
+    "quebec": {
+        "naturalGas": 0.2,
+        "nuclear": 0.0,
+        "petroleum": 0.3,
+        "biomass": 0.7,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.01,
+        "tidal": 0.0,
+        "total": 100.01,
+        "wind": 6.7,
+        "hydro": 92.1
+    },
+    "alberta": {
+        "naturalGas": 73.5,
+        "nuclear": 0.0,
+        "petroleum": 0.02,
+        "biomass": 2.0,
+        "coal": 8.0,
+        "other": 0.0,
+        "solar": 3.2,
+        "tidal": 0.0,
+        "total": 99.82,
+        "wind": 11.3,
+        "hydro": 1.8
+    },
+    "manitoba": {
+        "naturalGas": 0.6,
+        "nuclear": 0.0,
+        "petroleum": 0.1,
+        "biomass": 0.2,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.1,
+        "tidal": 0.0,
+        "total": 100.1,
+        "wind": 1.7,
+        "hydro": 97.4
+    },
+    "northwest territories": {
+        "naturalGas": 7.3,
+        "nuclear": 0.0,
+        "petroleum": 10.5,
+        "biomass": 0.0,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.9,
+        "tidal": 0.0,
+        "total": 100.0,
+        "wind": 7.1,
+        "hydro": 74.2
+    },
+    "new brunswick": {
+        "naturalGas": 16.6,
+        "nuclear": 39.9,
+        "petroleum": 0.3,
+        "biomass": 1.3,
+        "coal": 12.1,
+        "other": 0.0,
+        "solar": 0.0,
+        "tidal": 0.0,
+        "total": 99.9,
+        "wind": 8.7,
+        "hydro": 21.0
+    },
+    "nunavut": {
+        "naturalGas": 0.0,
+        "nuclear": 0.0,
+        "petroleum": 99.8,
+        "biomass": 0.0,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.2,
+        "tidal": 0.0,
+        "total": 100.0,
+        "wind": 0.0,
+        "hydro": 0.0
+    },
+    "yukon": {
+        "naturalGas": 20.2,
+        "nuclear": 0.0,
+        "petroleum": 15.0,
+        "biomass": 0.5,
+        "coal": 0.0,
+        "other": 0.0,
+        "solar": 0.1,
+        "tidal": 0.0,
+        "total": 100.1,
+        "wind": 0.2,
+        "hydro": 64.1
+    }
+}

codecarbon/input.py

@@ -24,7 +24,7 @@ def __init__(self):
             "geo_js_url": "https://get.geojs.io/v1/ip/geo.json",
             "cloud_emissions_path": "data/cloud/impact.csv",
             "usa_emissions_data_path": "data/private_infra/2016/usa_emissions.json",
-            "can_energy_mix_data_path": "data/private_infra/2016/canada_energy_mix.json",  # noqa: E501
+            "can_energy_mix_data_path": "data/private_infra/2023/canada_energy_mix.json",  # noqa: E501
             "global_energy_mix_data_path": "data/private_infra/global_energy_mix.json",  # noqa: E501
             "carbon_intensity_per_source_path": "data/private_infra/carbon_intensity_per_source.json",
             "cpu_power_path": "data/hardware/cpu_power.csv",

pyproject.toml

@@ -61,7 +61,7 @@ codecarbon = [
     "data/private_infra/global_energy_mix.json",
     "data/private_infra/carbon_intensity_per_source.json",
     "data/private_infra/2016/usa_emissions.json",
-    "data/private_infra/2016/canada_energy_mix.json",
+    "data/private_infra/2023/canada_energy_mix.json",
 ]
 
 [project.urls]

tests/test_cpu_load.py

@@ -4,7 +4,7 @@
 
 from codecarbon.core.units import Power
 from codecarbon.emissions_tracker import OfflineEmissionsTracker
-from codecarbon.external.hardware import CPU, MODE_CPU_LOAD
+from codecarbon.external.hardware import CPU, MODE_CPU_LOAD, AppleSiliconChip
 
 
 @mock.patch("codecarbon.core.cpu.is_psutil_available", return_value=True)
@@ -57,7 +57,9 @@ def test_cpu_load_detection(
     ):
         tracker = OfflineEmissionsTracker(country_iso_code="FRA")
         for hardware in tracker._hardware:
-            if isinstance(hardware, CPU) and hardware._mode == MODE_CPU_LOAD:
+            if (
+                isinstance(hardware, CPU) and hardware._mode == MODE_CPU_LOAD
+            ) or isinstance(hardware, AppleSiliconChip):
                 break
         else:
             raise Exception("No CPU load !!!")

tests/test_emissions.py

@@ -154,10 +154,13 @@ def test_get_emissions_PRIVATE_INFRA_CANADA_WITH_REGION(self):
                 country_iso_code="CAN", country_name="Canada", region="ontario"
             ),
         )
+        manually_computed_emissions = (
+            3 * (0.995725971 * 0.0 + 0.8166885263 * 0.1 + 0.7438415916 * 8.6) / 100.1
+        )
 
         # THEN
         assert isinstance(emissions, float)
-        self.assertAlmostEqual(emissions, 0.12, places=2)
+        self.assertAlmostEqual(emissions, manually_computed_emissions, places=2)
 
     def test_get_emissions_PRIVATE_INFRA_unknown_country(self):
         """

tests/test_unsupported_gpu.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import unittest
 from unittest.mock import MagicMock, patch
 
@@ -18,6 +19,10 @@ def tearDown(self):
         if os.path.exists(self.output_csv):
             os.remove(self.output_csv)
 
+    # If we run this on macOS, NVMLError_NotSupported has no effect
+    # and we end up with non-zero values for GPU energy and power because
+    # we use the non-NVML code-path in hardware.AppleSiliconChip().
+    @unittest.skipIf(sys.platform == "darwin", "NVML not available on macOS")
     @patch("codecarbon.core.gpu.pynvml")
     def test_emissions_tracker_unsupported_gpu(self, mock_pynvml):
         mock_pynvml.NVMLError_NotSupported = self.NVMLError_NotSupported