Skip to content

Fix missing propagation of defines during build time #4245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atobiszei wants to merge 6 commits into
base: main
Choose a base branch
from
+29 −36
Open

Fix missing propagation of defines during build time #4245

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6542689
WIP: selective local_defines approach (fallback)
atobiszei May 25, 2026
7dd56ef
WIP: global COMMON_LOCAL_DEFINES approach (checkpoint)
atobiszei May 26, 2026
cd09a07
Use transitive defines in ovms_cc_library for PYTHON_DISABLE/MEDIAPIP…
atobiszei May 27, 2026
633489b
Rename LOCAL_DEFINES_PYTHON/MEDIAPIPE to DEFINES_PYTHON/MEDIAPIPE
atobiszei May 29, 2026
b531dfc
Self-review
atobiszei Jun 2, 2026
681822c
Merge remote-tracking branch 'origin/main' into atobisze_build_fixes
atobiszei Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions common_settings.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ load("//:distro.bzl", "distro_flag")
def ovms_cc_library(**kwargs):
"""
Wrapper for cc_library that sets default copts and linkopts if not provided.
Transitive defines (PYTHON_DISABLE, MEDIAPIPE_DISABLE) are always set via 'defines'
so that any target depending on an ovms_cc_library automatically gets these macros.
"""
if "copts" not in kwargs:
kwargs["copts"] = COMMON_STATIC_LIBS_COPTS + select({
Expand All @@ -41,10 +43,14 @@ def ovms_cc_library(**kwargs):
})
if "local_defines" not in kwargs:
kwargs["local_defines"] = COMMON_LOCAL_DEFINES
if "defines" not in kwargs:
kwargs["defines"] = COMMON_DEFINES
Comment thread
atobiszei marked this conversation as resolved.
if "additional_copts" in kwargs:
kwargs["copts"] += kwargs.pop("additional_copts")
if "additional_linkopts" in kwargs:
kwargs["linkopts"] += kwargs.pop("additional_linkopts")
if "additional_local_defines" in kwargs:
kwargs["local_defines"] += kwargs.pop("additional_local_defines")

