Skip to content

Fix conv_with_filter in paddle 1.8 #4705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Fix conv_with_filter in paddle 1.8 #4705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PaddleCV/tracking/ltr/models/siamese/target_estimator_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from paddle.fluid.dygraph import nn

from pytracking.libs.Fconv2d import Conv2D
from pytracking.libs.Fconv2d import FConv2D


class SiamFCEstimator(dygraph.layers.Layer):
Expand Down Expand Up @@ -40,8 +41,7 @@ def estimate(self, exemplar, instance):
instance = fluid.layers.reshape(
instance, shape=[1, -1, shape[2], shape[3]])

cross_conv = Conv2D(stride=1, padding=0, dilation=1, groups=shape[0])
score_map = cross_conv(instance, exemplar)
score_map = FConv2D(instance, exemplar, stride=1, padding=0, dilation=1, groups=shape[0])
score_map = fluid.layers.transpose(score_map, [1, 0, 2, 3])
score_map = self.adjust_conv(score_map)
return score_map
6 changes: 3 additions & 3 deletions PaddleCV/tracking/pytracking/features/augmentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import cv2 as cv

from pytracking.features.preprocessing import numpy_to_paddle, paddle_to_numpy
from pytracking.libs.Fconv2d import Fconv2d
from pytracking.libs.Fconv2d import FConv2D
from pytracking.libs.paddle_utils import PTensor, _padding, n2p


Expand Down Expand Up @@ -192,13 +192,13 @@ def __call__(self, image):
if isinstance(image, PTensor):
sz = image.shape[2:]
filter = [n2p(f) for f in self.filter_np]
im1 = Fconv2d(
im1 = FConv2D(
layers.reshape(image, [-1, 1, sz[0], sz[1]]),
filter[0],
padding=(self.filter_size[0], 0))
return self.crop_to_output(
layers.reshape(
Fconv2d(
FConv2D(
im1, filter[1], padding=(0, self.filter_size[1])),
[1, -1, sz[0], sz[1]]))
else:
Expand Down
Loading