ieda: init at 0-unstable-2024-10-11 (#338769)

authored by Arne Keller and committed by GitHub e4dc3fd1 69382ad0

+761
+409
pkgs/by-name/ie/ieda/fix-bump-gcc.patch
···
··· 1 + From bce09ab2a483a29479518e28511a99a56c0ac943 Mon Sep 17 00:00:00 2001 2 + From: xinyangli <lixinyang411@gmail.com> 3 + Date: Sun, 1 Sep 2024 16:39:29 +0800 4 + Subject: [PATCH 1/3] refactor:use gtest instead of libgtest.a, .so can be used 5 + if provided 6 + 7 + --- 8 + .../iNO/external_libs/ino_test_external_libs.cmake | 11 ++++++----- 9 + .../iPL/external_libs/ipl_test_external_libs.cmake | 7 ++++--- 10 + .../iTO/external_libs/ito_test_external_libs.cmake | 11 ++++++----- 11 + 3 files changed, 16 insertions(+), 13 deletions(-) 12 + 13 + diff --git a/src/operation/iNO/external_libs/ino_test_external_libs.cmake b/src/operation/iNO/external_libs/ino_test_external_libs.cmake 14 + index be5764cc..cc3460a6 100644 15 + --- a/src/operation/iNO/external_libs/ino_test_external_libs.cmake 16 + +++ b/src/operation/iNO/external_libs/ino_test_external_libs.cmake 17 + @@ -1,8 +1,9 @@ 18 + add_library(ino_test_external_libs INTERFACE) 19 + 20 + -target_link_libraries(ino_test_external_libs 21 + +target_link_libraries(ino_test_external_libs 22 + INTERFACE 23 + - libgtest.a 24 + - libgtest_main.a 25 + - pthread 26 + -) 27 + \ No newline at end of file 28 + + gtest 29 + + gtest_main 30 + + pthread 31 + +) 32 + + 33 + diff --git a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake 34 + index 9accbee5..b763f91e 100644 35 + --- a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake 36 + +++ b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake 37 + @@ -2,7 +2,8 @@ add_library(ipl-test_external_libs INTERFACE) 38 + 39 + target_link_libraries(ipl-test_external_libs 40 + INTERFACE 41 + - libgtest.a 42 + - libgtest_main.a 43 + + gtest 44 + + gtest_main 45 + pthread 46 + -) 47 + \ No newline at end of file 48 + +) 49 + + 50 + diff --git a/src/operation/iTO/external_libs/ito_test_external_libs.cmake b/src/operation/iTO/external_libs/ito_test_external_libs.cmake 51 + index 9382d2e3..582e7abc 100644 52 + --- a/src/operation/iTO/external_libs/ito_test_external_libs.cmake 53 + +++ b/src/operation/iTO/external_libs/ito_test_external_libs.cmake 54 + @@ -1,8 +1,9 @@ 55 + add_library(ito_test_external_libs INTERFACE) 56 + 57 + -target_link_libraries(ito_test_external_libs 58 + +target_link_libraries(ito_test_external_libs 59 + INTERFACE 60 + - libgtest.a 61 + - libgtest_main.a 62 + - pthread 63 + -) 64 + \ No newline at end of file 65 + + gtest 66 + + gtest_main 67 + + pthread 68 + +) 69 + + 70 + -- 71 + 2.47.0 72 + 73 + 74 + From 56cd8a3c510b884cca7ef2bbc9e279feb57a3041 Mon Sep 17 00:00:00 2001 75 + From: xinyangli <lixinyang411@gmail.com> 76 + Date: Sun, 1 Sep 2024 16:44:07 +0800 77 + Subject: [PATCH 2/3] fix:missing headers in gcc 13 78 + 79 + --- 80 + src/database/basic/geometry/IdbGeometry.h | 1 + 81 + src/database/basic/geometry/IdbLayerShape.h | 3 ++- 82 + src/feature/database/feature_db.h | 1 + 83 + .../iCTS/source/data_manager/database/CtsCellLib.hh | 3 ++- 84 + .../iCTS/source/data_manager/io/report/CtsReport.hh | 3 ++- 85 + src/operation/iCTS/source/solver/database/Net.hh | 5 ++++- 86 + src/operation/iFP/source/module/tap_cell/tapcell.h | 4 +++- 87 + src/operation/iPDN/source/module/pdn_plan/pdn_plan.h | 4 ++-- 88 + src/operation/iPDN/source/module/pdn_via/pdn_via.h | 3 ++- 89 + .../iPL/source/module/detail_placer/database/DPNet.hh | 3 ++- 90 + .../iPL/source/module/detail_placer/database/DPPin.cc | 4 +++- 91 + src/operation/iRT/interface/RTInterface.hpp | 1 + 92 + src/third_party/CMakeLists.txt | 2 +- 93 + src/third_party/salt/refine/flip.cpp | 3 ++- 94 + 14 files changed, 28 insertions(+), 12 deletions(-) 95 + 96 + diff --git a/src/database/basic/geometry/IdbGeometry.h b/src/database/basic/geometry/IdbGeometry.h 97 + index ec16907c..a8b8a360 100644 98 + --- a/src/database/basic/geometry/IdbGeometry.h 99 + +++ b/src/database/basic/geometry/IdbGeometry.h 100 + @@ -34,6 +34,7 @@ 101 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 102 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 103 + 104 + +#include <cstdint> 105 + #include <iostream> 106 + #include <string> 107 + #include <vector> 108 + diff --git a/src/database/basic/geometry/IdbLayerShape.h b/src/database/basic/geometry/IdbLayerShape.h 109 + index 8c7ac435..35981708 100644 110 + --- a/src/database/basic/geometry/IdbLayerShape.h 111 + +++ b/src/database/basic/geometry/IdbLayerShape.h 112 + @@ -31,6 +31,7 @@ 113 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 114 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 115 + 116 + +#include <cstdint> 117 + #include <iostream> 118 + #include <string> 119 + #include <vector> 120 + @@ -110,4 +111,4 @@ class IdbLayerShape 121 + IdbLayer* _layer; 122 + std::vector<IdbRect*> _rect_list; 123 + }; 124 + -} // namespace idb 125 + \ No newline at end of file 126 + +} // namespace idb 127 + diff --git a/src/feature/database/feature_db.h b/src/feature/database/feature_db.h 128 + index 53ee71ca..71d8c3f3 100644 129 + --- a/src/feature/database/feature_db.h 130 + +++ b/src/feature/database/feature_db.h 131 + @@ -31,6 +31,7 @@ 132 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 133 + 134 + #include <cmath> 135 + +#include <cstdint> 136 + #include <iostream> 137 + #include <string> 138 + #include <vector> 139 + diff --git a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh 140 + index 43699ff5..b103a702 100644 141 + --- a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh 142 + +++ b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh 143 + @@ -26,6 +26,7 @@ 144 + #include <map> 145 + #include <span> 146 + #include <tuple> 147 + +#include <unordered_map> 148 + #include <vector> 149 + 150 + #include "ModelFactory.hh" 151 + @@ -187,4 +188,4 @@ class CtsLibs 152 + std::unordered_map<std::string, ModelBase*> _model_maps; 153 + #endif 154 + }; 155 + -} // namespace icts 156 + \ No newline at end of file 157 + +} // namespace icts 158 + diff --git a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh 159 + index 8798e50e..b88df74c 100644 160 + --- a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh 161 + +++ b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh 162 + @@ -23,6 +23,7 @@ 163 + #include <fstream> 164 + #include <iostream> 165 + #include <map> 166 + +#include <memory> 167 + #include <string> 168 + #include <utility> 169 + #include <vector> 170 + @@ -70,4 +71,4 @@ class CtsReportTable : public ieda::ReportTable 171 + static std::unique_ptr<CtsReportTable> createReportTable(const std::string& tbl_name, const CtsReportType& type); 172 + }; 173 + 174 + -} // namespace icts 175 + \ No newline at end of file 176 + +} // namespace icts 177 + diff --git a/src/operation/iCTS/source/solver/database/Net.hh b/src/operation/iCTS/source/solver/database/Net.hh 178 + index 85c1751b..5cbc0470 100644 179 + --- a/src/operation/iCTS/source/solver/database/Net.hh 180 + +++ b/src/operation/iCTS/source/solver/database/Net.hh 181 + @@ -20,6 +20,9 @@ 182 + */ 183 + #pragma once 184 + class Pin; 185 + +#include <algorithm> 186 + +#include <cstdint> 187 + + 188 + #include "CTSAPI.hh" 189 + #include "Pin.hh" 190 + 191 + @@ -70,4 +73,4 @@ class Net 192 + Pin* _driver_pin = nullptr; 193 + std::vector<Pin*> _load_pins = {}; 194 + }; 195 + -} // namespace icts 196 + \ No newline at end of file 197 + +} // namespace icts 198 + diff --git a/src/operation/iFP/source/module/tap_cell/tapcell.h b/src/operation/iFP/source/module/tap_cell/tapcell.h 199 + index 4af86b51..e15ba4a3 100644 200 + --- a/src/operation/iFP/source/module/tap_cell/tapcell.h 201 + +++ b/src/operation/iFP/source/module/tap_cell/tapcell.h 202 + @@ -16,6 +16,8 @@ 203 + // *************************************************************************************** 204 + #pragma once 205 + 206 + +#include <stdint.h> 207 + + 208 + #include <iostream> 209 + #include <string> 210 + #include <vector> 211 + @@ -58,4 +60,4 @@ class TapCellPlacer 212 + int32_t getCellMasterWidthByOrient(idb::IdbCellMaster* cell_master, idb::IdbOrient orinet); 213 + }; 214 + 215 + -} // namespace ifp 216 + \ No newline at end of file 217 + +} // namespace ifp 218 + diff --git a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h 219 + index e46b5c34..82de562b 100644 220 + --- a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h 221 + +++ b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h 222 + @@ -16,13 +16,13 @@ 223 + // *************************************************************************************** 224 + #pragma once 225 + 226 + +#include <cstdint> 227 + #include <map> 228 + #include <string> 229 + #include <vector> 230 + 231 + #include "ipdn_basic.h" 232 + #include "pdn_cut_stripe.h" 233 + - 234 + namespace idb { 235 + class IdbLayer; 236 + class IdbSpecialWireSegment; 237 + @@ -108,4 +108,4 @@ class PdnPlan 238 + std::vector<idb::IdbSpecialWireSegment*>& segment_list_bottom); 239 + }; 240 + 241 + -} // namespace ipdn 242 + \ No newline at end of file 243 + +} // namespace ipdn 244 + diff --git a/src/operation/iPDN/source/module/pdn_via/pdn_via.h b/src/operation/iPDN/source/module/pdn_via/pdn_via.h 245 + index 837399ce..e0fe85bf 100644 246 + --- a/src/operation/iPDN/source/module/pdn_via/pdn_via.h 247 + +++ b/src/operation/iPDN/source/module/pdn_via/pdn_via.h 248 + @@ -16,6 +16,7 @@ 249 + // *************************************************************************************** 250 + #pragma once 251 + 252 + +#include <cstdint> 253 + #include <string> 254 + #include <vector> 255 + 256 + @@ -64,4 +65,4 @@ class PdnVia 257 + int32_t transUnitDB(double value); 258 + }; 259 + 260 + -} // namespace ipdn 261 + \ No newline at end of file 262 + +} // namespace ipdn 263 + diff --git a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh 264 + index f0013433..890111c5 100644 265 + --- a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh 266 + +++ b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh 267 + @@ -27,6 +27,7 @@ 268 + #ifndef IPL_DPNET_H 269 + #define IPL_DPNET_H 270 + 271 + +#include <cstdint> 272 + #include <string> 273 + #include <vector> 274 + 275 + @@ -92,4 +93,4 @@ class DPNet 276 + std::vector<DPPin*> _pins; 277 + }; 278 + } // namespace ipl 279 + -#endif 280 + \ No newline at end of file 281 + +#endif 282 + diff --git a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc 283 + index 93aea277..537b1282 100644 284 + --- a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc 285 + +++ b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc 286 + @@ -16,6 +16,8 @@ 287 + // *************************************************************************************** 288 + #include "DPPin.hh" 289 + 290 + +#include <cstdint> 291 + + 292 + namespace ipl { 293 + 294 + DPPin::DPPin(std::string name) 295 + @@ -35,4 +37,4 @@ DPPin::~DPPin() 296 + { 297 + } 298 + 299 + -} // namespace ipl 300 + \ No newline at end of file 301 + +} // namespace ipl 302 + diff --git a/src/operation/iRT/interface/RTInterface.hpp b/src/operation/iRT/interface/RTInterface.hpp 303 + index 5a6c3c18..45a4952e 100644 304 + --- a/src/operation/iRT/interface/RTInterface.hpp 305 + +++ b/src/operation/iRT/interface/RTInterface.hpp 306 + @@ -17,6 +17,7 @@ 307 + #pragma once 308 + 309 + #include <any> 310 + +#include <cstdint> 311 + #include <map> 312 + #include <set> 313 + #include <string> 314 + diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt 315 + index cb66c339..29f6b02d 100644 316 + --- a/src/third_party/CMakeLists.txt 317 + +++ b/src/third_party/CMakeLists.txt 318 + @@ -12,4 +12,4 @@ add_subdirectory(yaml-cpp) 319 + # add_subdirectory(mt-kahypar) 320 + if(BUILD_GUI) 321 + add_subdirectory(tcl_qt) 322 + -endif() 323 + \ No newline at end of file 324 + +endif() 325 + diff --git a/src/third_party/salt/refine/flip.cpp b/src/third_party/salt/refine/flip.cpp 326 + index 5dad3766..73743f3c 100644 327 + --- a/src/third_party/salt/refine/flip.cpp 328 + +++ b/src/third_party/salt/refine/flip.cpp 329 + @@ -3,6 +3,7 @@ 330 + #include "salt/base/eval.h" 331 + 332 + #include <algorithm> 333 + +#include <array> 334 + 335 + namespace salt { 336 + 337 + @@ -197,4 +198,4 @@ void Refine::flip(Tree& tree) { 338 + } while (cur.wireLength < pre.wireLength); 339 + } 340 + 341 + -} // namespace salt 342 + \ No newline at end of file 343 + +} // namespace salt 344 + -- 345 + 2.47.0 346 + 347 + 348 + From 55e689db3a9d2a51828806ab46ff655cc4c1193c Mon Sep 17 00:00:00 2001 349 + From: xinyangli <lixinyang411@gmail.com> 350 + Date: Sun, 1 Sep 2024 17:00:37 +0800 351 + Subject: [PATCH 3/3] fix:glog force size_t on sighandler from 0.6 352 + 353 + --- 354 + src/operation/iPL/source/module/logger/Log.cc | 5 +++-- 355 + src/utility/log/Log.cc | 3 ++- 356 + 2 files changed, 5 insertions(+), 3 deletions(-) 357 + 358 + diff --git a/src/operation/iPL/source/module/logger/Log.cc b/src/operation/iPL/source/module/logger/Log.cc 359 + index c94d3907..2fc70b31 100644 360 + --- a/src/operation/iPL/source/module/logger/Log.cc 361 + +++ b/src/operation/iPL/source/module/logger/Log.cc 362 + @@ -26,6 +26,7 @@ 363 + 364 + #include "Log.hh" 365 + 366 + +#include <cstddef> 367 + #include <filesystem> 368 + #include <fstream> 369 + #include <functional> 370 + @@ -40,7 +41,7 @@ namespace ipl { 371 + * @param {int} size 372 + * @return {*} 373 + */ 374 + -void SignalHandle(const char* data, int size) 375 + +void SignalHandle(const char* data, std::size_t size) 376 + { 377 + std::ofstream fs("glog_dump.log", std::ios::app); 378 + std::string str = std::string(data, size); 379 + @@ -101,4 +102,4 @@ void Log::makeSureDirectoryExist(std::string directory_path) 380 + std::filesystem::create_directories(directory_path.c_str()); 381 + } 382 + 383 + -} // namespace ipl 384 + \ No newline at end of file 385 + +} // namespace ipl 386 + diff --git a/src/utility/log/Log.cc b/src/utility/log/Log.cc 387 + index 42d43041..190566a3 100644 388 + --- a/src/utility/log/Log.cc 389 + +++ b/src/utility/log/Log.cc 390 + @@ -24,6 +24,7 @@ 391 + 392 + #include "Log.hh" 393 + 394 + +#include <cstddef> 395 + #include <fstream> 396 + #include <functional> 397 + #include <iostream> 398 + @@ -39,7 +40,7 @@ namespace ieda { 399 + * @param data 400 + * @param size 401 + */ 402 + -void SignalHandle(const char* data, int size) 403 + +void SignalHandle(const char* data, std::size_t size) 404 + { 405 + std::ofstream fs("glog_dump.log", std::ios::app); 406 + std::string str = std::string(data, size); 407 + -- 408 + 2.47.0 409 +
+118
pkgs/by-name/ie/ieda/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchgit, 5 + callPackages, 6 + cmake, 7 + ninja, 8 + flex, 9 + bison, 10 + zlib, 11 + tcl, 12 + boost, 13 + eigen, 14 + yaml-cpp, 15 + libunwind, 16 + glog, 17 + gtest, 18 + gflags, 19 + metis, 20 + gmp, 21 + python3, 22 + onnxruntime, 23 + }: 24 + let 25 + rootSrc = stdenv.mkDerivation { 26 + pname = "iEDA-src"; 27 + version = "2024-09-10"; 28 + src = fetchgit { 29 + url = "https://gitee.com/oscc-project/iEDA"; 30 + rev = "a68b691b9d25fafd8c10fae3df7ef3837a42e052"; 31 + sha256 = "sha256-0rSESfNqI3ALipNAInwcYSccq9C0WuXI9na44TyYAgY="; 32 + }; 33 + 34 + patches = [ 35 + ./fix-bump-gcc.patch 36 + 37 + # We need to build rust projects with rustPlatform 38 + # and remove hard coded linking to libonnxruntime 39 + ./remove-subprojects-from-cmake.patch 40 + ]; 41 + 42 + postPatch = '' 43 + substituteInPlace CMakeLists.txt \ 44 + --replace-fail 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")' 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2")' 45 + ''; 46 + 47 + dontBuild = true; 48 + dontFixup = true; 49 + installPhase = '' 50 + cp -r . $out 51 + ''; 52 + 53 + }; 54 + 55 + rustpkgs = callPackages ./rustpkgs.nix { inherit rootSrc; }; 56 + in 57 + stdenv.mkDerivation { 58 + pname = "iEDA"; 59 + version = "0-unstable-2024-10-11"; 60 + 61 + src = rootSrc; 62 + 63 + nativeBuildInputs = [ 64 + cmake 65 + ninja 66 + flex 67 + bison 68 + python3 69 + tcl 70 + ]; 71 + 72 + cmakeFlags = [ 73 + (lib.cmakeBool "CMD_BUILD" true) 74 + (lib.cmakeBool "SANITIZER" false) 75 + (lib.cmakeBool "BUILD_STATIC_LIB" false) 76 + ]; 77 + 78 + preConfigure = '' 79 + cmakeFlags+=" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:FILEPATH=$out/bin -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:FILEPATH=$out/lib" 80 + ''; 81 + 82 + buildInputs = [ 83 + rustpkgs.iir-rust 84 + rustpkgs.sdf_parse 85 + rustpkgs.spef-parser 86 + rustpkgs.vcd_parser 87 + rustpkgs.verilog-parser 88 + rustpkgs.liberty-parser 89 + gtest 90 + glog 91 + gflags 92 + boost 93 + onnxruntime 94 + eigen 95 + yaml-cpp 96 + libunwind 97 + metis 98 + gmp 99 + tcl 100 + zlib 101 + ]; 102 + 103 + postInstall = '' 104 + # Tests rely on hardcoded path, so they should not be included 105 + rm $out/bin/*test $out/bin/*Test $out/bin/test_* $out/bin/*_app 106 + ''; 107 + 108 + enableParallelBuild = true; 109 + 110 + meta = { 111 + description = "Open-source EDA infracstructure and tools from Netlist to GDS for ASIC design"; 112 + homepage = "https://gitee.com/oscc-project/iEDA"; 113 + license = lib.licenses.mulan-psl2; 114 + maintainers = with lib.maintainers; [ xinyangli ]; 115 + mainProgram = "iEDA"; 116 + platforms = lib.platforms.linux; 117 + }; 118 + }
+166
pkgs/by-name/ie/ieda/remove-subprojects-from-cmake.patch
···
··· 1 + From 170a842da107e937c1c62c2a318ef84d49e1d292 Mon Sep 17 00:00:00 2001 2 + From: xinyangli <lixinyang411@gmail.com> 3 + Date: Fri, 30 Aug 2024 17:33:15 +0800 4 + Subject: [PATCH 1/2] fix:wrong headers in nix 5 + 6 + --- 7 + src/operation/iCTS/api/CTSAPI.hh | 1 + 8 + src/utility/tcl/ScriptEngine.hh | 2 +- 9 + 2 files changed, 2 insertions(+), 1 deletion(-) 10 + 11 + diff --git a/src/operation/iCTS/api/CTSAPI.hh b/src/operation/iCTS/api/CTSAPI.hh 12 + index c0881dc0..85c38728 100644 13 + --- a/src/operation/iCTS/api/CTSAPI.hh 14 + +++ b/src/operation/iCTS/api/CTSAPI.hh 15 + @@ -28,6 +28,7 @@ 16 + #include <string_view> 17 + #include <type_traits> 18 + #include <vector> 19 + +#include <optional> 20 + 21 + #include "../../../database/interaction/ids.hpp" 22 + 23 + diff --git a/src/utility/tcl/ScriptEngine.hh b/src/utility/tcl/ScriptEngine.hh 24 + index 3e679de2..78e9d24d 100644 25 + --- a/src/utility/tcl/ScriptEngine.hh 26 + +++ b/src/utility/tcl/ScriptEngine.hh 27 + @@ -24,7 +24,7 @@ 28 + 29 + #pragma once 30 + 31 + -#include <tcl8.6/tcl.h> 32 + +#include <tcl.h> 33 + 34 + #include <memory> 35 + #include <mutex> 36 + -- 37 + 2.47.0 38 + 39 + 40 + From 66e3e69aa12a331d3724314ac06cd713ebb152d9 Mon Sep 17 00:00:00 2001 41 + From: xinyangli <lixinyang411@gmail.com> 42 + Date: Sat, 31 Aug 2024 23:28:30 +0800 43 + Subject: [PATCH 2/2] remove rust packages and onnxruntime lib from cmake 44 + 45 + --- 46 + src/database/manager/parser/liberty/CMakeLists.txt | 6 +++--- 47 + src/database/manager/parser/spef/CMakeLists.txt | 4 ++-- 48 + src/database/manager/parser/vcd/CMakeLists.txt | 6 +++--- 49 + src/database/manager/parser/verilog/CMakeLists.txt | 6 +++--- 50 + src/operation/iIR/source/iir-rust/CMakeLists.txt | 4 ++-- 51 + src/operation/iSTA/CMakeLists.txt | 2 +- 52 + 6 files changed, 14 insertions(+), 14 deletions(-) 53 + 54 + diff --git a/src/database/manager/parser/liberty/CMakeLists.txt b/src/database/manager/parser/liberty/CMakeLists.txt 55 + index cf9ee880..c03f9dbe 100644 56 + --- a/src/database/manager/parser/liberty/CMakeLists.txt 57 + +++ b/src/database/manager/parser/liberty/CMakeLists.txt 58 + @@ -22,9 +22,9 @@ endif() 59 + 60 + message("liberty parser rust lib path ${RUST_LIB_PATH}") 61 + 62 + -ADD_EXTERNAL_PROJ(liberty) 63 + +# ADD_EXTERNAL_PROJ(liberty) 64 + 65 + -target_link_libraries(liberty str sta-solver log ${RUST_LIB_PATH} dl) 66 + +target_link_libraries(liberty str sta-solver log liberty_parser dl) 67 + 68 + target_include_directories(liberty PUBLIC 69 + ${CMAKE_CURRENT_SOURCE_DIR} 70 + @@ -35,4 +35,4 @@ target_link_libraries(test_lib liberty) 71 + target_include_directories(test_lib PUBLIC 72 + ${CMAKE_CURRENT_SOURCE_DIR}) 73 + 74 + -install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin) 75 + \ No newline at end of file 76 + +# install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin) 77 + diff --git a/src/database/manager/parser/spef/CMakeLists.txt b/src/database/manager/parser/spef/CMakeLists.txt 78 + index 0d8672ed..9e27083b 100644 79 + --- a/src/database/manager/parser/spef/CMakeLists.txt 80 + +++ b/src/database/manager/parser/spef/CMakeLists.txt 81 + @@ -22,9 +22,9 @@ endif() 82 + 83 + message("spef parser rust lib path ${RUST_LIB_PATH}") 84 + 85 + -ADD_EXTERNAL_PROJ(spef) 86 + +# ADD_EXTERNAL_PROJ(spef) 87 + 88 + -target_link_libraries(spef log ${RUST_LIB_PATH} dl) 89 + +target_link_libraries(spef log spef_parser dl) 90 + target_include_directories(spef PUBLIC 91 + ${CMAKE_CURRENT_SOURCE_DIR}) 92 + 93 + diff --git a/src/database/manager/parser/vcd/CMakeLists.txt b/src/database/manager/parser/vcd/CMakeLists.txt 94 + index 3a9cfddb..89bad504 100644 95 + --- a/src/database/manager/parser/vcd/CMakeLists.txt 96 + +++ b/src/database/manager/parser/vcd/CMakeLists.txt 97 + @@ -21,9 +21,9 @@ endif() 98 + 99 + message("vcd parser rust lib path ${RUST_LIB_PATH}") 100 + 101 + -ADD_EXTERNAL_PROJ(vcd) 102 + +# ADD_EXTERNAL_PROJ(vcd) 103 + 104 + -target_link_libraries(vcd ${RUST_LIB_PATH} dl) 105 + +target_link_libraries(vcd vcd_parser dl) 106 + target_include_directories(vcd PUBLIC 107 + ${CMAKE_CURRENT_SOURCE_DIR}) 108 + 109 + @@ -31,4 +31,4 @@ add_executable(test_vcd ${CMAKE_CURRENT_SOURCE_DIR}/vcd_parser/test/test.cpp) 110 + target_link_libraries(test_vcd vcd) 111 + target_include_directories(test_vcd PUBLIC 112 + ${CMAKE_CURRENT_SOURCE_DIR}) 113 + - 114 + \ No newline at end of file 115 + + 116 + diff --git a/src/database/manager/parser/verilog/CMakeLists.txt b/src/database/manager/parser/verilog/CMakeLists.txt 117 + index a3f21183..e2a55cfc 100644 118 + --- a/src/database/manager/parser/verilog/CMakeLists.txt 119 + +++ b/src/database/manager/parser/verilog/CMakeLists.txt 120 + @@ -25,12 +25,12 @@ endif() 121 + 122 + message("verilog parser rust lib path ${RUST_LIB_PATH}") 123 + 124 + -ADD_EXTERNAL_PROJ(verilog) 125 + +# ADD_EXTERNAL_PROJ(verilog) 126 + 127 + -target_link_libraries(verilog str log ${ZLIB_LIBRARIES} ${RUST_LIB_PATH} dl) 128 + +target_link_libraries(verilog str log ${ZLIB_LIBRARIES} verilog_parser dl) 129 + 130 + target_include_directories(verilog 131 + PUBLIC 132 + ${HOME_OPERATION}/iSTA/include 133 + ${CMAKE_CURRENT_SOURCE_DIR} 134 + -) 135 + \ No newline at end of file 136 + +) 137 + diff --git a/src/operation/iIR/source/iir-rust/CMakeLists.txt b/src/operation/iIR/source/iir-rust/CMakeLists.txt 138 + index 69e7009c..049c0012 100644 139 + --- a/src/operation/iIR/source/iir-rust/CMakeLists.txt 140 + +++ b/src/operation/iIR/source/iir-rust/CMakeLists.txt 141 + @@ -22,6 +22,6 @@ endif() 142 + 143 + message("iIR rust lib path ${RUST_LIB_PATH}") 144 + 145 + -ADD_EXTERNAL_PROJ(iir) 146 + +# ADD_EXTERNAL_PROJ(iir) 147 + 148 + -target_link_libraries(iIR-Rust PRIVATE ${RUST_LIB_PATH} dl) 149 + \ No newline at end of file 150 + +target_link_libraries(iIR-Rust PRIVATE iir dl) 151 + diff --git a/src/operation/iSTA/CMakeLists.txt b/src/operation/iSTA/CMakeLists.txt 152 + index 31563917..9a1207a5 100644 153 + --- a/src/operation/iSTA/CMakeLists.txt 154 + +++ b/src/operation/iSTA/CMakeLists.txt 155 + @@ -24,7 +24,7 @@ include_directories(${HOME_THIRDPARTY}/yaml-cpp/include) 156 + include(${HOME_CMAKE}/operation/idb.cmake) 157 + 158 + link_directories(${CMAKE_BINARY_DIR}/lib) 159 + -link_directories(${HOME_THIRDPARTY}/onnxruntime/) 160 + +# link_directories(${HOME_THIRDPARTY}/onnxruntime/) 161 + 162 + find_package(Eigen3 REQUIRED) 163 + 164 + -- 165 + 2.47.0 166 +
+68
pkgs/by-name/ie/ieda/rustpkgs.nix
···
··· 1 + { rustPlatform, rootSrc }: 2 + let 3 + mkRustpkgs = _: p: rustPlatform.buildRustPackage p; 4 + in 5 + (builtins.mapAttrs mkRustpkgs { 6 + iir-rust = rec { 7 + pname = "iir-rust"; 8 + version = "0.1.3"; 9 + src = rootSrc; 10 + sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir"; 11 + cargoHash = "sha256-ka91IsmBGBYts4U9X4uZDUMeS9adPn3MKl2BY4ZKDCY="; 12 + 13 + doCheck = false; 14 + 15 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 16 + }; 17 + liberty-parser = rec { 18 + pname = "liberty-parser"; 19 + version = "0.1.0"; 20 + src = rootSrc; 21 + sourceRoot = "${src.name}/src/database/manager/parser/liberty/lib-rust/liberty-parser"; 22 + cargoHash = "sha256-7yUD8M3efisuVoH3/R+Pk2CP4mizSinrqeuy3uqkq2c="; 23 + 24 + doCheck = false; 25 + 26 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 27 + }; 28 + sdf_parse = rec { 29 + pname = "sdf_parse"; 30 + version = "0.1.0"; 31 + src = rootSrc; 32 + sourceRoot = "${src.name}/src/database/manager/parser/sdf/sdf_parse"; 33 + cargoHash = "sha256-6uzufy3S21vHJYgx9sItxQyccG0g/Zz1r2xHsYoQPRM="; 34 + 35 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 36 + }; 37 + spef-parser = rec { 38 + pname = "spef-parser"; 39 + version = "0.2.4"; 40 + src = rootSrc; 41 + sourceRoot = "${src.name}/src/database/manager/parser/spef/spef-parser"; 42 + cargoHash = "sha256-KTd3HVKV8hRCXf56FPksYGVJNDdlmMMIcSEk1MMGLsw="; 43 + 44 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 45 + }; 46 + vcd_parser = rec { 47 + pname = "vcd_parser"; 48 + version = "0.1.0"; 49 + src = rootSrc; 50 + sourceRoot = "${src.name}/src/database/manager/parser/vcd/vcd_parser"; 51 + cargoHash = "sha256-1y1nPNfx23MyIJUV+E6mMuDOhdob0BDGuQwOl0Le/lE="; 52 + 53 + doCheck = false; 54 + 55 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 56 + }; 57 + verilog-parser = rec { 58 + pname = "verilog-parser"; 59 + version = "0.1.0"; 60 + src = rootSrc; 61 + sourceRoot = "${src.name}/src/database/manager/parser/verilog/verilog-rust/verilog-parser"; 62 + cargoHash = "sha256-Z/LXQzQ0m1lQdIPaWQ5rs2EAu/mbyi2JvrjGYVmKONs="; 63 + 64 + doCheck = false; 65 + 66 + nativeBuildInputs = [ rustPlatform.bindgenHook ]; 67 + }; 68 + })