fix: use python3.6

Author: altor

pyJoules/energy_meter.py

@@ -17,8 +17,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from __future__ import annotations
-
 import time
 import operator
 import functools
@@ -77,7 +75,7 @@ def __init__(self, devices: List[EnergyDevice], default_tag: str = ''):
         self._first_state = None
 
     def _measure_new_state(self, tag):
-        timestamp = time.time_ns()
+        timestamp = time.time()
         values = [device.get_energy() for device in self.devices]
 
         return EnergyState(timestamp, tag if tag is not None else self.default_tag, values)
@@ -264,7 +262,7 @@ def compute_energy(self, domains) -> List[float]:
             values_dict[str(key)] = value
         return values_dict
 
-    def add_next_state(self, state: EnergyState):
+    def add_next_state(self, state: 'EnergyState'):
         """
         :param previous: next state for the same energy trace
         :raise StateIsNotFinalError: if there are already a next state

pyJoules/energy_sample.py

@@ -17,13 +17,11 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from dataclasses import dataclass
 from typing import Dict, Any, List, Callable
 from functools import reduce
 from operator import and_
 
 
-@dataclass
 class EnergySample:
     """
     :var timestamp: begining timestamp
@@ -35,10 +33,11 @@ class EnergySample:
     :var energy: dictionary that contains the energy consumed during this sample
     :vartype: Dict[str, float]
     """
-    timestamp: float
-    tag: str
-    duration: float
-    energy: Dict[str, float]
+    def __init__(self, timestamp: float, tag: str, duration: float, energy: Dict[str, float]):
+        self.timestamp = timestamp
+        self.tag = tag
+        self.duration = duration
+        self.energy = energy
 
 
 class EnergyTrace:

tests/acceptation/test_measure_trace_with_class.py

@@ -34,10 +34,17 @@
 from ..utils.sample import assert_sample_are_equals
 
 
-TIMESTAMP_TRACE = [1.1, 2.2, 3.3, 4.4, 5.5]
+# We mock time.time function that is used by pyfakefs each time an operation on filesystem is done. we have to give
+# consistant time return value to time.time that will be used by pyfakefs
+INIT_TS = [0] * 5
+FIRST_TS = [1.1] * 7
+SECOND_TS = [2.2] * 7
+THIRD_TS = [3.3] * 7
+MOCKED_TIMESTAMP_TRACE = INIT_TS + FIRST_TS + SECOND_TS + THIRD_TS
+TIMESTAMP_TRACE = [1.1, 2.2, 3.3]
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=MOCKED_TIMESTAMP_TRACE)
 def test_measure_rapl_device_all_domains(_mocked_time_ns, fs_pkg_dram_one_socket, one_gpu_api):
     domains = [RaplPackageDomain(0), RaplDramDomain(0), NvidiaGPUDomain(0)]
 
@@ -48,7 +55,7 @@ def test_measure_rapl_device_all_domains(_mocked_time_ns, fs_pkg_dram_one_socket
 
     nvidia = NvidiaGPUDevice()
     nvidia.configure(domains=[NvidiaGPUDomain(0)])
-    
+
     meter = EnergyMeter([rapl, nvidia])
 
     correct_trace.add_new_sample('foo')  # test

tests/acceptation/test_measure_trace_with_decorator.py

@@ -33,11 +33,19 @@
 from .. utils.fake_api import CorrectTrace
 from ..utils.sample import assert_sample_are_equals
 
-TIMESTAMP_TRACE = [1.1, 2.2, 3.3, 4.4, 5.5]
+
+# We mock time.time function that is used by pyfakefs each time an operation on filesystem is done. we have to give
+# consistant time return value to time.time that will be used by pyfakefs
+INIT_TS = [0] * 5
+FIRST_TS = [1.1] * 7
+SECOND_TS = [2.2] * 3
+MOCKED_TIMESTAMP_TRACE = INIT_TS + FIRST_TS + SECOND_TS
+TIMESTAMP_TRACE = [1.1, 2.2]
+
 
 @patch('pyJoules.energy_handler.EnergyHandler')
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
-def test_measure_rapl_device_all_domains(mocked_handler, _mocked_time_ns, fs_pkg_dram_one_socket, one_gpu_api):
+@patch('time.time', side_effect=MOCKED_TIMESTAMP_TRACE)
+def test_measure_rapl_device_all_domains(mocked_handler, _mocked_time, fs_pkg_dram_one_socket, one_gpu_api):
 
     domains = [RaplPackageDomain(0), RaplDramDomain(0), NvidiaGPUDomain(0)]
 

tests/acceptation/test_measure_trace_with_energy_context.py

@@ -1,4 +1,4 @@
- # MIT License
+# MIT License
 # Copyright (c) 2019, INRIA
 # Copyright (c) 2019, University of Lille
 # All rights reserved.
@@ -33,11 +33,18 @@
 from .. utils.fake_api import CorrectTrace
 from ..utils.sample import assert_sample_are_equals
 
-TIMESTAMP_TRACE = [1.1, 2.2, 3.3, 4.4, 5.5]
+
+# We mock time.time function that is used by pyfakefs each time an operation on filesystem is done. we have to give
+# consistant time return value to time.time that will be used by pyfakefs
+FIRST_TS = [1.1] * 16
+SECOND_TS = [2.2] * 7
+THIRD_TS = [3.3] * 7
+MOCKED_TIMESTAMP_TRACE = FIRST_TS + SECOND_TS + THIRD_TS
+TIMESTAMP_TRACE = [1.1, 2.2, 3.3]
 
 @patch('pyJoules.energy_handler.EnergyHandler')
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
-def test_measure_rapl_device_all_domains(mocked_handler, _mocked_time_ns, fs_pkg_dram_one_socket, one_gpu_api):
+@patch('time.time', side_effect=MOCKED_TIMESTAMP_TRACE)
+def test_measure_rapl_device_all_domains(mocked_handler, _mocked_time, fs_pkg_dram_one_socket, one_gpu_api):
 
     domains = [RaplPackageDomain(0), RaplDramDomain(0), NvidiaGPUDomain(0)]
 
@@ -56,18 +63,25 @@ def test_measure_rapl_device_all_domains(mocked_handler, _mocked_time_ns, fs_pkg
 
         assert_sample_are_equals(correct_sample, measured_sample)  # test
 
+
 @patch('pyJoules.energy_handler.EnergyHandler')
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
-def test_measure_rapl_device_default_values(mocked_handler, _mocked_time_ns, fs_pkg_dram_one_socket, one_gpu_api):
+@patch('time.time', side_effect=MOCKED_TIMESTAMP_TRACE)
+def test_measure_rapl_device_default_values(mocked_handler, _mocked_time, fs_pkg_dram_one_socket, one_gpu_api):
 
     correct_trace = CorrectTrace([RaplPackageDomain(0), RaplDramDomain(0), NvidiaGPUDomain(0)],
                                  [fs_pkg_dram_one_socket, one_gpu_api], TIMESTAMP_TRACE)  # test
 
+    print('==================')
     correct_trace.add_new_sample('start')  # test
+    print('--------------------')
     with EnergyContext(mocked_handler) as energy_context:
+        print('=====================')
         correct_trace.add_new_sample('second_tag')  # test
+        print('--------------------')
         energy_context.record(tag='second_tag')
+        print('=====================')
         correct_trace.add_new_sample('')  # test
+        print('--------------------')
 
     assert mocked_handler.process.call_count == 2   # test
 

tests/unit/energy_meter/test_EnergyMeter.py

@@ -176,15 +176,15 @@ def test_get_trace_on_a_non_started_energy_meter_return_empty_trace(energy_meter
         assert len(energy_meter.get_trace()) == 0
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_and_stop_EnergyMeter_should_return_one_sample_trace(_mocked_fun, energy_meter):
     energy_meter.start()
     energy_meter.stop()
 
     assert len(energy_meter.get_trace()) == 1
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, energy_meter, sample1):
     energy_meter.start()
     energy_meter.stop()
@@ -193,15 +193,15 @@ def test_start_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, en
         assert_sample_are_equals(sample, sample1)
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_resume_and_stop_EnergyMeter_should_return_one_sample_trace(_mocked_fun, energy_meter):
     energy_meter.resume()
     energy_meter.stop()
 
     assert len(energy_meter.get_trace()) == 1
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_resume_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, energy_meter, sample1):
     energy_meter.resume()
     energy_meter.stop()
@@ -210,7 +210,7 @@ def test_resume_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, e
         assert_sample_are_equals(sample, sample1)
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_record_and_stop_EnergyMeter_should_return_two_sample_trace(_mocked_fun, energy_meter):
     energy_meter.start()
     energy_meter.record()
@@ -219,7 +219,7 @@ def test_start_record_and_stop_EnergyMeter_should_return_two_sample_trace(_mocke
     assert len(energy_meter.get_trace())
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_record_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, energy_meter, sample1, sample2):
     energy_meter.start()
     energy_meter.record()
@@ -229,7 +229,7 @@ def test_start_record_and_stop_EnergyMeter_should_return_correct_values(_mocked_
         assert_sample_are_equals(sample, correct_sample)
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_stop_resume_stop_EnergyMeter_should_return_two_sample_trace(_mocked_fun, energy_meter):
     energy_meter.start()
     energy_meter.stop()
@@ -239,7 +239,7 @@ def test_start_stop_resume_stop_EnergyMeter_should_return_two_sample_trace(_mock
     assert len(energy_meter.get_trace()) == 2
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_stop_resume_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, energy_meter, sample1, sample2_5):
     energy_meter.start()
     energy_meter.stop()
@@ -250,7 +250,7 @@ def test_start_stop_resume_and_stop_EnergyMeter_should_return_correct_values(_mo
         assert_sample_are_equals(sample, correct_sample)
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_record_stop_resume_stop_EnergyMeter_should_return_three_sample_trace(_mocked_fun, energy_meter):
     energy_meter.start()
     energy_meter.record()
@@ -261,7 +261,7 @@ def test_start_record_stop_resume_stop_EnergyMeter_should_return_three_sample_tr
     assert len(energy_meter.get_trace()) == 3
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_start_record_stop_resume_and_stop_EnergyMeter_should_return_correct_values(_mocked_fun, energy_meter, sample1, sample2, sample3):
     energy_meter.start()
     energy_meter.record()
@@ -273,7 +273,7 @@ def test_start_record_stop_resume_and_stop_EnergyMeter_should_return_correct_val
         assert_sample_are_equals(sample, correct_sample)
 
 
-@patch('time.time_ns', side_effect=TIMESTAMP_TRACE)
+@patch('time.time', side_effect=TIMESTAMP_TRACE)
 def test_second_start_on_an_energy_meter_should_restart_the_trace(_mocked_fun, energy_meter, sample3):
     energy_meter.start()
     energy_meter.record()