Skip to content

Commit f3c0c51

Browse files
committed
Merge remote-tracking branch 'origin/master' into drt_abutment_debug
2 parents 0c5e92e + b45988b commit f3c0c51

131 files changed

Lines changed: 5841 additions & 1752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
build/
2+
debug/

.bazelrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
common --enable_bzlmod
2+
common --enable_workspace # explicitly currently still needing this
23

34
# suppress distracting warning about newer module
45
# versions found in dependency graph.
56
common --check_direct_dependencies=off
67

8+
# Test timeouts for various levels.
9+
test --test_timeout=300,1800,1800,9600
10+
11+
# bazel 7 is somewhat forgiving for glob patterns that don't
12+
# match, but bazel 8 will be strict. So start now.
13+
common --incompatible_disallow_empty_glob
14+
715
build --cxxopt "-std=c++17" --host_cxxopt "-std=c++17"
16+
build --cxxopt "-xc++" --host_cxxopt "-xc++"
817
build --cxxopt "-ffp-contract=off" --host_cxxopt "-ffp-contract=off"
918

1019
# allow exceptions.

.github/workflows/github-actions-bazel-build.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ jobs:
3232

3333
- name: Build
3434
run: |
35-
# For now, just run, but don't fail the whole CI, as bazel build is
36-
# experimental at this stage.
37-
bazel test -c opt --keep_going --show_timestamps --test_output=errors --curses=no --force_pic ... || /bin/true
35+
bazel test \
36+
-c opt \
37+
--keep_going \
38+
--show_timestamps \
39+
--test_output=errors \
40+
--curses=no \
41+
--force_pic \
42+
...
3843
3944
- name: Smoke test
4045
run: |

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ Precision Innovations, Inc.
1717
The Regents of the University of California
1818
The Regents of the University of Michigan
1919
The Regents of the University of Minnesota
20+
Øyvind Harboe - Zylin AS, Ascenium AS

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ cc_binary(
6464
":openroad_lib_private",
6565
"@rules_cc//cc/runfiles",
6666
],
67+
malloc = "@tcmalloc//tcmalloc",
6768
)
6869

6970
cc_library(
@@ -1201,6 +1202,7 @@ cc_binary(
12011202
":opensta_lib",
12021203
"@tk_tcl//:tcl",
12031204
],
1205+
malloc = "@tcmalloc//tcmalloc",
12041206
)
12051207

12061208
cc_library(

CMakeLists.txt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,20 @@ endif()
138138
add_subdirectory(src)
139139
add_subdirectory(test)
140140

141-
# After all compiled, look for the respective flags
141+
# Not currently used but may become useful again with Kokkos
142142
target_compile_definitions(openroad PRIVATE GPU)
143-
target_compile_definitions(openroad PRIVATE BUILD_PYTHON)
144-
target_compile_definitions(openroad PRIVATE BUILD_GUI)
143+
144+
if(BUILD_PYTHON)
145+
target_compile_definitions(openroad PRIVATE BUILD_PYTHON=1)
146+
else()
147+
target_compile_definitions(openroad PRIVATE BUILD_PYTHON=0)
148+
endif()
149+
150+
if(BUILD_GUI)
151+
target_compile_definitions(openroad PRIVATE BUILD_GUI=1)
152+
else()
153+
target_compile_definitions(openroad PRIVATE BUILD_GUI=0)
154+
endif()
145155

146156
####################################################################
147157

MODULE.bazel

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,17 @@ bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "rules_flex", version = "0.3.1")
1111
bazel_dep(name = "rules_bison", version = "0.3.1")
12+
13+
# The current rules_cc 0.1.1 hardcodes script locations to `#!/bin/bash`
14+
# instead of using `#!/usr/bin/env bash`.
15+
# This is fixed by https://github.com/bazelbuild/rules_cc/pull/306 but
16+
# is not released yet. Use rules_cc from that commit.
1217
bazel_dep(name = "rules_cc", version = "0.1.1")
18+
git_override(
19+
module_name = "rules_cc",
20+
commit = "d74915024017250e46d95e91a3defc34174effe0",
21+
remote = "https://github.com/bazelbuild/rules_cc",
22+
)
1323

1424
# Not all boost libs are available at the latest version yet, so use a
1525
# slightly older one that has all we need.
@@ -26,24 +36,25 @@ bazel_dep(name = "boost.bind", version = BOOST_VERSION)
2636
bazel_dep(name = "boost.config", version = BOOST_VERSION)
2737
bazel_dep(name = "boost.core", version = BOOST_VERSION)
2838
bazel_dep(name = "boost.fusion", version = BOOST_VERSION)
29-
bazel_dep(name = "boost.geometry", version = BOOST_VERSION)
30-
bazel_dep(name = "boost.graph", version = BOOST_VERSION)
39+
bazel_dep(name = "boost.geometry", version = BOOST_VERSION + ".bcr.2")
40+
bazel_dep(name = "boost.graph", version = BOOST_VERSION + ".bcr.2")
3141
bazel_dep(name = "boost.heap", version = BOOST_VERSION)
3242
bazel_dep(name = "boost.icl", version = BOOST_VERSION)
33-
bazel_dep(name = "boost.json", version = BOOST_VERSION)
34-
bazel_dep(name = "boost.lambda", version = BOOST_VERSION)
35-
bazel_dep(name = "boost.multi_array", version = BOOST_VERSION)
43+
bazel_dep(name = "boost.json", version = BOOST_VERSION + ".bcr.2")
44+
bazel_dep(name = "boost.lambda", version = BOOST_VERSION + ".bcr.2")
45+
bazel_dep(name = "boost.multi_array", version = BOOST_VERSION + ".bcr.2")
3646
bazel_dep(name = "boost.optional", version = BOOST_VERSION)
3747
bazel_dep(name = "boost.phoenix", version = BOOST_VERSION)
38-
bazel_dep(name = "boost.polygon", version = BOOST_VERSION)
39-
bazel_dep(name = "boost.property_tree", version = BOOST_VERSION)
48+
bazel_dep(name = "boost.polygon", version = BOOST_VERSION + ".bcr.2")
49+
bazel_dep(name = "boost.property_tree", version = BOOST_VERSION + ".bcr.2")
4050
bazel_dep(name = "boost.spirit", version = BOOST_VERSION)
4151
bazel_dep(name = "boost.stacktrace", version = BOOST_VERSION)
4252
bazel_dep(name = "boost.thread", version = BOOST_VERSION)
4353
bazel_dep(name = "cudd", version = "3.0.0")
4454
bazel_dep(name = "eigen", version = "3.4.0.bcr.2")
4555
bazel_dep(name = "or-tools", version = "9.12")
4656
bazel_dep(name = "spdlog", version = "1.15.1")
57+
bazel_dep(name = "tcmalloc", version = "0.0.0-20250331-43fcf6e")
4758
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
4859

4960
bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)
@@ -63,4 +74,5 @@ llvm.toolchain(
6374
use_repo(llvm, "llvm_toolchain")
6475
# use_repo(llvm, "llvm_toolchain_llvm") # if you depend on specific tools in scripts
6576

77+
# FYI: Comment out on NixOS where you'd like to use the local clang toolchain.
6678
register_toolchains("@llvm_toolchain//:all")

0 commit comments

Comments
 (0)