Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
10aee918
Commit
10aee918
authored
May 24, 2017
by
Vladislav Sovrasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix DNN module build without torch
parent
503b00f1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
15 deletions
+16
-15
torch_importer.cpp
modules/dnn/src/torch/torch_importer.cpp
+16
-15
No files found.
modules/dnn/src/torch/torch_importer.cpp
View file @
10aee918
...
...
@@ -971,6 +971,22 @@ Mat readTorchBlob(const String &filename, bool isBinary)
return
importer
->
tensors
.
begin
()
->
second
;
}
#else
Ptr
<
Importer
>
createTorchImporter
(
const
String
&
,
bool
)
{
CV_Error
(
Error
::
StsNotImplemented
,
"Torch importer is disabled in current build"
);
return
Ptr
<
Importer
>
();
}
Mat
readTorchBlob
(
const
String
&
,
bool
)
{
CV_Error
(
Error
::
StsNotImplemented
,
"Torch importer is disabled in current build"
);
return
Mat
();
}
#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
Net
readNetFromTorch
(
const
String
&
model
,
bool
isBinary
)
{
Ptr
<
Importer
>
importer
;
...
...
@@ -988,20 +1004,5 @@ Net readNetFromTorch(const String &model, bool isBinary)
return
net
;
}
#else
Ptr
<
Importer
>
createTorchImporter
(
const
String
&
,
bool
)
{
CV_Error
(
Error
::
StsNotImplemented
,
"Torch importer is disabled in current build"
);
return
Ptr
<
Importer
>
();
}
Mat
readTorchBlob
(
const
String
&
,
bool
)
{
CV_Error
(
Error
::
StsNotImplemented
,
"Torch importer is disabled in current build"
);
return
Mat
();
}
#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
}
}
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