Skip to content

Commit 1d55ab2

Browse files
committed
Merge branch-24.03 into branch-24.06
2 parents 41afd96 + 84bfffc commit 1d55ab2

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# MRC 24.03.01 (16 Apr 2024)
2+
3+
## 🐛 Bug Fixes
4+
5+
- Add auto register helpers to AsyncSink and AsyncSource ([#473](https://github.com/nv-morpheus/MRC/pull/473)) [@dagardner-nv](https://github.com/dagardner-nv)
6+
17
# MRC 24.03.00 (7 Apr 2024)
28

39
## 🚨 Breaking Changes

ci/scripts/cpp_checks.sh

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,19 +84,21 @@ if [[ -n "${MRC_MODIFIED_FILES}" ]]; then
8484
shopt -s extglob
8585
IWYU_MODIFIED_FILES=( "${MRC_MODIFIED_FILES[@]/*.@(h|hpp|cu)/}" )
8686

87-
# Get the list of compiled files relative to this directory
88-
WORKING_PREFIX="${PWD}/"
89-
COMPILED_FILES=( $(jq -r .[].file ${BUILD_DIR}/compile_commands.json | sort -u ) )
90-
COMPILED_FILES=( "${COMPILED_FILES[@]/#$WORKING_PREFIX/}" )
91-
COMBINED_FILES=("${COMPILED_FILES[@]}")
92-
COMBINED_FILES+=("${IWYU_MODIFIED_FILES[@]}")
87+
if [[ -n "${IWYU_MODIFIED_FILES}" ]]; then
88+
# Get the list of compiled files relative to this directory
89+
WORKING_PREFIX="${PWD}/"
90+
COMPILED_FILES=( $(jq -r .[].file ${BUILD_DIR}/compile_commands.json | sort -u ) )
91+
COMPILED_FILES=( "${COMPILED_FILES[@]/#$WORKING_PREFIX/}" )
92+
COMBINED_FILES=("${COMPILED_FILES[@]}")
93+
COMBINED_FILES+=("${IWYU_MODIFIED_FILES[@]}")
9394

94-
# Find the intersection between compiled files and modified files
95-
IWYU_MODIFIED_FILES=( $(printf '%s\0' "${COMBINED_FILES[@]}" | sort -z | uniq -d -z | xargs -0n1) )
95+
# Find the intersection between compiled files and modified files
96+
IWYU_MODIFIED_FILES=( $(printf '%s\0' "${COMBINED_FILES[@]}" | sort -z | uniq -d -z | xargs -0n1) )
9697

97-
NUM_PROC=$(get_num_proc)
98-
IWYU_OUTPUT=`${IWYU_TOOL} -p ${BUILD_DIR} -j ${NUM_PROC} ${IWYU_MODIFIED_FILES[@]} 2>&1`
99-
IWYU_RETVAL=$?
98+
NUM_PROC=$(get_num_proc)
99+
IWYU_OUTPUT=`${IWYU_TOOL} -p ${BUILD_DIR} -j ${NUM_PROC} ${IWYU_MODIFIED_FILES[@]} 2>&1`
100+
IWYU_RETVAL=$?
101+
fi
100102
fi
101103
else
102104
echo "No modified C++ files to check"

python/mrc/_pymrc/include/pymrc/asyncio_runnable.hpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#pragma once
1919

2020
#include "pymrc/asyncio_scheduler.hpp"
21+
#include "pymrc/edge_adapter.hpp"
22+
#include "pymrc/node.hpp"
2123
#include "pymrc/utilities/object_wrappers.hpp"
2224

2325
#include <boost/fiber/future/async.hpp>
@@ -110,7 +112,9 @@ class BoostFutureAwaitableOperation
110112
template <typename T>
111113
class AsyncSink : public mrc::node::WritableProvider<T>,
112114
public mrc::node::ReadableAcceptor<T>,
113-
public mrc::node::SinkChannelOwner<T>
115+
public mrc::node::SinkChannelOwner<T>,
116+
public pymrc::AutoRegSinkAdapter<T>,
117+
public pymrc::AutoRegEgressPort<T>
114118
{
115119
protected:
116120
AsyncSink() :
@@ -140,7 +144,9 @@ class AsyncSink : public mrc::node::WritableProvider<T>,
140144
template <typename T>
141145
class AsyncSource : public mrc::node::WritableAcceptor<T>,
142146
public mrc::node::ReadableProvider<T>,
143-
public mrc::node::SourceChannelOwner<T>
147+
public mrc::node::SourceChannelOwner<T>,
148+
public pymrc::AutoRegSourceAdapter<T>,
149+
public pymrc::AutoRegIngressPort<T>
144150
{
145151
protected:
146152
AsyncSource() :

0 commit comments

Comments
 (0)