diff --git a/docs/Home/Starter-Kit-for-Linux-Users.md b/docs/Home/Starter-Kit-for-Linux-Users.md index 6e1a064..fe63977 100644 --- a/docs/Home/Starter-Kit-for-Linux-Users.md +++ b/docs/Home/Starter-Kit-for-Linux-Users.md @@ -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': '', diff --git a/docs/Home/Starter-Kit-for-Windows-Users.md b/docs/Home/Starter-Kit-for-Windows-Users.md index 5a46c68..bb83b6b 100644 --- a/docs/Home/Starter-Kit-for-Windows-Users.md +++ b/docs/Home/Starter-Kit-for-Windows-Users.md @@ -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': '', diff --git a/examples/Linux/Olympus.zip b/examples/Linux/Olympus.zip index fd5da5e..e39445a 100644 Binary files a/examples/Linux/Olympus.zip and b/examples/Linux/Olympus.zip differ diff --git a/examples/Olympus/Script/Olympus_PCB_xtractDCR.py b/examples/Olympus/Script/Olympus_PCB_xtractDCR.py index d6ea95f..97b136f 100644 --- a/examples/Olympus/Script/Olympus_PCB_xtractDCR.py +++ b/examples/Olympus/Script/Olympus_PCB_xtractDCR.py @@ -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": "", diff --git a/examples/Olympus/Script/Olympus_PCB_xtractHSIO.py b/examples/Olympus/Script/Olympus_PCB_xtractHSIO.py index 191338a..8832d91 100644 --- a/examples/Olympus/Script/Olympus_PCB_xtractHSIO.py +++ b/examples/Olympus/Script/Olympus_PCB_xtractHSIO.py @@ -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": "", diff --git a/examples/Olympus/Script/Olympus_PCB_xtractLSIO.py b/examples/Olympus/Script/Olympus_PCB_xtractLSIO.py index 77cd3c9..9ddb0c3 100644 --- a/examples/Olympus/Script/Olympus_PCB_xtractLSIO.py +++ b/examples/Olympus/Script/Olympus_PCB_xtractLSIO.py @@ -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": "", diff --git a/examples/Olympus/Script/Olympus_PCB_xtractPDN.py b/examples/Olympus/Script/Olympus_PCB_xtractPDN.py index b974c2a..953f664 100644 --- a/examples/Olympus/Script/Olympus_PCB_xtractPDN.py +++ b/examples/Olympus/Script/Olympus_PCB_xtractPDN.py @@ -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": "", diff --git a/examples/WinOS/Olympus.zip b/examples/WinOS/Olympus.zip index b8792a7..1f55eda 100644 Binary files a/examples/WinOS/Olympus.zip and b/examples/WinOS/Olympus.zip differ diff --git a/opensipi/sipi_infra.py b/opensipi/sipi_infra.py index 9f40922..02e92fd 100644 --- a/opensipi/sipi_infra.py +++ b/opensipi/sipi_infra.py @@ -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] @@ -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,