opencos-eda 0.2.45__py3-none-any.whl → 0.2.46__py3-none-any.whl

opencos/deps_helpers.py

@@ -68,6 +68,7 @@ class Defaults:
         'shell',
         'work-dir-add-srcs', 'work-dir-add-sources',
         'peakrdl',
+        'run-from-work-dir',
         'var-subst-args',
         'var-subst-os-env',
         'tee',
@@ -387,20 +388,20 @@ def path_substitutions_relative_to_work_dir(exec_list : list, info_str : str, ta
 
     # Look for path substitutions, b/c we later "work" in self.args['work-dir'], but
     # files should be relative to our target_path.
-    for iter,word in enumerate(exec_list):
+    for i,word in enumerate(exec_list):
         m = re.search(r'(\.+\/+[^"\;\:\|\<\>\*]*)$', word)
         if m:
             # ./, ../, file=./../whatever  It might be a filepath.
             # [^"\;\:\|\<\>\*] is looking for non-path like characters, so we dont' have a trailing
             #  " : ; < > |
-            # try and see if this file exists. Note that files in the self.args['work-dir'] don't
+            # try and see if this file or dir exists. Note that files in the self.args['work-dir'] don't
             # need this, and we can't assume dir levels in the work-dir.
             try:
                 try_path = os.path.abspath(os.path.join(os.path.abspath(target_path), m.group(1)))
-                if os.path.isfile(try_path):
+                if os.path.isfile(try_path) or os.path.isdir(try_path):
                     # make the substitution
-                    exec_list[iter] = word.replace(m.group(1), try_path)
-                    debug(f'path substitution {info_str=} {target_path=}: replaced - {word=} is now ={exec_list[iter]}')
+                    exec_list[i] = word.replace(m.group(1), try_path)
+                    debug(f'path substitution {info_str=} {target_path=}: replaced - {word=} is now ={exec_list[i]}')
             except:
                 pass
 
@@ -1064,6 +1065,7 @@ def parse_deps_shell_str(line : str, target_path : str, target_node : str, enabl
 
     d = {'target_path': os.path.abspath(target_path),
          'target_node': target_node,
+         'run_from_work_dir': True,
          'exec_list': exec_list,
          }
     return d
@@ -1137,12 +1139,12 @@ def parse_deps_peakrdl(line : str, target_path : str, target_node : str, enable
 
     sv_files = list()
     top = ''
-    for iter,str_value in enumerate(args_list):
+    for i,str_value in enumerate(args_list):
         if '--top=' in str_value:
             _, top = str_value.split('=')
         elif '--top' in str_value:
-            if iter + 1 < len(args_list):
-                top = args_list[iter + 1]
+            if i + 1 < len(args_list):
+                top = args_list[i + 1]
 
     for str_item in args_list:
         if str_item[-4:] == '.rdl':
@@ -1235,14 +1237,14 @@ def deps_commands_handler(config: dict, eda_args: dict,
             var_subst_dict = eda_args
 
         tee_fpath = command.get('tee', None)
+        run_from_work_dir = command.get('run-from-work-dir', True) # for shell, default True
 
         for key,item in command.items():
 
             # skip the var-subst-* keys, since these types are bools
-            if key.startswith('var-subst'):
-                continue
-
-            if key.startswith('tee'):
+            if key.startswith('var-subst') or \
+               key.startswith('tee') or \
+               key.startswith('run-from-work-dir'):
                 continue
 
             # Optional variable substituion in commands
@@ -1262,6 +1264,7 @@ def deps_commands_handler(config: dict, eda_args: dict,
                 # list item in ret_dict['exec_list'], and make it a util.ShellCommandList.
                 if tee_fpath:
                     ret_dict['exec_list'] = ShellCommandList(ret_dict['exec_list'], tee_fpath=tee_fpath)
+                ret_dict['run_from_work_dir'] = run_from_work_dir
                 assert ret_dict, f'shell command failed in {dep=} {target_node=} in {deps_file=}'
                 shell_commands_list.append(ret_dict) # process this later, append to our to-be-returned tuple
 

opencos/deps_schema.py

@@ -69,6 +69,8 @@ my_target_name:
       - shell:                       <---- string for shell command to be run
         var-subst-args:              <---- bool, perform var substitution using args
         var-subst-os-env:            <---- bool, perform var substitution using os.environ
+        run-from-work-dir:           <---- bool, default True, if False runs from target dir
+                                           instead of work-dir.
         tee:                         <---- string, filename to write logs to
       - work-dir-add-sources:        <---- work-dir-add-sources, optional list (or string)
         - some_file_gen_from_sh.sv   <---- string filename that we created with sh command
@@ -150,6 +152,7 @@ DEPS_COMMANDS_LIST = [
         Optional('shell'): str,
         Optional('var-subst-args'): bool,
         Optional('var-subst-os-env'): bool,
+        Optional('run-from-work-dir'): bool,
         Optional('tee'): Or(str, type(None)),
     },
     {

opencos/eda_base.py

@@ -716,8 +716,9 @@ class CommandDesign(Command):
 
         log_fnames_count = {} # count per target_node.
 
-        for iter, d in enumerate(self.dep_shell_commands):
+        for i, d in enumerate(self.dep_shell_commands):
             clist = util.ShellCommandList(d['exec_list'])
+            run_from_work_dir = d['run_from_work_dir'] # default True
             log = clist.tee_fpath
             target_node = d["target_node"]
             if clist.tee_fpath is None:
@@ -729,24 +730,38 @@ class CommandDesign(Command):
             all_cmds_lists += [
                 [], # blank line
                 # comment, where it came from, log to {node}__shell_{lognum}.log (or tee name from DEPS.yml)
-                [f'# command {iter}: target: {d["target_path"]} : {target_node} --> {log}'],
-                # actual command (list or util.ShellCommandList)
-                clist,
+                [f'# command {i}: target: {d["target_path"]} : {target_node} --> {log}'],
             ]
+            if not run_from_work_dir:
+                all_cmds_lists.append([f'cd {d["target_path"]}'])
+
+            # actual command (list or util.ShellCommandList)
+            all_cmds_lists.append(clist)
+
+            if not run_from_work_dir:
+                all_cmds_lists.append([f'cd {os.path.abspath(self.args["work-dir"])}'])
+
             d['exec_list'] = clist # update to tee_fpath is set.
 
         util.write_shell_command_file(dirpath=self.args['work-dir'], filename='pre_compile_dep_shell_commands.sh',
                                       command_lists=all_cmds_lists)
 
-        for iter,d in enumerate(self.dep_shell_commands):
-            util.info(f'run_dep_shell_commands {iter=}: {d=}')
+        for i,d in enumerate(self.dep_shell_commands):
+            util.info(f'run_dep_shell_commands {i=}: {d=}')
             clist = util.ShellCommandList(d['exec_list'])
+            tee_fpath=clist.tee_fpath
+            if d['run_from_work_dir']:
+                run_from_dir = self.args['work-dir']
+            else:
+                # Run from the target's directory (not the `eda` caller $PWD)
+                run_from_dir = d["target_path"]
+                tee_fpath = os.path.abspath(os.path.join(self.args['work-dir'], tee_fpath))
             # NOTE(drew): shell=True subprocess call, can disable with self.config
             if sys.platform.startswith('win'):
                 # for Windows, we run shell=True otherwise most built-in cmd.exe calls won't work.
-                self.exec(self.args['work-dir'], clist, tee_fpath=clist.tee_fpath, shell=True)
+                self.exec(run_from_dir, clist, tee_fpath=tee_fpath, shell=True)
             else:
-                self.exec(self.args['work-dir'], clist, tee_fpath=clist.tee_fpath,
+                self.exec(run_from_dir, clist, tee_fpath=tee_fpath,
                           shell=self.config.get('deps_subprocess_shell', False))
 
     def update_file_lists_for_work_dir(self):
@@ -766,10 +781,10 @@ class CommandDesign(Command):
         my_file_lists_list = [self.files_v, self.files_sv, self.files_vhd, self.files_cpp,
                               self.files_sdc]
         for my_file_list in my_file_lists_list:
-            for iter,value in enumerate(my_file_list):
+            for i,value in enumerate(my_file_list):
                 if value and type(value) is str and value.startswith(self._work_dir_add_srcs_path_string):
                     new_value = os.path.join(work_dir_abspath, value[_work_dir_add_srcs_path_string_len :])
-                    my_file_list[iter] = new_value
+                    my_file_list[i] = new_value
                     util.debug(f"file lists: replaced {value} with {new_value}")
 
     def update_non_source_files_in_work_dir(self):
@@ -1575,10 +1590,10 @@ class CommandParallel(Command):
         else:
             util.info(f"Parallel: <No jobs found>")
         # Make sure all jobs have a set status:
-        for iter,rc in enumerate(self.jobs_status):
+        for i,rc in enumerate(self.jobs_status):
             if rc is None or type(rc) != int:
-                self.error(f'job {iter=} {rc=} did not return a proper return code')
-                jobs_status[iter] = 1
+                self.error(f'job {i=} {rc=} did not return a proper return code')
+                jobs_status[i] = 1
 
         # if self.status > 0, then keep it non-zero, else set it if we still have running jobs.
         if self.status == 0:

opencos/eda_config_defaults.yml

@@ -62,6 +62,7 @@ file_extensions:
     - .vhdl
   cpp:
     - .cpp
+    - .cc
   synth_constraints:
     - .sdc
     - .xdc

{opencos_eda-0.2.45.dist-info → opencos_eda-0.2.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.2.45
+Version: 0.2.46
 Summary: A simple Python package for wrapping RTL simuliatons and synthesis
 Author-email: Simon Sabato <simon@cognichip.ai>, Drew Ranck <drew@cognichip.ai>
 Project-URL: Homepage, https://github.com/cognichip/opencos

{opencos_eda-0.2.45.dist-info → opencos_eda-0.2.46.dist-info}/RECORD

@@ -1,12 +1,12 @@
 opencos/__init__.py,sha256=ZQ7aOCbP0jkIMYGdVrb-mkZX3rnvaK8epBkmp506tXU,85
 opencos/_version.py,sha256=qN7iBoOv-v4tEZz-Pu9sVUJwefshJOsgdaddn8HcHio,510
 opencos/_waves_pkg.sv,sha256=1lbhQOVGc3t_R8czYjP40hssP0I3FlZOpHTkI7yKFbI,1251
-opencos/deps_helpers.py,sha256=jIMYDp9BVwEl9gYUcVie19EHqO5-DRY-d-vSqaDKi4Y,56971
-opencos/deps_schema.py,sha256=MhytzXwp071F14RwxqHt78ak8Qruoe4FeK5XSzkO2f0,14658
+opencos/deps_helpers.py,sha256=Q49Su7cJdkcjC9PufE2EtveHYAuENe2F-Prpmlz7tcI,57245
+opencos/deps_schema.py,sha256=-zXzU_l0mv8abaOgBcxmRiyIelZ9jOUBXI8ahf3ymBU,14860
 opencos/eda.py,sha256=Ky_Uc47TU1N6lRs06eatdpAvtgoSh0iXO0BxhSfEuk0,19420
-opencos/eda_base.py,sha256=RY32yrUyUpGUaDN4y5SIv54osV57K4r9zs4lIGsYJCY,83784
+opencos/eda_base.py,sha256=utUTieQMv0RC2Mz5n8b7rtneKjSFI3YcgCiJON0T7Ws,84410
 opencos/eda_config.py,sha256=8wwX4PTZ5rmxWogrVxxqAY6adQFPxTsFkkTYbo6H4vU,8853
-opencos/eda_config_defaults.yml,sha256=7apbA6F0HS-9qC6pOiM128qDf29It0U_ZKxntYSuGUg,11525
+opencos/eda_config_defaults.yml,sha256=AteZbwRJ6wviinks47-e5TX0DoU0culJfBw6L3xYOOA,11535
 opencos/eda_config_max_verilator_waivers.yml,sha256=lTAU4IOEbUWVlPzuer1YYhIyxpPINeA4EJqcRIT-Ymk,840
 opencos/eda_config_reduced.yml,sha256=cQ9jY4J7EvAbeHTiP6bvpDSVJAYiitjLZPSxxLKIEbk,1440
 opencos/eda_deps_bash_completion.bash,sha256=jMkQKY82HBgOnQeMdA1hMrXguRFtB52SMBxUemKovL4,1958
@@ -70,10 +70,10 @@ opencos/tools/tabbycad_yosys.py,sha256=2LePPgYXBVdsy7YcffPIWN-I0B7queLQ_f_pme2SC
 opencos/tools/verilator.py,sha256=dWnoO8FUvjdMyFmuTjHvC_XYI_zwjApJApYy7iYubf0,18398
 opencos/tools/vivado.py,sha256=_GVqKNIZt9CZeiXS5yZCWTFrhD3BKjcQfzhhxR1qLQM,40017
 opencos/tools/yosys.py,sha256=FV43RcejyFir4B24WRShnzUoppJMK0sDDNkSlIX8Vew,25579
-opencos_eda-0.2.45.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.2.45.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.2.45.dist-info/METADATA,sha256=MNMQxXKjmHYdAEIike4YdzaCEQeaqld1hPo4GLQk8PY,604
-opencos_eda-0.2.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.2.45.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
-opencos_eda-0.2.45.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.2.45.dist-info/RECORD,,
+opencos_eda-0.2.46.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.2.46.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.2.46.dist-info/METADATA,sha256=po0uwX8zxK4LmDW80yfBySMF1T2VwUifZPRgcsHB9f4,604
+opencos_eda-0.2.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.2.46.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
+opencos_eda-0.2.46.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.2.46.dist-info/RECORD,,