Merge pull request #24068 from TolyaTalamanov:at/add-onnx-coreml-execution-provider

G-API: Support CoreML Execution Providers for ONNXRT Backend #24068

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Anatoliy Talamanov 2023-12-13 18:22:15 +00:00 committed by GitHub
parent 14688e95ea
commit 9a47e1764a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 178 additions and 0 deletions

View File

@ -32,6 +32,14 @@ if(ORT_LIB AND ORT_INCLUDE)
HAVE_ONNX_DML HAVE_ONNX_DML
) )
# Check CoreML Execution Provider availability
get_filename_component(coreml_dir ${ONNXRT_ROOT_DIR}/include/onnxruntime/core/providers/coreml ABSOLUTE)
detect_onxxrt_ep(
coreml_provider_factory.h
${coreml_dir}
HAVE_ONNX_COREML
)
set(HAVE_ONNX TRUE) set(HAVE_ONNX TRUE)
# For CMake output only # For CMake output only
set(ONNX_LIBRARIES "${ORT_LIB}" CACHE STRING "ONNX Runtime libraries") set(ONNX_LIBRARIES "${ORT_LIB}" CACHE STRING "ONNX Runtime libraries")

View File

@ -165,6 +165,7 @@ set(gapi_srcs
# ONNX backend # ONNX backend
src/backends/onnx/gonnxbackend.cpp src/backends/onnx/gonnxbackend.cpp
src/backends/onnx/dml_ep.cpp src/backends/onnx/dml_ep.cpp
src/backends/onnx/coreml_ep.cpp
# Render backend # Render backend
src/backends/render/grenderocv.cpp src/backends/render/grenderocv.cpp

View File

@ -39,6 +39,9 @@ public:
GAPI_WRAP GAPI_WRAP
PyParams& cfgAddExecutionProvider(ep::DirectML ep); PyParams& cfgAddExecutionProvider(ep::DirectML ep);
GAPI_WRAP
PyParams& cfgAddExecutionProvider(ep::CoreML ep);
GAPI_WRAP GAPI_WRAP
PyParams& cfgAddExecutionProvider(ep::CUDA ep); PyParams& cfgAddExecutionProvider(ep::CUDA ep);

View File

@ -32,6 +32,65 @@ namespace onnx {
*/ */
namespace ep { namespace ep {
/**
* @brief This structure provides functions
* that fill inference options for ONNX CoreML Execution Provider.
* Please follow https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml-execution-provider
*/
struct GAPI_EXPORTS_W_SIMPLE CoreML {
/** @brief Class constructor.
Constructs CoreML parameters.
*/
GAPI_WRAP
CoreML() = default;
/** @brief Limit CoreML Execution Provider to run on CPU only.
This function is used to limit CoreML to run on CPU only.
Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_use_cpu_only
@return reference to this parameter structure.
*/
GAPI_WRAP
CoreML& cfgUseCPUOnly() {
use_cpu_only = true;
return *this;
}
/** @brief Enable CoreML EP to run on a subgraph in the body of a control flow ONNX operator (i.e. a Loop, Scan or If operator).
This function is used to enable CoreML EP to run on
a subgraph of a control flow of ONNX operation.
Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_enable_on_subgraph
@return reference to this parameter structure.
*/
GAPI_WRAP
CoreML& cfgEnableOnSubgraph() {
enable_on_subgraph = true;
return *this;
}
/** @brief Enable CoreML EP to run only on Apple Neural Engine.
This function is used to enable CoreML EP to run only on Apple Neural Engine.
Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_only_enable_device_with_ane
@return reference to this parameter structure.
*/
GAPI_WRAP
CoreML& cfgEnableOnlyNeuralEngine() {
enable_only_ane = true;
return *this;
}
bool use_cpu_only = false;
bool enable_on_subgraph = false;
bool enable_only_ane = false;
};
/** /**
* @brief This structure provides functions * @brief This structure provides functions
* that fill inference options for CUDA Execution Provider. * that fill inference options for CUDA Execution Provider.
@ -205,6 +264,7 @@ public:
using EP = cv::util::variant< cv::util::monostate using EP = cv::util::variant< cv::util::monostate
, OpenVINO , OpenVINO
, DirectML , DirectML
, CoreML
, CUDA , CUDA
, TensorRT>; , TensorRT>;
@ -496,6 +556,20 @@ public:
/** @brief Adds execution provider for runtime. /** @brief Adds execution provider for runtime.
The function is used to add ONNX Runtime CoreML Execution Provider options.
@param ep CoreML Execution Provider options.
@see cv::gapi::onnx::ep::CoreML.
@return the reference on modified object.
*/
Params<Net>& cfgAddExecutionProvider(ep::CoreML&& ep) {
desc.execution_providers.emplace_back(std::move(ep));
return *this;
}
/** @brief Adds execution provider for runtime.
The function is used to add ONNX Runtime CUDA Execution Provider options. The function is used to add ONNX Runtime CUDA Execution Provider options.
@param ep CUDA Execution Provider options. @param ep CUDA Execution Provider options.
@ -582,6 +656,11 @@ public:
desc.execution_providers.emplace_back(std::move(ep)); desc.execution_providers.emplace_back(std::move(ep));
} }
/** @see onnx::Params::cfgAddExecutionProvider. */
void cfgAddExecutionProvider(ep::CoreML&& ep) {
desc.execution_providers.emplace_back(std::move(ep));
}
/** @see onnx::Params::cfgAddExecutionProvider. */ /** @see onnx::Params::cfgAddExecutionProvider. */
void cfgAddExecutionProvider(ep::CUDA&& ep) { void cfgAddExecutionProvider(ep::CUDA&& ep) {
desc.execution_providers.emplace_back(std::move(ep)); desc.execution_providers.emplace_back(std::move(ep));

View File

@ -31,6 +31,7 @@ using map_string_and_vector_float = std::map<std::string, std::vector<float>>;
using map_int_and_double = std::map<int, double>; using map_int_and_double = std::map<int, double>;
using ep_OpenVINO = cv::gapi::onnx::ep::OpenVINO; using ep_OpenVINO = cv::gapi::onnx::ep::OpenVINO;
using ep_DirectML = cv::gapi::onnx::ep::DirectML; using ep_DirectML = cv::gapi::onnx::ep::DirectML;
using ep_CoreML = cv::gapi::onnx::ep::CoreML;
using ep_CUDA = cv::gapi::onnx::ep::CUDA; using ep_CUDA = cv::gapi::onnx::ep::CUDA;
using ep_TensorRT = cv::gapi::onnx::ep::TensorRT; using ep_TensorRT = cv::gapi::onnx::ep::TensorRT;

View File

@ -33,6 +33,12 @@ cv::gapi::onnx::PyParams::cfgAddExecutionProvider(cv::gapi::onnx::ep::DirectML e
return *this; return *this;
} }
cv::gapi::onnx::PyParams&
cv::gapi::onnx::PyParams::cfgAddExecutionProvider(cv::gapi::onnx::ep::CoreML ep) {
m_priv->cfgAddExecutionProvider(std::move(ep));
return *this;
}
cv::gapi::onnx::PyParams& cv::gapi::onnx::PyParams&
cv::gapi::onnx::PyParams::cfgAddExecutionProvider(cv::gapi::onnx::ep::CUDA ep) { cv::gapi::onnx::PyParams::cfgAddExecutionProvider(cv::gapi::onnx::ep::CUDA ep) {
m_priv->cfgAddExecutionProvider(std::move(ep)); m_priv->cfgAddExecutionProvider(std::move(ep));

View File

@ -0,0 +1,50 @@
// This file is part of OpenCV project.
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2023 Intel Corporation
#include "backends/onnx/coreml_ep.hpp"
#include "logger.hpp"
#ifdef HAVE_ONNX
#include <onnxruntime_cxx_api.h>
#ifdef HAVE_ONNX_COREML
#include "../providers/coreml/coreml_provider_factory.h"
void cv::gimpl::onnx::addCoreMLExecutionProvider(Ort::SessionOptions *session_options,
const cv::gapi::onnx::ep::CoreML &coreml_ep) {
uint32_t flags = 0u;
if (coreml_ep.use_cpu_only) {
flags |= COREML_FLAG_USE_CPU_ONLY;
}
if (coreml_ep.enable_on_subgraph) {
flags |= COREML_FLAG_ENABLE_ON_SUBGRAPH;
}
if (coreml_ep.enable_only_ane) {
flags |= COREML_FLAG_ONLY_ENABLE_DEVICE_WITH_ANE;
}
try {
OrtSessionOptionsAppendExecutionProvider_CoreML(*session_options, flags);
} catch (const std::exception &e) {
std::stringstream ss;
ss << "ONNX Backend: Failed to enable CoreML"
<< " Execution Provider: " << e.what();
cv::util::throw_error(std::runtime_error(ss.str()));
}
}
#else // HAVE_ONNX_COREML
void cv::gimpl::onnx::addCoreMLExecutionProvider(Ort::SessionOptions*,
const cv::gapi::onnx::ep::CoreML&) {
util::throw_error(std::runtime_error("G-API has been compiled with ONNXRT"
" without CoreML support"));
}
#endif // HAVE_ONNX_COREML
#endif // HAVE_ONNX

View File

@ -0,0 +1,23 @@
// This file is part of OpenCV project.
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2023 Intel Corporation
#ifndef OPENCV_GAPI_COREML_EP_HPP
#define OPENCV_GAPI_COREML_EP_HPP
#include "opencv2/gapi/infer/onnx.hpp"
#ifdef HAVE_ONNX
#include <onnxruntime_cxx_api.h>
namespace cv {
namespace gimpl {
namespace onnx {
void addCoreMLExecutionProvider(Ort::SessionOptions *session_options,
const cv::gapi::onnx::ep::CoreML &coreml_ep);
}}}
#endif // HAVE_ONNX
#endif // OPENCV_GAPI_COREML_EP_HPP

View File

@ -10,6 +10,7 @@
#ifdef HAVE_ONNX #ifdef HAVE_ONNX
#include "backends/onnx/dml_ep.hpp" #include "backends/onnx/dml_ep.hpp"
#include "backends/onnx/coreml_ep.hpp"
#include <ade/util/algorithm.hpp> // any_of #include <ade/util/algorithm.hpp> // any_of
#include <ade/util/zip_range.hpp> #include <ade/util/zip_range.hpp>
@ -211,6 +212,12 @@ static void addExecutionProvider(Ort::SessionOptions *session_options,
addDMLExecutionProvider(session_options, dml_ep); addDMLExecutionProvider(session_options, dml_ep);
break; break;
} }
case ep::EP::index_of<ep::CoreML>(): {
GAPI_LOG_INFO(NULL, "CoreML Execution Provider is added.");
const auto &coreml_ep = cv::util::get<ep::CoreML>(execution_provider);
addCoreMLExecutionProvider(session_options, coreml_ep);
break;
}
case ep::EP::index_of<ep::CUDA>(): { case ep::EP::index_of<ep::CUDA>(): {
GAPI_LOG_INFO(NULL, "CUDA Execution Provider is added."); GAPI_LOG_INFO(NULL, "CUDA Execution Provider is added.");
const auto &cuda_ep = cv::util::get<ep::CUDA>(execution_provider); const auto &cuda_ep = cv::util::get<ep::CUDA>(execution_provider);