mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
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:
committed by
GitHub
parent
14688e95ea
commit
9a47e1764a
@@ -33,6 +33,12 @@ cv::gapi::onnx::PyParams::cfgAddExecutionProvider(cv::gapi::onnx::ep::DirectML e
|
||||
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::cfgAddExecutionProvider(cv::gapi::onnx::ep::CUDA ep) {
|
||||
m_priv->cfgAddExecutionProvider(std::move(ep));
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -10,6 +10,7 @@
|
||||
#ifdef HAVE_ONNX
|
||||
|
||||
#include "backends/onnx/dml_ep.hpp"
|
||||
#include "backends/onnx/coreml_ep.hpp"
|
||||
|
||||
#include <ade/util/algorithm.hpp> // any_of
|
||||
#include <ade/util/zip_range.hpp>
|
||||
@@ -211,6 +212,12 @@ static void addExecutionProvider(Ort::SessionOptions *session_options,
|
||||
addDMLExecutionProvider(session_options, dml_ep);
|
||||
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>(): {
|
||||
GAPI_LOG_INFO(NULL, "CUDA Execution Provider is added.");
|
||||
const auto &cuda_ep = cv::util::get<ep::CUDA>(execution_provider);
|
||||
|
||||
Reference in New Issue
Block a user