Merge pull request #19782 from TolyaTalamanov:at/rmat-plaidml-backend

alalek · alalek · commit 77bfd9434b26 · 2021-03-26T09:36:38.000Z
diff --git a/modules/gapi/src/backends/plaidml/gplaidmlbackend.cpp b/modules/gapi/src/backends/plaidml/gplaidmlbackend.cpp
@@ -198,9 +198,6 @@ void cv::gimpl::GPlaidMLExecutable::run(std::vector<InObj>  &&input_objs,
     exec_->run();
 
     for (auto& it : output_objs) bindOutArg(it.first, it.second);
-
-    // FIXME:
-    // PlaidML backend haven't been updated with RMat support
 }
 
 void cv::gimpl::GPlaidMLExecutable::bindInArg(const RcDesc &rc, const GRunArg  &arg)
@@ -215,10 +212,12 @@ void cv::gimpl::GPlaidMLExecutable::bindInArg(const RcDesc &rc, const GRunArg  &
 
         switch (arg.index())
         {
-        case GRunArg::index_of<cv::Mat>() :
+        case GRunArg::index_of<cv::RMat>():
         {
-            auto& arg_mat = util::get<cv::Mat>(arg);
-            binder_->input(it->second).copy_from(arg_mat.data);
+            auto& rmat = cv::util::get<cv::RMat>(arg);
+            auto  view = rmat.access(cv::RMat::Access::R);
+            auto  mat  = cv::gimpl::asMat(view);
+            binder_->input(it->second).copy_from(mat.data);
         }
         break;
         default: util::throw_error(std::logic_error("content type of the runtime argument does not match to resource description ?"));
@@ -243,10 +242,12 @@ void cv::gimpl::GPlaidMLExecutable::bindOutArg(const RcDesc &rc, const GRunArgP
 
         switch (arg.index())
         {
-        case GRunArgP::index_of<cv::Mat*>() :
+        case GRunArgP::index_of<cv::RMat*>() :
         {
-            auto& arg_mat = *util::get<cv::Mat*>(arg);
-            binder_->output(it->second).copy_into(arg_mat.data);
+            auto& rmat = *cv::util::get<cv::RMat*>(arg);
+            auto  view = rmat.access(cv::RMat::Access::W);
+            auto  mat  = cv::gimpl::asMat(view);
+            binder_->output(it->second).copy_into(mat.data);
         }
         break;
         default: util::throw_error(std::logic_error("content type of the runtime argument does not match to resource description ?"));

Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,6 @@ void cv::gimpl::GPlaidMLExecutable::run(std::vector<InObj> &&input_objs,`
`198`	`198`	`exec_->run();`
`199`	`199`
`200`	`200`	`for (auto& it : output_objs) bindOutArg(it.first, it.second);`
`201`		`-`
`202`		`- // FIXME:`
`203`		`- // PlaidML backend haven't been updated with RMat support`
`204`	`201`	`}`
`205`	`202`
`206`	`203`	`void cv::gimpl::GPlaidMLExecutable::bindInArg(const RcDesc &rc, const GRunArg &arg)`
`@@ -215,10 +212,12 @@ void cv::gimpl::GPlaidMLExecutable::bindInArg(const RcDesc &rc, const GRunArg &`
`215`	`212`
`216`	`213`	`switch (arg.index())`
`217`	`214`	`{`
`218`		`- case GRunArg::index_of<cv::Mat>() :`
	`215`	`+ case GRunArg::index_of<cv::RMat>():`
`219`	`216`	`{`
`220`		`- auto& arg_mat = util::get<cv::Mat>(arg);`
`221`		`- binder_->input(it->second).copy_from(arg_mat.data);`
	`217`	`+ auto& rmat = cv::util::get<cv::RMat>(arg);`
	`218`	`+ auto view = rmat.access(cv::RMat::Access::R);`
	`219`	`+ auto mat = cv::gimpl::asMat(view);`
	`220`	`+ binder_->input(it->second).copy_from(mat.data);`
`222`	`221`	`}`
`223`	`222`	`break;`
`224`	`223`	`default: util::throw_error(std::logic_error("content type of the runtime argument does not match to resource description ?"));`
`@@ -243,10 +242,12 @@ void cv::gimpl::GPlaidMLExecutable::bindOutArg(const RcDesc &rc, const GRunArgP`
`243`	`242`
`244`	`243`	`switch (arg.index())`
`245`	`244`	`{`
`246`		`- case GRunArgP::index_of<cv::Mat*>() :`
	`245`	`+ case GRunArgP::index_of<cv::RMat*>() :`
`247`	`246`	`{`
`248`		`- auto& arg_mat = util::get<cv::Mat>(arg);`
`249`		`- binder_->output(it->second).copy_into(arg_mat.data);`
	`247`	`+ auto& rmat = cv::util::get<cv::RMat>(arg);`
	`248`	`+ auto view = rmat.access(cv::RMat::Access::W);`
	`249`	`+ auto mat = cv::gimpl::asMat(view);`
	`250`	`+ binder_->output(it->second).copy_into(mat.data);`
`250`	`251`	`}`
`251`	`252`	`break;`
`252`	`253`	`default: util::throw_error(std::logic_error("content type of the runtime argument does not match to resource description ?"));`