native.cc_library(
**kwargs
Expand Down Expand Up @@ -235,18 +241,18 @@ COMMON_STATIC_LIBS_LINKOPTS = select({
"/LTCG",
],
})
COPTS_PYTHON = select({
"//conditions:default": ["-DPYTHON_DISABLE=1"],
"//:not_disable_python" : ["-DPYTHON_DISABLE=0"],
})
COPTS_MEDIAPIPE = select({
"//conditions:default": ["-DMEDIAPIPE_DISABLE=1"],
"//:not_disable_mediapipe" : ["-DMEDIAPIPE_DISABLE=0"],
})
COPTS_DROGON = select({
"//conditions:default": ["-DUSE_DROGON=0"],
"//:enable_drogon" : ["-DUSE_DROGON=1"],
})
DEFINES_PYTHON = select({
"//conditions:default": ["PYTHON_DISABLE=1"],
"//:not_disable_python" : ["PYTHON_DISABLE=0"],
})
DEFINES_MEDIAPIPE = select({
"//conditions:default": ["MEDIAPIPE_DISABLE=1"],
"//:not_disable_mediapipe" : ["MEDIAPIPE_DISABLE=0"],
})
COMMON_FUZZER_COPTS = [
"-fsanitize=address",
"-fprofile-generate",
Expand All @@ -259,6 +265,7 @@ COMMON_FUZZER_LINKOPTS = [
"-static-libasan",
]
COMMON_LOCAL_DEFINES = ["SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE"]
COMMON_DEFINES = DEFINES_PYTHON + DEFINES_MEDIAPIPE
PYBIND_DEPS = [
"//third_party:python3",
"@pybind11//:pybind11_embed",
Expand Down
22 changes: 11 additions & 11 deletions src/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
load("@bazel_skylib//lib:selects.bzl", "selects")
load("@mediapipe//mediapipe/framework:more_selects.bzl", "more_selects")
load("//:common_settings.bzl",
"COMMON_STATIC_TEST_COPTS", "COMMON_STATIC_LIBS_COPTS", "COMMON_STATIC_LIBS_LINKOPTS", "COMMON_FUZZER_COPTS", "COMMON_FUZZER_LINKOPTS", "COMMON_LOCAL_DEFINES", "COPTS_PYTHON", "COPTS_MEDIAPIPE", "COPTS_DROGON",
"COMMON_STATIC_TEST_COPTS", "COMMON_STATIC_LIBS_COPTS", "COMMON_STATIC_LIBS_LINKOPTS", "COMMON_FUZZER_COPTS", "COMMON_FUZZER_LINKOPTS", "COMMON_LOCAL_DEFINES", "COPTS_DROGON",
"create_config_settings", "PYBIND_DEPS", "ovms_cc_library")

COPTS_OV_TRACE = select({
Expand All @@ -32,7 +32,8 @@ COPTS_CLOUD = select({
"//:not_disable_cloud" : ["-DCLOUD_DISABLE=0"],
})

COPTS_TESTS = COMMON_STATIC_TEST_COPTS + COPTS_PYTHON + COPTS_MEDIAPIPE + COPTS_DROGON + COPTS_CLOUD
COPTS_TESTS = COMMON_STATIC_TEST_COPTS + COPTS_DROGON + COPTS_CLOUD


config_setting(
name = "windows",
Expand Down Expand Up @@ -320,7 +321,6 @@ ovms_cc_library(
"//:not_disable_mediapipe": ["//third_party:genai"],
"//conditions:default": [],
}),
additional_copts = COPTS_MEDIAPIPE,
visibility = ["//visibility:public",],
alwayslink = 1,
)
Expand Down Expand Up @@ -557,7 +557,6 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework/formats:tensor",
],
visibility = ["//visibility:public",],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE,
alwayslink = 1,
)
ovms_cc_library(
Expand All @@ -583,7 +582,6 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework/formats:tensor",
],
visibility = ["//visibility:public",],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE,
alwayslink = 1,
)
ovms_cc_library(
Expand Down Expand Up @@ -658,7 +656,6 @@ ovms_cc_library(
"//src/port:rapidjson_writer",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_MEDIAPIPE,
)
ovms_cc_library(
name = "rest_parser_utils",
Expand Down Expand Up @@ -765,7 +762,6 @@ ovms_cc_library(
"modelmanager",
"//src/metrics:libovmsmetrics",
],
additional_copts = COPTS_PYTHON,
visibility = ["//visibility:public"],
)
ovms_cc_library(
Expand Down Expand Up @@ -965,7 +961,7 @@ ovms_cc_library(
],
}),
visibility = ["//visibility:public",],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE + COPTS_DROGON + COPTS_OV_TRACE,
additional_copts = COPTS_DROGON + COPTS_OV_TRACE,
additional_linkopts = select({
"//conditions:default": ["-lOpenCL"], # TODO make as direct dependency
"//src:windows" : ["/DEFAULTLIB:Rpcrt4.lib"],}),
Expand Down Expand Up @@ -1370,7 +1366,7 @@ ovms_cc_library(
"//src/port:rapidjson_stringbuffer",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_MEDIAPIPE + COPTS_DROGON,
additional_copts = COPTS_DROGON,
)


Expand Down Expand Up @@ -2558,8 +2554,6 @@ cc_test(
":test_utils",
":test_test_with_temp_dir",
":test_platform_utils",
"//src/rerank:rerank_api_handler",
":embeddings_handler_tests",
":tokenize_parser_tests",
":inferencerequest_test",
":libtest_environment",
Expand Down Expand Up @@ -2599,6 +2593,8 @@ cc_test(
"@mediapipe//mediapipe/calculators/ovms:ovms_calculator",
"@mediapipe//mediapipe/framework:calculator_runner",
":text2image_test",
"//src/rerank:rerank_api_handler",
":embeddings_handler_tests",
],
"//:disable_mediapipe" :
[
Expand Down Expand Up @@ -2820,6 +2816,7 @@ cc_library(
"@com_google_googletest//:gtest",
],
copts = COPTS_TESTS,
local_defines = COMMON_LOCAL_DEFINES,
)
cc_library(
name = "libgit2_test",
Expand Down Expand Up @@ -3068,6 +3065,7 @@ cc_library(
"@com_google_googletest//:gtest",
],
copts = COPTS_TESTS,
local_defines = COMMON_LOCAL_DEFINES,
linkopts = [],
)
cc_library(
Expand All @@ -3081,6 +3079,7 @@ cc_library(
"@com_google_googletest//:gtest",
],
copts = COPTS_TESTS,
local_defines = COMMON_LOCAL_DEFINES,
linkopts = [],
)

Expand All @@ -3095,6 +3094,7 @@ cc_library(
"@com_google_googletest//:gtest",
],
copts = COPTS_TESTS,
local_defines = COMMON_LOCAL_DEFINES,
linkopts = [],
)

