From b0bb17ee38b73f8b15b05445dbb86e5685cfa3e2 Mon Sep 17 00:00:00 2001 From: Yansheng Wang Date: Tue, 30 Jul 2024 13:10:34 -0700 Subject: [PATCH] change key config_dir to input_dir --- docs/Home/Starter-Kit-for-Linux-Users.md | 2 +- docs/Home/Starter-Kit-for-Windows-Users.md | 2 +- examples/Linux/Olympus.zip | Bin 9187 -> 9169 bytes .../Olympus/Script/Olympus_PCB_xtractDCR.py | 2 +- .../Olympus/Script/Olympus_PCB_xtractHSIO.py | 2 +- .../Olympus/Script/Olympus_PCB_xtractLSIO.py | 2 +- .../Olympus/Script/Olympus_PCB_xtractPDN.py | 2 +- examples/WinOS/Olympus.zip | Bin 9082 -> 9054 bytes opensipi/sipi_infra.py | 10 +++++----- 9 files changed, 11 insertions(+), 11 deletions(-) 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 fd5da5e1c28672e5aad18edd3f011de39f63472a..e39445abd147615bb8f3f4f22cc1ce2b05b93cf8 100644 GIT binary patch delta 2032 zcmZvddpy+X9>-_K4r7cVV~yL48TYYrS(T;3oP_V7V{l;Fy*Y|!xJ|~o&*VV2 zSZ#)1a!$t(SYlN`mZUvCuAszy`V#)sUUi@N@|aAPaL2$5eW(~3D#v$eS$>@=!0b**_jF- z=9W+UBH>3PGV0=AJI&;WT0fgz+IP#XxX}CPI~l?FTf>yDwOUOw%$Q_CiV*KSzZ9{S zU|s*Ch2(qI#cPdklsC7S{565u=R7Z@BgvU#B0SWn&NP^)_|Rh|kPMJUpJ0PCA1rzo z-O+t%l`IxS?_(Gs-mb8y0$UcW{lWo%iMa`Olos9NMQp~%Nh7kk+@q?i^im0UTBxdQ zv9`peaP8D37Bs4*vBz@gIv^x)6(gThk%kA}JnHD?+HseUFF*cq2}76b22+SE7Y@3* z$$St`)#4?^68{;zo-PA^7IO<0H)lJ)>YAKQE!P@kn9$=bmab1>XMafE`-2n4<2>iy z6o22Ssj##ZTj3@>Ty1X4@n0CjIbgXIzn1qMhr3U)!d3THqLZE1tBPt;RaZ(h2M>e< z(Gs`x0(>&u3B6~PgW8U~rNM^;=65P@kyO1*@_6mV7r328Yi#EQ=s{ki>xHjKkf31^ z6O465^bQgn!`}G_bvqqYpOn!*(9jKcYp(3AG>jvcq2UJkl0viPPFOT1w7W0)W@Hgz zWY5-{gMm%|;MBWtbQy5k&8a4(+m%vcb*&4)h(H#<=3p~-1w-eT z#>=Ecryf&5SUDr$k{9-wsQN(4~GPVExzEgM7*W2R}NXbHr6YSLI3jsVH6h+F0V- z=s8D+f}<`^$Fb87L$!DVXGjlBKHCsx@6_A=&8>gGNf)`yxykMKU3aU-CWo@X zogsmb*&$t>O6YU!%pJW^rzQ*O12+fd7SYd=HEo9NVrNf~1o_{Gq^1FL+A3E*B zjqt0PK$@-@9_qSm`KgH=KxB9H4F#9H$L^Y9u1Yr`e2>Rm3Gf`4dolL{8oB-|Qz(%& zpVg`#so0OXZ0EHqMD5FD56=IB-A|qkDKU77+DO#@lr&pybNe(dW4AZ-l#O?&!0s-G zbIhH1&3k@$m9hVhh3a^b3JNvd!;Uw5$VzP+oDZy;b2`iFg(q0f)xe+gR0w3=8Oxs% z4%4yd*_>6EHt8H$LLwm?shO0F9yAu}iI!7;`WL%UQ&&2RG1^^eYG!C(1%(VL{ zd(?ltYP~x8`AFn+WbBPSd_gF4kAyz*<~5luq7jz$v@+lozOg;G=h+{B7F$!i?WRM^(a$dM=YRcUVnEnicxe~Y$q!qP!9K# zc!0ux{Z7td4&ip*wJ#ZhfIv9V&ca2}Ziwf>A6!0D=3&bkRBL3*# zZoV)1i?g+cqxDJ@H8~V5t!{O{tKfNe{ui- delta 1988 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 Y=2q>xrsmdxN!nYIWN0EUuP4p_7fIB8g8%>k delta 2069 zcmZ{lc|6qlAIHZyX58eOVVI*fjL;aRX~_ zte=h6QLc(1tkyXtSyvckZ8UaR?PKlZ@%#Ms`h4H-*W>g3K3?DF`!h!ROj5JA5f)Jd zfk03Y?_{OxQ2Wf%DIpLD4F-Xb08Sml^2p>I-Gh^BTZq1hp*he?d;Q7MlFy~gE^)b0 zug%S&(?=tzQ?k}4f}cT#248CqpS@BY2t^-{^%}UJrG!|iAHSia8alhKSU%fl@=LJ< zpMRcLwJsj{@g1h$St+R1+44_m?HYNbh)V}E_ev?bGb$J(*{yKjd>WllIySk=+7mq2 zOXsM}k=jJ=giuOWXZjJZICoKd^qP*; zL5_=`N$y<5-9>cZkhw=X5aYoM7n2fk>iI%bcziUrWA9vx6#65#kS00dVI|j@Ei|R$ z>-Xilh}%3@r9scoop858L06RJN#qV!68hH|ZGmI(JYl#4$63booRPE_@?Lv5m3RG~ zdu!Q!@%anNQ=H-x#%}*}hTJc(18Cri3Kvx2KrRBobkR zZ&5sCMSIm@ujkCmOderLmG5Fo*#Pa#BB(6lKnzq6hKV2ylpqWQ%gWK3tQQ*X;V^t^ zWWQYOpo`Q{&b1GDXQ^INNu~AKj}!eXmU|!xa=ebhUmq9Q{NVVR_$58gjS})I1B!n3 zk`U0Hd9bJO@;DtyZAnsTE!16{vkW3zY@aL8GQ^*cTyUD&;^hCULyFJN8cUW zVsUfn9M4Mm$hDbx9IKm9|B`yPgUF?g`d|KaP=wb>H}x82GSo%RRH$9oJg8tFF#O=3|^&2=}$Ef$RFV<}TNP*nWA>7V5>@C;!=};<7pV|E|%k>n5)v7>#zQ?gcw>t41|v~ zk0r+n81b0an|JS^43gGStf%_;QTFU@bfSGkcLgm=x@Kx(^uuo3sL(hW!?bDT#xm8o zjrcDEd}-#b7?oQOD}B^ze{Lcd_mD;om<(Cu?e7nrFHsHq-~DRX1S_9Cn@@6?Vb_FN zd~4hgpb1y-8-I~#a!B%K@jdQ5z2NC<`8yKt6bL`!wPxwXP)eD6v(=*_wv&xojby0I z2c1e0qrM=fo)*L)=gxK6NBx{+*}F&Umkl~3Cs*N2nX&KF22N#dab$zw9nZ8ql-PQ+ z2Z+&{NRLDl_pn*Ab?)%pv$S1)KP5yi`W7@_W#@_YI&u$)#Ff|A5{xdje(3cY%#!ai zn_QHL8eE!BVr1H|+s!7iV;jRgXJ*12CUvFHzuIRPOj}MAkQ9`3)t{2XBX5#q%5ohG zVOSW;KY1yi)GwZ}zq;Kzd&6;DV&)TeIseaA+B@BKloP9y{~wfgDOD9m3qms99%~4e zy@lO>LAvk{NFwfL_5IPmClI00eq>*do^MjMzZCIFja83~sDVjxKJWAKQ&wt$BbwnVnPxnaaRz{P2U1rJGj0jIdtZt>(oo3Xe8hV$%d2Vyy?HMl*gEj&yz=e=r z-5)@mNTElqHl6W1mJzG3u)^KP%&Lu#9FCCjwM@fiklzJ$6;%yqVzLWJBD*`|yPb7| z1;b6dZlQb^GuMBDMkHkXjA&(Ml*Aoox;qUOJZPUaj>fgA z8-;Ql3w@deI-&)YHXF8Ua;@Kk_{5FkiD_h5HzYOAsDS5W*=#Wv<-Lla|8w~WuB6Q+ z2u-kn{py-p|8CuyjbEwTYWdn)CIp~F)qp&8$sL9rnC>u~6y7x8x2d(a5d#1FpdEkC z4j)`p;6nq(8dxw#46sMSfO7&V3=v2;(5it05B)8dAqv0(1}hW|kddxnLn%RB5g?;P zffghdO#QkQ1E44z*g$%_Y7Xv~*_L8JHR=dBR~|Trh64~Z7TmolRRLQxPUtAWLc4 H&F}jQ-m7rJ 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,