Skip to content

Commit

Permalink
change key config_dir to input_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
Bellwether889 committed Jul 30, 2024
1 parent 519ae12 commit b0bb17e
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/Home/Starter-Kit-for-Linux-Users.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ from opensipi.integrated_flows import sim2report


input_info = {
'config_dir': r'xxx/SIPIProj/Olympus/Sim_Input/',
'input_dir': r'xxx/SIPIProj/Olympus/Sim_Input/',
'input_type': 'csv',
'input_folder': 'Sigrity_PDN',
'op_run_name': '',
Expand Down
2 changes: 1 addition & 1 deletion docs/Home/Starter-Kit-for-Windows-Users.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ from opensipi.integrated_flows import sim2report


input_info = {
'config_dir': r'C:\SIPIProj\Olympus\Sim_Input'+'\\',
'input_dir': r'C:\SIPIProj\Olympus\Sim_Input'+'\\',
'input_type': 'csv',
'input_folder': 'Sigrity_PDN',
'op_run_name': '',
Expand Down
Binary file modified examples/Linux/Olympus.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/Olympus/Script/Olympus_PCB_xtractDCR.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from opensipi.integrated_flows import sim2report

input_info = {
"config_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_type": "csv",
"input_folder": "Sigrity_DCR",
"op_run_name": "",
Expand Down
2 changes: 1 addition & 1 deletion examples/Olympus/Script/Olympus_PCB_xtractHSIO.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from opensipi.integrated_flows import sim2report

input_info = {
"config_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_type": "csv",
"input_folder": "Sigrity_HSIO",
"op_run_name": "",
Expand Down
2 changes: 1 addition & 1 deletion examples/Olympus/Script/Olympus_PCB_xtractLSIO.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from opensipi.integrated_flows import sim2report

input_info = {
"config_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_type": "csv",
"input_folder": "Sigrity_LSIO",
"op_run_name": "",
Expand Down
2 changes: 1 addition & 1 deletion examples/Olympus/Script/Olympus_PCB_xtractPDN.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from opensipi.integrated_flows import sim2report

input_info = {
"config_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_dir": r"C:\SIPIProj\Olympus\Sim_Input" + "\\",
"input_type": "csv",
"input_folder": "Sigrity_PDN",
"op_run_name": "",
Expand Down
Binary file modified examples/WinOS/Olympus.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions opensipi/sipi_infra.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ def _get_proj_dir(self, info):
"""get the project directory."""
if "proj_dir" in info:
proj_dir = info["proj_dir"]
elif "config_dir" in info:
config_dir = expand_home_dir(slash_ending(rectify_dir(info["config_dir"])))
proj_dir = get_str_before_last_n_symbol(config_dir, SL, 2) + SL
elif "input_dir" in info:
input_dir = expand_home_dir(slash_ending(rectify_dir(info["input_dir"])))
proj_dir = get_str_before_last_n_symbol(input_dir, SL, 2) + SL
else:
raise NoProjDirDefined()
proj_name = proj_dir.split(SL)[-2]
Expand All @@ -110,8 +110,8 @@ def _get_proj_dir(self, info):
def _get_filein_info(self, info):
"""get the dict used to query input data."""
if self.INPUT_TYPE == "CSV":
config_dir = expand_home_dir(slash_ending(rectify_dir(info["config_dir"])))
input_dir = config_dir + info["input_folder"] + SL
input_dir = expand_home_dir(slash_ending(rectify_dir(info["input_dir"])))
input_dir = input_dir + info["input_folder"] + SL
input_info = {
"input_type": self.INPUT_TYPE,
"input_dir": input_dir,
Expand Down

0 comments on commit b0bb17e

Please sign in to comment.