Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
d3867608
Commit
d3867608
authored
Dec 12, 2018
by
Ruslan Garnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added "kernels" pass stage to compiler, removed unused opaque from cv::gimpl::Op
parent
82227b5a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
gcompiler.cpp
modules/gapi/src/compiler/gcompiler.cpp
+4
-2
gmodel.cpp
modules/gapi/src/compiler/gmodel.cpp
+1
-1
gmodel.hpp
modules/gapi/src/compiler/gmodel.hpp
+0
-1
No files found.
modules/gapi/src/compiler/gcompiler.cpp
View file @
d3867608
...
@@ -104,11 +104,13 @@ cv::gimpl::GCompiler::GCompiler(const cv::GComputation &c,
...
@@ -104,11 +104,13 @@ cv::gimpl::GCompiler::GCompiler(const cv::GComputation &c,
// Remove GCompoundBackend to avoid calling setupBackend() with it in the list
// Remove GCompoundBackend to avoid calling setupBackend() with it in the list
m_all_kernels
.
remove
(
cv
::
gapi
::
compound
::
backend
());
m_all_kernels
.
remove
(
cv
::
gapi
::
compound
::
backend
());
m_e
.
addPass
(
"init"
,
"resolve_kernels"
,
std
::
bind
(
passes
::
resolveKernels
,
_1
,
m_e
.
addPassStage
(
"kernels"
);
m_e
.
addPass
(
"kernels"
,
"resolve_kernels"
,
std
::
bind
(
passes
::
resolveKernels
,
_1
,
std
::
ref
(
m_all_kernels
),
// NB: and not copied here
std
::
ref
(
m_all_kernels
),
// NB: and not copied here
lookup_order
));
lookup_order
));
m_e
.
addPass
(
"kernels"
,
"check_islands_content"
,
passes
::
checkIslandsContent
);
m_e
.
addPass
(
"init"
,
"check_islands_content"
,
passes
::
checkIslandsContent
);
m_e
.
addPassStage
(
"meta"
);
m_e
.
addPassStage
(
"meta"
);
m_e
.
addPass
(
"meta"
,
"initialize"
,
std
::
bind
(
passes
::
initMeta
,
_1
,
std
::
ref
(
m_metas
)));
m_e
.
addPass
(
"meta"
,
"initialize"
,
std
::
bind
(
passes
::
initMeta
,
_1
,
std
::
ref
(
m_metas
)));
m_e
.
addPass
(
"meta"
,
"propagate"
,
std
::
bind
(
passes
::
inferMeta
,
_1
,
false
));
m_e
.
addPass
(
"meta"
,
"propagate"
,
std
::
bind
(
passes
::
inferMeta
,
_1
,
false
));
...
...
modules/gapi/src/compiler/gmodel.cpp
View file @
d3867608
...
@@ -26,7 +26,7 @@ ade::NodeHandle GModel::mkOpNode(GModel::Graph &g, const GKernel &k, const std::
...
@@ -26,7 +26,7 @@ ade::NodeHandle GModel::mkOpNode(GModel::Graph &g, const GKernel &k, const std::
ade
::
NodeHandle
op_h
=
g
.
createNode
();
ade
::
NodeHandle
op_h
=
g
.
createNode
();
g
.
metadata
(
op_h
).
set
(
NodeType
{
NodeType
::
OP
});
g
.
metadata
(
op_h
).
set
(
NodeType
{
NodeType
::
OP
});
//These extra empty {} are to please GCC (-Wmissing-field-initializers)
//These extra empty {} are to please GCC (-Wmissing-field-initializers)
g
.
metadata
(
op_h
).
set
(
Op
{
k
,
args
,
{},
{}
,
{}
});
g
.
metadata
(
op_h
).
set
(
Op
{
k
,
args
,
{},
{}});
if
(
!
island
.
empty
())
if
(
!
island
.
empty
())
g
.
metadata
(
op_h
).
set
(
Island
{
island
});
g
.
metadata
(
op_h
).
set
(
Island
{
island
});
return
op_h
;
return
op_h
;
...
...
modules/gapi/src/compiler/gmodel.hpp
View file @
d3867608
...
@@ -61,7 +61,6 @@ struct Op
...
@@ -61,7 +61,6 @@ struct Op
std
::
vector
<
RcDesc
>
outs
;
// TODO: Introduce a new type for resource references
std
::
vector
<
RcDesc
>
outs
;
// TODO: Introduce a new type for resource references
cv
::
gapi
::
GBackend
backend
;
cv
::
gapi
::
GBackend
backend
;
util
::
any
opaque
;
};
};
struct
Data
struct
Data
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment