zigzag-dse 2.2.0__tar.gz → 2.2.1__tar.gz

{zigzag-dse-2.2.0/zigzag_dse.egg-info → zigzag-dse-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zigzag-dse
-Version: 2.2.0
+Version: 2.2.1
 Summary: ZigZag - Deep Learning Hardware Design Space Exploration
 Author-email: Arne Symons <arne.symons@kuleuven.be>, Linyan Mei <linyan.mei@kuleuven.be>
 License: BSD 3-Clause License

{zigzag-dse-2.2.0 → zigzag-dse-2.2.1}/pyproject.toml

@@ -11,7 +11,7 @@ namespaces = true  # true by default
 
 [project]
 name = "zigzag-dse"
-version = "2.2.0"
+version = "2.2.1"
 description = "ZigZag - Deep Learning Hardware Design Space Exploration"
 readme = "README.md"
 authors = [{ name = "Arne Symons", email = "arne.symons@kuleuven.be" }, { name = "Linyan Mei", email = "linyan.mei@kuleuven.be" }]
@@ -44,7 +44,7 @@ Homepage = "https://github.com/ZigZag-Project/zigzag"
 realpython = "zigzag.__main__:main"
 
 [tool.bumpver]
-current_version = "2.2.0"
+current_version = "2.2.1"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

zigzag-dse-2.2.1/zigzag/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.1"

{zigzag-dse-2.2.0 → zigzag-dse-2.2.1}/zigzag/classes/cacti/cacti-master/cacti_top.py

@@ -11,6 +11,7 @@ parser.add_argument('--ex_rd_port')
 parser.add_argument('--ex_wr_port')
 parser.add_argument('--rd_wr_port')
 parser.add_argument('--bank_count')
+parser.add_argument('--mem_pool_path')
 args = parser.parse_args()
 
 # python cacti_top.py --cache_size 2056 --IO_bus_width 64 --ex_rd_port 1 --ex_wr_port 1 --rd_wr_port 0 --bank_count 1
@@ -51,6 +52,7 @@ ex_rd_port = args.ex_rd_port
 ex_wr_port = args.ex_wr_port
 rd_wr_port = args.rd_wr_port
 bank_count = args.bank_count
+mem_pool_path = args.mem_pool_path
 
 # print(mem_type, cache_size, IO_bus_width, ex_rd_port, ex_wr_port, rd_wr_port, bank_count)
 technology = 0.090
@@ -101,7 +103,7 @@ for i in range(len(result[' Capacity (bytes)'])):
         'bank_count': 1, 
         'memory_type': mem_type
     }}
-    with open('./example_mem_pool.yaml', 'a+') as file:
-        yaml.dump(new_result, file)
-        file.write('\n')
-    file.close()
+    with open(mem_pool_path, 'a+') as fp:
+        yaml.dump(new_result, fp)
+        fp.write('\n')
+

{zigzag-dse-2.2.0 → zigzag-dse-2.2.1}/zigzag/classes/cacti/cacti_parser.py

@@ -5,15 +5,18 @@ import subprocess
 import logging
 logger = logging.getLogger(__name__)
 
-CACTI_PATH = './zigzag/classes/cacti'
-
 class CactiParser:
+    
+    cacti_path = os.path.dirname(os.path.realpath(__file__))
+    MEM_POOL_PATH = f'{cacti_path}/cacti-master/example_mem_pool.yaml'  # Path to cached cacti simulated memories
+    CACTI_TOP_PATH = f'{cacti_path}/cacti-master/cacti_top.py'  # Path to cacti python script to extract costs
+
     def __init__(self):
         pass
 
-    def item_exists(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank):
-        memory_pool_file = open(f'{CACTI_PATH}/cacti-master/example_mem_pool.yaml')
-        memory_pool = yaml.full_load(memory_pool_file)
+    def item_exists(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank, mem_pool_path=MEM_POOL_PATH):
+        with open(mem_pool_path, 'r') as fp:
+            memory_pool = yaml.full_load(fp)
         
         if memory_pool != None:
             for instance in memory_pool:
@@ -33,23 +36,24 @@ class CactiParser:
 
         return False
 
-    def create_item(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank):
+    def create_item(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank, mem_pool_path=MEM_POOL_PATH, cacti_top_path=CACTI_TOP_PATH):
         # print("No match in Cacti memory pool found!", size, r_bw, r_port, w_port, rw_port, bank)
-        os.chdir(f'{CACTI_PATH}/cacti-master/')
+        # os.chdir(f'{CACTI_PATH}/cacti-master/')
 
-        p = subprocess.call(['python', 'cacti_top.py', 
+        p = subprocess.call(['python', cacti_top_path, 
                             '--mem_type', str(mem_type),
                             '--cache_size', str(int(size/8)),
                             '--IO_bus_width', str(r_bw), 
                             '--ex_rd_port', str(r_port), 
                             '--ex_wr_port', str(w_port),
                             '--rd_wr_port', str(rw_port),
-                            '--bank_count', str(bank)])
+                            '--bank_count', str(bank),
+                            '--mem_pool_path', str(mem_pool_path)])
 
-        os.chdir("../../../..")
+        # os.chdir("../../../..")
 
-    def get_item(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank):  
-        logger.info(f"Extracting memory costs with CACTI for size = {size} and r_bw = {r_bw}")
+    def get_item(self, mem_type, size, r_bw, r_port, w_port, rw_port, bank, mem_pool_path=MEM_POOL_PATH, cacti_top_path=CACTI_TOP_PATH):  
+        print(f"Extracting memory costs with CACTI for size = {size} and r_bw = {r_bw}")
 
         if mem_type == 'rf':
             mem_type = 'sram'
@@ -58,10 +62,10 @@ class CactiParser:
 
             print("mem_type is register file! Changed to 'sram' and size", size, "instead of", int(size/128))
 
-        if not self.item_exists(mem_type, size, r_bw, r_port, w_port, rw_port, bank):
-            self.create_item(mem_type, size, r_bw, r_port, w_port, rw_port, bank) 
+        if not self.item_exists(mem_type, size, r_bw, r_port, w_port, rw_port, bank, mem_pool_path):
+            self.create_item(mem_type, size, r_bw, r_port, w_port, rw_port, bank, mem_pool_path, cacti_top_path) 
 
-        memory_pool_file = open(f'{CACTI_PATH}/cacti-master/example_mem_pool.yaml')
+        memory_pool_file = open(mem_pool_path)
         memory_pool = yaml.full_load(memory_pool_file)
         
         if memory_pool != None:

{zigzag-dse-2.2.0 → zigzag-dse-2.2.1}/zigzag/classes/hardware/architecture/memory_instance.py

@@ -37,7 +37,7 @@ class MemoryInstance:
                 r_port=r_port,
                 w_port=w_port,
                 rw_port=rw_port,
-                bank=1
+                bank=1,
             )
 
         self.name = name

{zigzag-dse-2.2.0 → zigzag-dse-2.2.1/zigzag_dse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zigzag-dse
-Version: 2.2.0
+Version: 2.2.1
 Summary: ZigZag - Deep Learning Hardware Design Space Exploration
 Author-email: Arne Symons <arne.symons@kuleuven.be>, Linyan Mei <linyan.mei@kuleuven.be>
 License: BSD 3-Clause License

zigzag-dse-2.2.0/zigzag/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.2.0"