Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ModelZoo
ResNet50_tensorflow
Commits
bb3cc770
"git@developer.sourcefind.cn:OpenDAS/ollama.git" did not exist on "cd3fbf1c49aa6e68f982934c3d11b8a4b8e71f58"
Commit
bb3cc770
authored
Jun 19, 2021
by
Atze00
Browse files
fixed same padding in causal convolutions
parent
5ad16f95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
official/vision/beta/modeling/layers/nn_layers.py
official/vision/beta/modeling/layers/nn_layers.py
+6
-1
official/vision/beta/modeling/layers/nn_layers_test.py
official/vision/beta/modeling/layers/nn_layers_test.py
+8
-8
No files found.
official/vision/beta/modeling/layers/nn_layers.py
View file @
bb3cc770
...
@@ -720,6 +720,7 @@ class CausalConvMixin:
...
@@ -720,6 +720,7 @@ class CausalConvMixin:
Returns:
Returns:
A list of paddings for `tf.pad`.
A list of paddings for `tf.pad`.
"""
"""
shape_in
=
inputs
.
shape
[
1
:
-
1
]
del
inputs
del
inputs
if
tf
.
keras
.
backend
.
image_data_format
()
==
'channels_first'
:
if
tf
.
keras
.
backend
.
image_data_format
()
==
'channels_first'
:
...
@@ -730,7 +731,11 @@ class CausalConvMixin:
...
@@ -730,7 +731,11 @@ class CausalConvMixin:
(
self
.
kernel_size
[
i
]
-
1
)
*
(
self
.
dilation_rate
[
i
]
-
1
))
(
self
.
kernel_size
[
i
]
-
1
)
*
(
self
.
dilation_rate
[
i
]
-
1
))
for
i
in
range
(
self
.
rank
)
for
i
in
range
(
self
.
rank
)
]
]
pad_total
=
[
kernel_size_effective
[
i
]
-
1
for
i
in
range
(
self
.
rank
)]
pad_total
=
[
max
(
kernel_size_effective
[
i
]
-
(
self
.
strides
[
i
]),
0
)
if
(
shape_in
[
i
]
%
self
.
strides
[
i
])
==
0
else
max
(
kernel_size_effective
[
i
]
-
(
shape_in
[
i
]
%
self
.
strides
[
i
]),
0
)
for
i
in
range
(
self
.
rank
)]
pad_beg
=
[
pad_total
[
i
]
//
2
for
i
in
range
(
self
.
rank
)]
pad_beg
=
[
pad_total
[
i
]
//
2
for
i
in
range
(
self
.
rank
)]
pad_end
=
[
pad_total
[
i
]
-
pad_beg
[
i
]
for
i
in
range
(
self
.
rank
)]
pad_end
=
[
pad_total
[
i
]
-
pad_beg
[
i
]
for
i
in
range
(
self
.
rank
)]
padding
=
[[
pad_beg
[
i
],
pad_end
[
i
]]
for
i
in
range
(
self
.
rank
)]
padding
=
[[
pad_beg
[
i
],
pad_end
[
i
]]
for
i
in
range
(
self
.
rank
)]
...
...
official/vision/beta/modeling/layers/nn_layers_test.py
View file @
bb3cc770
...
@@ -274,14 +274,14 @@ class NNLayersTest(parameterized.TestCase, tf.test.TestCase):
...
@@ -274,14 +274,14 @@ class NNLayersTest(parameterized.TestCase, tf.test.TestCase):
predicted
=
conv3d
(
padded_inputs
)
predicted
=
conv3d
(
padded_inputs
)
expected
=
tf
.
constant
(
expected
=
tf
.
constant
(
[[[[[
1
2.
,
1
2.
,
1
2.
],
[[[[[
2
7
.
,
2
7
.
,
2
7
.
],
[
18.
,
18.
,
18.
]],
[
18.
,
18.
,
18.
]],
[[
18.
,
18.
,
18.
],
[[
18.
,
18.
,
18.
],
[
2
7
.
,
2
7
.
,
2
7
.
]]],
[
1
2.
,
1
2.
,
1
2.
]]],
[[[
2
4.
,
2
4.
,
2
4.
],
[[[
5
4.
,
5
4.
,
5
4.
],
[
36.
,
36.
,
36.
]],
[
36.
,
36.
,
36.
]],
[[
36.
,
36.
,
36.
],
[[
36.
,
36.
,
36.
],
[
5
4.
,
5
4.
,
5
4.
]]]]])
[
2
4.
,
2
4.
,
2
4.
]]]]])
self
.
assertEqual
(
predicted
.
shape
,
expected
.
shape
)
self
.
assertEqual
(
predicted
.
shape
,
expected
.
shape
)
self
.
assertAllClose
(
predicted
,
expected
)
self
.
assertAllClose
(
predicted
,
expected
)
...
@@ -311,14 +311,14 @@ class NNLayersTest(parameterized.TestCase, tf.test.TestCase):
...
@@ -311,14 +311,14 @@ class NNLayersTest(parameterized.TestCase, tf.test.TestCase):
predicted
=
conv3d
(
padded_inputs
)
predicted
=
conv3d
(
padded_inputs
)
expected
=
tf
.
constant
(
expected
=
tf
.
constant
(
[[[[[
4
.0
,
4
.0
,
4
.0
],
[[[[[
9
.0
,
9
.0
,
9
.0
],
[
6.0
,
6.0
,
6.0
]],
[
6.0
,
6.0
,
6.0
]],
[[
6.0
,
6.0
,
6.0
],
[[
6.0
,
6.0
,
6.0
],
[
9
.0
,
9
.0
,
9
.0
]]],
[
4
.0
,
4
.0
,
4
.0
]]],
[[[
8.0
,
8.0
,
8.0
],
[[[
1
8.0
,
1
8.0
,
1
8.0
],
[
12.
,
12.
,
12.
]],
[
12.
,
12.
,
12.
]],
[[
12.
,
12.
,
12.
],
[[
12.
,
12.
,
12.
],
[
1
8.
,
1
8.
,
1
8.
]]]]])
[
8.
,
8.
,
8.
]]]]])
self
.
assertEqual
(
predicted
.
shape
,
expected
.
shape
)
self
.
assertEqual
(
predicted
.
shape
,
expected
.
shape
)
self
.
assertAllClose
(
predicted
,
expected
)
self
.
assertAllClose
(
predicted
,
expected
)
...
...
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