Expand Down
3 changes: 1 addition & 2 deletions src/graph_export/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

load("@mediapipe//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library", "mediapipe_proto_library")
load("//:common_settings.bzl", "COPTS_MEDIAPIPE", "ovms_cc_library")
load("//:common_settings.bzl", "ovms_cc_library")

ovms_cc_library(
name = "graph_export",
Expand All @@ -42,7 +42,6 @@ ovms_cc_library(
],
"//:disable_mediapipe": []
}),
additional_copts = COPTS_MEDIAPIPE,
visibility = ["//visibility:public"],
)

Expand Down
11 changes: 1 addition & 10 deletions src/llm/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

load("@mediapipe//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library", "mediapipe_proto_library")
load("//:common_settings.bzl", "ovms_cc_library", "PYBIND_DEPS", "COPTS_PYTHON")
load("//:common_settings.bzl", "ovms_cc_library", "PYBIND_DEPS")

ovms_cc_library(
name = "llmcalculator",
Expand All @@ -35,7 +35,6 @@ ovms_cc_library(
"//src:libovmslogging",
"//src:libovmsstring_utils",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON,
alwayslink = 1, # needed, so the calculator can be registered by MediaPipe
)

Expand Down Expand Up @@ -65,7 +64,6 @@ ovms_cc_library(
":output_parsers",
"//third_party:genai",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand All @@ -85,7 +83,6 @@ ovms_cc_library(
":output_parsers",
"//third_party:genai",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand All @@ -105,7 +102,6 @@ ovms_cc_library(
":output_parsers",
"//third_party:genai",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand All @@ -116,7 +112,6 @@ ovms_cc_library(
"//src/port:rapidjson_document",
":apis_tool_schema_wrapper",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand Down Expand Up @@ -291,7 +286,6 @@ ovms_cc_library(
"//src:libovmslogging",
"//third_party:genai",],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand Down Expand Up @@ -348,7 +342,6 @@ ovms_cc_library(
"//:not_disable_python" : [":py_jinja_template_processor"],
}),
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand All @@ -362,7 +355,6 @@ ovms_cc_library(
"//src:libovmsstatus",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

ovms_cc_library(
Expand All @@ -375,6 +367,5 @@ ovms_cc_library(
"//src/python:utils",
] + PYBIND_DEPS,
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON
)

6 changes: 1 addition & 5 deletions src/mediapipe_internal/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
load("//:common_settings.bzl", "COPTS_PYTHON", "COPTS_MEDIAPIPE", "ovms_cc_library")
load("//:common_settings.bzl", "ovms_cc_library")

ovms_cc_library(
name = "node_initializer",
Expand Down Expand Up @@ -61,7 +61,6 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework:calculator_graph",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_MEDIAPIPE,
)

ovms_cc_library(
Expand Down Expand Up @@ -94,7 +93,6 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework:calculator_graph",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE,
)

ovms_cc_library(
Expand Down Expand Up @@ -128,7 +126,6 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework:calculator_graph",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE,
)

ovms_cc_library(
Expand Down Expand Up @@ -194,6 +191,5 @@ ovms_cc_library(
"@mediapipe//mediapipe/framework/port:parse_text_proto",
],
visibility = ["//visibility:public"],
additional_copts = COPTS_PYTHON + COPTS_MEDIAPIPE,
alwayslink = 1,
)