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
c6f39870
Commit
c6f39870
authored
6 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13776 from alalek:fix_13741
parents
b1cc114b
66d9a33b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
ocl.cpp
modules/core/src/ocl.cpp
+4
-1
No files found.
modules/core/src/ocl.cpp
View file @
c6f39870
...
...
@@ -3574,6 +3574,7 @@ struct Program::Impl
// We don't cache OpenCL binaries
if
(
src_
->
kind_
==
ProgramSource
::
Impl
::
PROGRAM_BINARIES
)
{
CV_LOG_VERBOSE
(
NULL
,
0
,
"Load program binary... "
<<
src_
->
module_
.
c_str
()
<<
"/"
<<
src_
->
name_
.
c_str
());
bool
isLoaded
=
createFromBinary
(
ctx
,
src_
->
sourceAddr_
,
src_
->
sourceSize_
,
errmsg
);
return
isLoaded
;
}
...
...
@@ -3615,6 +3616,7 @@ struct Program::Impl
if
(
res
)
{
CV_Assert
(
!
binaryBuf
.
empty
());
CV_LOG_VERBOSE
(
NULL
,
0
,
"Load program binary from cache: "
<<
src_
->
module_
.
c_str
()
<<
"/"
<<
src_
->
name_
.
c_str
());
bool
isLoaded
=
createFromBinary
(
ctx
,
binaryBuf
,
errmsg
);
if
(
isLoaded
)
return
true
;
...
...
@@ -3646,6 +3648,7 @@ struct Program::Impl
{
buildflags
=
joinBuildOptions
(
buildflags
,
" -spir-std=1.2"
);
}
CV_LOG_VERBOSE
(
NULL
,
0
,
"Load program SPIR binary... "
<<
src_
->
module_
.
c_str
()
<<
"/"
<<
src_
->
name_
.
c_str
());
bool
isLoaded
=
createFromBinary
(
ctx
,
src_
->
sourceAddr_
,
src_
->
sourceSize_
,
errmsg
);
if
(
!
isLoaded
)
return
false
;
...
...
@@ -3816,7 +3819,7 @@ struct Program::Impl
{
CV_Assert
(
handle
==
NULL
);
CV_INSTRUMENT_REGION_OPENCL_COMPILE
(
"Load OpenCL program"
);
CV_LOG_VERBOSE
(
NULL
,
0
,
"Load from binary...
"
<<
src
.
getImpl
()
->
module_
.
c_str
()
<<
"/"
<<
src
.
getImpl
()
->
name_
.
c_str
()
);
CV_LOG_VERBOSE
(
NULL
,
0
,
"Load from binary...
("
<<
binarySize
<<
" bytes)"
);
CV_Assert
(
binarySize
>
0
);
...
...
This diff is collapsed.
Click to expand it.
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