Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
yczhang-nv committed Aug 29, 2024
1 parent 41e9e2f commit c2bf5d3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion python/morpheus/morpheus/_lib/common/module.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "morpheus/export.h" // for MORPHEUS_EXPORT
#include "morpheus/messages/meta.hpp" // for MessageMeta
#include "morpheus/types.hpp" // for TensorIndex
#include "morpheus/utilities/json_types.hpp" // for json_t

#include <pybind11/pytypes.h> // for object, dict, list
Expand Down Expand Up @@ -161,7 +162,9 @@ enum class MORPHEUS_EXPORT ControlMessageType
// std::shared_ptr<TensorMemory> m_tensors;
// };

class MORPHEUS_EXPORT TensorMemory;
namespace morpheus {
class TensorMemory;
}

// System-clock for better compatibility with pybind11/chrono
using time_point_t = std::chrono::time_point<std::chrono::system_clock>;
Expand Down
5 changes: 3 additions & 2 deletions python/morpheus/morpheus/_lib/messages/module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "morpheus/objects/data_table.hpp"
#include "morpheus/objects/mutable_table_ctx_mgr.hpp"
#include "morpheus/pybind11/json.hpp" // IWYU pragma: keep
#include "morpheus/types.hpp" // for TensorIndex
#include "morpheus/utilities/cudf_util.hpp"
#include "morpheus/utilities/json_types.hpp" // for json_t
#include "morpheus/utilities/string_util.hpp"
Expand All @@ -45,7 +46,6 @@
#include <glog/logging.h> // for COMPACT_GOOGLE_LOG_INFO, LogMessage, VLOG
#include <mrc/edge/edge_connector.hpp>
#include <nlohmann/json.hpp> // for basic_json
#include <pybind11/detail/common.h>
#include <pybind11/functional.h> // IWYU pragma: keep
#include <pybind11/pybind11.h>
#include <pybind11/pytypes.h>
Expand Down Expand Up @@ -443,7 +443,8 @@ PYBIND11_MODULE(messages, _module)
py::arg("meta"))
.def("tensors", pybind11::overload_cast<>(&ControlMessage::tensors))
.def("tensors", pybind11::overload_cast<const std::shared_ptr<TensorMemory>&>(&ControlMessage::tensors))
.def("tensors", pybind11::overload_cast<ControlMessage&, const py::object&>(&ControlMessageProxy::set_tensors_from_python),
.def("tensors",
pybind11::overload_cast<ControlMessage&, const py::object&>(&ControlMessageProxy::set_tensors_from_python),
py::arg("tensors"))
.def("tensors",
pybind11::overload_cast<ControlMessage&, TensorIndex, py::object&>(
Expand Down
2 changes: 1 addition & 1 deletion python/morpheus/morpheus/_lib/src/messages/control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ void ControlMessageProxy::payload_from_python_meta(ControlMessage& self, const p

void ControlMessageProxy::set_tensors_from_python(ControlMessage& self, const pybind11::object& tensor_memory)
{
TensorIndex count = tensor_memory.attr("count").cast<TensorIndex>();
TensorIndex count = tensor_memory.attr("count").cast<TensorIndex>();
pybind11::object tensors = tensor_memory.attr("get_tensors")();
self.tensors(TensorMemoryInterfaceProxy::init(count, tensors));
}
Expand Down

0 comments on commit c2bf5d3

Please sign in to comment.