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
5f6ce6f4
Commit
5f6ce6f4
authored
Oct 05, 2017
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9762 from dkurt:fix_tensorflow_split_layer
parents
558e4d9c
2a21c108
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
slice_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
+1
-1
tf_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
+0
-2
test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+5
-0
No files found.
modules/dnn/src/layers/slice_layer.cpp
View file @
5f6ce6f4
...
...
@@ -116,7 +116,7 @@ public:
}
else
// Divide input blob on equal parts by axis.
{
CV_Assert
(
0
<
axis
&&
axis
<
inpShape
.
size
());
CV_Assert
(
0
<
=
axis
&&
axis
<
inpShape
.
size
());
CV_Assert
(
requiredOutputs
>
0
&&
inpShape
[
axis
]
%
requiredOutputs
==
0
);
inpShape
[
axis
]
/=
requiredOutputs
;
outputs
.
resize
(
requiredOutputs
,
inpShape
);
...
...
modules/dnn/src/tensorflow/tf_importer.cpp
View file @
5f6ce6f4
...
...
@@ -866,8 +866,6 @@ void TFImporter::populateNet(Net dstNet)
CV_Assert
(
layer
.
input_size
()
==
2
);
// num_split
// 1st blob is dims tensor
layerParams
.
set
(
"slice_point"
,
DictValue
::
arrayReal
((
double
*
)
0
,
0
));
int
axis
=
getConstBlob
(
layer
,
value_id
,
0
).
int_val
().
Get
(
0
);
layerParams
.
set
(
"axis"
,
toNCHW
[
axis
]);
...
...
modules/dnn/test/test_tf_importer.cpp
View file @
5f6ce6f4
...
...
@@ -170,4 +170,9 @@ TEST(Test_TensorFlow, lstm)
runTensorFlowNet
(
"lstm"
);
}
TEST
(
Test_TensorFlow
,
split
)
{
runTensorFlowNet
(
"split_equals"
);
}
}
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