Merge pull request mlco2#920 from cianc/test/fix-gpu-and-cpu-tests-for-mac

Fix two gpu and cpu tests for mac

Author: benoit-cty

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_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