Skip to content
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.

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

[Fix] Fix saconv #1147

Merged
merged 5 commits into from
Jul 2, 2021
Merged

[Fix] Fix saconv #1147

merged 5 commits into from
Jul 2, 2021

Conversation

kennymckormick
Copy link
Member

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily get feedback. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Fix SAConv forward, be compatible with torch1.9.0

Modification

Add zero_bias in the arguments of _conv_forward

@CLAassistant
Copy link

CLAassistant commented Jun 25, 2021

CLA assistant check
All committers have signed the CLA.

@zhouzaida zhouzaida requested a review from ZwwWayne June 25, 2021 13:01
mmcv/ops/saconv.py Outdated Show resolved Hide resolved
@ZwwWayne
Copy link
Collaborator

CI failed on PyTorch 1.6.

@ZwwWayne ZwwWayne mentioned this pull request Jun 27, 2021
20 tasks
@@ -120,7 +124,8 @@ def forward(self, x):
if TORCH_VERSION < '1.5.0' or TORCH_VERSION == 'parrots':
out_l = super().conv2d_forward(x, weight)
else:
out_l = super()._conv_forward(x, weight)
# bias is a required argument of _conv_forward in torch 1.9.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bias is also required by torch1.8. You can check the version of torch to handle this

@codecov
Copy link

codecov bot commented Jun 29, 2021

Codecov Report

Merging #1147 (e02a978) into master (94818ad) will increase coverage by 0.11%.
The diff coverage is 73.41%.

❗ Current head e02a978 differs from pull request most recent head 07152ac. Consider uploading reports for the commit 07152ac to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1147      +/-   ##
==========================================
+ Coverage   67.85%   67.97%   +0.11%     
==========================================
  Files         159      159              
  Lines       10378    10426      +48     
  Branches     1885     1897      +12     
==========================================
+ Hits         7042     7087      +45     
- Misses       2967     2970       +3     
  Partials      369      369              
Flag Coverage Δ
unittests 67.97% <73.41%> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
mmcv/utils/__init__.py 88.23% <ø> (ø)
mmcv/utils/parrots_wrapper.py 60.71% <ø> (-0.31%) ⬇️
mmcv/parallel/distributed.py 22.44% <20.00%> (+1.61%) ⬆️
mmcv/ops/saconv.py 83.58% <25.00%> (-4.95%) ⬇️
mmcv/runner/fp16_utils.py 58.38% <25.00%> (+0.26%) ⬆️
mmcv/cnn/bricks/activation.py 88.00% <50.00%> (+0.50%) ⬆️
mmcv/parallel/distributed_deprecated.py 67.39% <50.00%> (+0.72%) ⬆️
mmcv/runner/dist_utils.py 50.49% <50.00%> (+0.49%) ⬆️
mmcv/runner/hooks/logger/tensorboard.py 36.36% <50.00%> (+1.98%) ⬆️
mmcv/runner/hooks/optimizer.py 17.29% <50.00%> (+0.62%) ⬆️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 94818ad...07152ac. Read the comment docs.

@ZwwWayne
Copy link
Collaborator

suggest to also use loosversion for version check.

@ZwwWayne ZwwWayne merged commit 7e285d3 into open-mmlab:master Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants