Merge pull request #18 from sb-ai-lab/dev

Fix the bag with incorrect saving of file

Author: alexnkorovin

.gitignore

@@ -1,5 +1,6 @@
 test.ipnb
 venv/*
+.venv/*
 my_emission_file.csv
 .DS_Store
 PyPiUpdate.md

dist/eco2ai-0.3.9-py2.py3-none-any.whl

@@ -1,6 +1,8 @@
 from .emission_track import (
     Tracker, 
     track,
+    __version__
+
 )
 
 from eco2ai.tools.tools_cpu import (
@@ -22,4 +24,4 @@
     set_params,
     get_params,
     summary,
-)
+)

dist/eco2ai-0.3.9.tar.gz

@@ -1 +1 @@
-{"project_name": "mnist_training", "experiment_description": "Training MNIST Model", "file_name": "emission.csv", "measure_period": 10, "pue": 1}
+{"project_name": "YourProjectName", "experiment_description": "training the <your model> model", "file_name": "my_emission.csv", "measure_period": 1, "pue": 1}

eco2ai/__init__.py

@@ -30,7 +30,7 @@
 
 FROM_mWATTS_TO_kWATTH = 1000 * 1000 * 3600
 FROM_kWATTH_TO_MWATTH = 1000
-
+__version__ = '0.3.12'
 
 class IncorrectMethodSequenceError(Exception):
     pass
@@ -382,7 +382,7 @@ def _construct_attributes_dict(
         attributes_dict["project_name"] = [f"{self.project_name}"]
         attributes_dict["experiment_description"] = [f"{self.experiment_description}"]
         attributes_dict["epoch"] = [
-            "epoch: " + str(self._current_epoch) + self._parameters_to_save if self._mode == "training" else "N/A"
+            "epoch: " + str(self._current_epoch) + str(self._parameters_to_save) if self._mode == "training" else "N/A"
         ]
         attributes_dict["start_time"] = [f"{time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(self._start_time))}"]
         attributes_dict["duration(s)"] = [f"{time.time() - self._start_time}"]
@@ -484,11 +484,11 @@ def _write_to_csv(
                         for element in attributes_dict.values():
                             attributes_array += element
 
-                        # Ensure consistent types
-                        attributes_array = [
-                            self.align_value_to_dtype(val, dtype)
-                            for val, dtype in zip(attributes_array, attributes_dataframe.dtypes)
-                        ]
+                        # # Ensure consistent types
+                        # attributes_array = [
+                        #     self.align_value_to_dtype(val, dtype)
+                        #     for val, dtype in zip(attributes_array, attributes_dataframe.dtypes)
+                        # ]
 
                         if attributes_dataframe[attributes_dataframe["id"] == self._id].shape[0] == 0:
                             # Adding a new row

eco2ai/data/config.txt

@@ -244,7 +244,7 @@ def number_of_cpu(ignore_warnings=True):
                 processor_string = dictionary['Џа®жҐбб®а(л)']
             if 'Процессор(ы)' in dictionary:
                 processor_string = dictionary['Процессор(ы)']
-            cpu_num = int(re.findall('- (\d)\.', processor_string)[0])
+            cpu_num = int(re.findall(r'- (\d)\.', processor_string)[0])
         except:
             if not ignore_warnings:
                 warnings.warn(
@@ -297,15 +297,15 @@ def transform_cpu_name(cpu_name):
 
     """
     # dropping all the waste tokens and patterns:
-    cpu_name = re.sub('(\(R\))|(®)|(™)|(\(TM\))|(@.*)|(\S*GHz\S*)|(\[.*\])|( \d-Core)|(\(.*\))', '', cpu_name)
+    cpu_name = re.sub(r'(\(R\))|(®)|(™)|(\(TM\))|(@.*)|(\S*GHz\S*)|(\[.*\])|( \d-Core)|(\(.*\))', '', cpu_name)
 
     # dropping all the waste words:
     array = re.split(" ", cpu_name)
     for i in array[::-1]:
         if ("CPU" in i) or ("Processor" in i) or (i == ''):
             array.remove(i)
     cpu_name = " ".join(array)
-    patterns = re.findall("(\S*\d+\S*)", cpu_name)
+    patterns = re.findall(r"(\S*\d+\S*)", cpu_name)
     for i in re.findall(
         "(Ryzen Threadripper)|(Ryzen)|(EPYC)|(Athlon)|(Xeon Gold)|(Xeon Bronze)|(Xeon Silver)|(Xeon Platinum)|(Xeon)|(Core)|(Celeron)|(Atom)|(Pentium)", 
         cpu_name
@@ -336,15 +336,15 @@ def transform_cpu_name_2(cpu_name):
 
     """
     # dropping all the waste tokens and patterns:
-    cpu_name = re.sub('(\(R\))|(®)|(™)|(\(TM\))|(@.*)|(\S*GHz\S*)|(\[.*\])|( \d-Core)|(\(.*\))', '', cpu_name)
+    cpu_name = re.sub(r'(\(R\))|(®)|(™)|(\(TM\))|(@.*)|(\S*GHz\S*)|(\[.*\])|( \d-Core)|(\(.*\))', '', cpu_name)
 
     # dropping all the waste words:
     array = re.split(" ", cpu_name)
     for i in array[::-1]:
         if ("CPU" in i) or ("Processor" in i) or (i == ''):
             array.remove(i)
     cpu_name = " ".join(array)
-    patterns = re.findall("(\S*\d+\S*)", cpu_name)
+    patterns = re.findall(r"(\S*\d+\S*)", cpu_name)
     for i in re.findall(
         "(Ryzen Threadripper)|(Ryzen)|(EPYC)|(Athlon)|(Xeon Gold)|(Xeon Bronze)|(Xeon Silver)|(Xeon Platinum)|(Xeon)|(Core)|(Celeron)|(Atom)|(Pentium)", 
         cpu_name
@@ -373,7 +373,7 @@ def get_patterns(cpu_name):
             Array with all the patterns
 
     """
-    patterns = re.findall("(\S*\d+\S*)", cpu_name)
+    patterns = re.findall(r"(\S*\d+\S*)", cpu_name)
     for i in re.findall(
         "(Ryzen Threadripper)|(Ryzen)|(EPYC)|(Athlon)|(Xeon Gold)|(Xeon Bronze)|(Xeon Silver)|(Xeon Platinum)|(Xeon)|(Core)|(Celeron)|(Atom)|(Pentium)",
         cpu_name

eco2ai/emission_track.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eco2ai"
-version = "0.3.11"
+version = "0.3.12"
 description = "emission tracking library"
 authors = ["AI Lab",
             "Vladimir Lazarev <lazarev@airi.net>",

eco2ai/tools/tools_cpu.py

@@ -12,8 +12,7 @@
 
 setup(
     name = 'eco2ai',
-    version = '0.3.11',
-    author=["Vladimir Lazarev", 'Nikita Zakharenko', 'Semyon Budyonny', 'Leonid Zhukov'],
+    author=["Vladimir Lazarev", 'Nikita Zakharenko', 'Alexey Korovin', 'Semyon Budyonny', 'Leonid Zhukov'],
     description = long_description,
     packages = ['eco2ai'],
     install_requires=DEPENDENCIES,
@@ -24,5 +23,6 @@
             "data/carbon_index.csv"
         ]
     },
-    include_package_data=True
+    include_package_data=True,
+    version=__version__
 )