Skip to content

Commit

Permalink
Fix clang-format; suppress python warning with clang-tidy
Browse files Browse the repository at this point in the history
Signed-off-by: Will Killian <[email protected]>
  • Loading branch information
willkill07 committed Feb 27, 2025
1 parent 89bc282 commit 1db281c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/scripts/cpp_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if [[ -n "${MORPHEUS_MODIFIED_FILES}" ]]; then

# Run using a clang-tidy wrapper to allow warnings-as-errors and to eliminate any output except errors (since
# clang-tidy-diff.py doesn't return the correct error codes)
CLANG_TIDY_OUTPUT=`get_unified_diff ${CPP_FILE_REGEX} | ${CLANG_TIDY_DIFF} \
CLANG_TIDY_OUTPUT=`get_unified_diff ${CPP_FILE_REGEX} | python -W ignore ${CLANG_TIDY_DIFF} \
-extra-arg="-Wno-ignored-optimization-argument" -j 0 -path ${BUILD_DIR} -p1 -quiet 2>&1`

if [[ -n "${CLANG_TIDY_OUTPUT}" && ${CLANG_TIDY_OUTPUT} != "No relevant changes found." ]]; then
Expand Down
5 changes: 3 additions & 2 deletions python/morpheus/morpheus/_lib/modules/module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ PYBIND11_MODULE(modules, _module)
std::vector<unsigned int> mrc_version;
mrc_version.reserve(3);

auto re = pybind11::module_::import("re");
auto re = pybind11::module_::import("re");
auto mrc = pybind11::module_::import("mrc");
// re.compile(r"^(\d+)\.(\d+)\.(\d+)").match(mrc.__version__).groups()
for (const auto& x : re.attr("compile")(R"(^(\d+)\.(\d+)\.(\d+))").attr("match")(mrc.attr("__version__")).attr("groups")())
for (const auto& x :
re.attr("compile")(R"(^(\d+)\.(\d+)\.(\d+))").attr("match")(mrc.attr("__version__")).attr("groups")())
{
// int(x)
auto i = py::int_(py::reinterpret_borrow<py::object>(x));
Expand Down

0 comments on commit 1db281c

Please sign in to comment.