Skip to content
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

Change threading related interface from API 1.0 to 2.0 #766

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Change threading related interface from API 1.0 to 2.0 #766

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4b4aa0
change thrading related interface from API 1.0 to 2.0
sunxiaoxia2022 Nov 21, 2023
af198b1
restore the order of header files
sunxiaoxia2022 Nov 21, 2023
51f0fb5
change <> to quotation marks
sunxiaoxia2022 Nov 22, 2023
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
10 changes: 4 additions & 6 deletions modules/nvidia_plugin/src/cuda_compiled_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <fmt/format.h>

#include <memory_manager/cuda_memory_manager.hpp>
#include <openvino/runtime/threading/executor_manager.hpp>
#include <ops/nop_op.hpp>
ilya-lavrenov marked this conversation as resolved.
Show resolved Hide resolved
#include <ops/subgraph.hpp>
#include <threading/ie_executor_manager.hpp>
#include <utility>

#include "cuda_compiled_model.hpp"
Expand All @@ -26,16 +26,14 @@
#include "memory_manager/model/cuda_memory_model_builder.hpp"
#include "nvidia/nvidia_config.hpp"
#include "nvidia/properties.hpp"

#include "openvino/runtime/exec_model_info.hpp"
#include "openvino/runtime/internal_properties.hpp"
#include "openvino/runtime/iplugin.hpp"
#include "ops/parameter.hpp"
#include "ops/result.hpp"
#include "transformations/utils/utils.hpp"
#include "transformer/cuda_graph_transformer.hpp"

#include "openvino/runtime/exec_model_info.hpp"
#include "openvino/runtime/internal_properties.hpp"
#include "openvino/runtime/iplugin.hpp"

namespace {
static constexpr const char* nv_stream_executor_name = "NvidiaStreamExecutor";
static constexpr const char* nv_exclusive_executor = "NvidiaExecutor";
Expand Down
2 changes: 1 addition & 1 deletion modules/nvidia_plugin/src/cuda_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "nvidia/nvidia_config.hpp"
#include "openvino/runtime/properties.hpp"
#include "threading/ie_istreams_executor.hpp"
#include "openvino/runtime/threading/istreams_executor.hpp"

namespace ov {
namespace nvidia_gpu {
Expand Down
2 changes: 1 addition & 1 deletion modules/nvidia_plugin/src/cuda_infer_request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <gsl/span_ext>
#include <map>
#include <memory>
#include <openvino/runtime/threading/executor_manager.hpp>
ilya-lavrenov marked this conversation as resolved.
Show resolved Hide resolved
#include <string>
#include <threading/ie_executor_manager.hpp>
#include <utility>

#include "cuda_compiled_model.hpp"
Expand Down
6 changes: 4 additions & 2 deletions modules/nvidia_plugin/src/cuda_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "openvino/op/util/op_types.hpp"
#include "openvino/runtime/core.hpp"
#include "openvino/runtime/properties.hpp"
#include "threading/ie_executor_manager.hpp"
#include "openvino/runtime/threading/executor_manager.hpp"
#include "transformations/rt_info/fused_names_attribute.hpp"

using namespace ov::nvidia_gpu;
Expand Down Expand Up @@ -215,7 +215,9 @@ ov::Any Plugin::get_property(const std::string& name, const ov::AnyMap& properti
} else if (METRIC_KEY(SUPPORTED_CONFIG_KEYS) == name) {
ilya-lavrenov marked this conversation as resolved.
Show resolved Hide resolved
std::vector<std::string> configKeys = {
CONFIG_KEY(DEVICE_ID), CONFIG_KEY(PERF_COUNT), NVIDIA_CONFIG_KEY(THROUGHPUT_STREAMS)};
auto streamExecutorConfigKeys = InferenceEngine::IStreamsExecutor::Config{}.SupportedKeys();
auto streamExecutorConfigKeys = ov::threading::IStreamsExecutor::Config{}
.get_property(ov::supported_properties.name())
.as<std::vector<std::string>>();
for (auto&& configKey : streamExecutorConfigKeys) {
if (configKey != InferenceEngine::PluginConfigParams::KEY_CPU_THROUGHPUT_STREAMS) {
configKeys.emplace_back(configKey);
Expand Down
2 changes: 1 addition & 1 deletion modules/nvidia_plugin/src/cuda_thread_pool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <cuda_thread_context.hpp>
#include <deque>
#include <mutex>
#include <openvino/runtime/threading/itask_executor.hpp>
ilya-lavrenov marked this conversation as resolved.
Show resolved Hide resolved
#include <queue>
#include <thread>
#include <threading/ie_itask_executor.hpp>

#include "cuda_jthread.hpp"

Expand Down