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
OpenDAS
MMCV
Commits
c7b8ccc6
Unverified
Commit
c7b8ccc6
authored
Oct 11, 2023
by
Zaida Zhou
Committed by
GitHub
Oct 11, 2023
Browse files
Add torch2.1.0 checking in CI (#2955)
parent
cac0c44a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
25 deletions
+42
-25
.circleci/docker/Dockerfile
.circleci/docker/Dockerfile
+2
-0
.circleci/test.yml
.circleci/test.yml
+15
-9
.github/workflows/build_macos_wheel.yml
.github/workflows/build_macos_wheel.yml
+6
-2
.github/workflows/merge_stage_test.yml
.github/workflows/merge_stage_test.yml
+12
-7
.github/workflows/pr_stage_test.yml
.github/workflows/pr_stage_test.yml
+6
-6
mmcv/cnn/bricks/generalized_attention.py
mmcv/cnn/bricks/generalized_attention.py
+1
-1
No files found.
.circleci/docker/Dockerfile
View file @
c7b8ccc6
...
...
@@ -8,6 +8,8 @@ FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
# https://github.com/pytorch/pytorch/issues/37377
ENV
MKL_THREADING_LAYER GNU
ARG
DEBIAN_FRONTEND=noninteractive
# To fix GPG key error when running apt-get update
RUN
apt-key adv
--fetch-keys
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
RUN
apt-key adv
--fetch-keys
https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
...
...
.circleci/test.yml
View file @
c7b8ccc6
...
...
@@ -169,16 +169,22 @@ jobs:
type
:
string
cuda
:
type
:
enum
enum
:
[
"
10.1"
,
"
10.2"
,
"
11.1"
,
"
11.7"
]
enum
:
[
"
10.1"
,
"
10.2"
,
"
11.1"
,
"
11.7"
,
"
11.8"
]
cudnn
:
type
:
integer
default
:
7
machine
:
image
:
ubuntu-2004-cuda-11.4:202110-01
image
:
linux-cuda-11:default
docker_layer_caching
:
true
resource_class
:
gpu.nvidia.small
resource_class
:
gpu.nvidia.small
.multi
steps
:
-
checkout
-
run
:
name
:
Install nvidia-container-toolkit and Restart Docker
command
:
|
sudo apt-get update
sudo apt-get install -y nvidia-container-toolkit
sudo systemctl restart docker
-
run
:
name
:
Build Docker image
command
:
|
...
...
@@ -240,8 +246,8 @@ workflows:
-
build_without_ops
-
build_cpu
:
name
:
maximum_version_cpu
torch
:
2.
0
.0
torchvision
:
0.1
5.1
torch
:
2.
1
.0
torchvision
:
0.1
6.0
python
:
3.9.0
requires
:
-
minimum_version_cpu
...
...
@@ -257,10 +263,10 @@ workflows:
-
hold_cuda_test
-
build_cuda
:
name
:
maximum_version_gpu
torch
:
2.
0
.0
torch
:
2.
1
.0
# Use double quotation mark to explicitly specify its type
# as string instead of number
cuda
:
"
11.
7
"
cuda
:
"
11.
8
"
cudnn
:
8
requires
:
-
hold_cuda_test
...
...
@@ -281,10 +287,10 @@ workflows:
-
main
-
build_cuda
:
name
:
maximum_version_gpu
torch
:
2.
0
.0
torch
:
2.
1
.0
# Use double quotation mark to explicitly specify its type
# as string instead of number
cuda
:
"
11.
7
"
cuda
:
"
11.
8
"
cudnn
:
8
filters
:
branches
:
...
...
.github/workflows/build_macos_wheel.yml
View file @
c7b8ccc6
...
...
@@ -8,11 +8,11 @@ concurrency:
jobs
:
build_macos10_wheel
:
runs-on
:
macos-
10.15
runs-on
:
macos-
latest
if
:
contains(github.event.head_commit.message, 'Bump version to')
strategy
:
matrix
:
torch
:
[
1.8.0
,
1.9.0
,
1.10.0
,
1.11.0
,
1.12.0
,
1.13.0
,
2.0.0
]
torch
:
[
1.8.0
,
1.9.0
,
1.10.0
,
1.11.0
,
1.12.0
,
1.13.0
,
2.0.0
,
2.1.0
]
python-version
:
[
3.7
,
3.8
,
3.9
,
'
3.10'
,
'
3.11'
]
include
:
-
torch
:
1.8.0
...
...
@@ -29,6 +29,8 @@ jobs:
torchvision
:
0.14.0
-
torch
:
2.0.0
torchvision
:
0.15.1
-
torch
:
2.1.0
torchvision
:
0.16.0
exclude
:
-
torch
:
1.8.0
python-version
:
'
3.10'
...
...
@@ -52,6 +54,8 @@ jobs:
python-version
:
'
3.11'
-
torch
:
2.0.0
python-version
:
3.7
-
torch
:
2.1.0
python-version
:
3.7
steps
:
-
uses
:
actions/checkout@v2
-
name
:
Set up Python
...
...
.github/workflows/merge_stage_test.yml
View file @
c7b8ccc6
...
...
@@ -114,7 +114,7 @@ jobs:
strategy
:
matrix
:
python-version
:
[
3.7
]
torch
:
[
1.8.1
,
1.9.1
,
1.10.1
,
1.11.0
,
1.12.0
,
1.13.0
,
2.0.0
]
torch
:
[
1.8.1
,
1.9.1
,
1.10.1
,
1.11.0
,
1.12.0
,
1.13.0
,
2.0.0
,
2.1.0
]
include
:
-
torch
:
1.8.1
torchvision
:
0.9.1
...
...
@@ -131,9 +131,14 @@ jobs:
-
torch
:
2.0.0
torchvision
:
0.15.1
python-version
:
3.8
-
torch
:
2.1.0
torchvision
:
0.16.0
python-version
:
3.8
exclude
:
-
torch
:
2.0.0
python-version
:
3.7
-
torch
:
2.1.0
python-version
:
3.7
steps
:
-
uses
:
actions/checkout@v2
-
name
:
Set up Python ${{ matrix.python-version }}
...
...
@@ -311,13 +316,13 @@ jobs:
runs-on
:
windows-2019
strategy
:
matrix
:
torch
:
[
1.8.1
,
2.
0
.0
]
torch
:
[
1.8.1
,
2.
1
.0
]
include
:
-
torch
:
1.8.1
torchvision
:
0.9.1
python-version
:
3.7
-
torch
:
2.
0
.0
torchvision
:
0.1
5.1
-
torch
:
2.
1
.0
torchvision
:
0.1
6.0
python-version
:
3.8
steps
:
-
uses
:
actions/checkout@v2
...
...
@@ -343,13 +348,13 @@ jobs:
runs-on
:
macos-latest
strategy
:
matrix
:
torch
:
[
1.8.1
,
2.
0
.0
]
torch
:
[
1.8.1
,
2.
1
.0
]
include
:
-
torch
:
1.8.1
torchvision
:
0.9.1
python-version
:
3.7
-
torch
:
2.
0
.0
torchvision
:
0.1
5.1
-
torch
:
2.
1
.0
torchvision
:
0.1
6.0
python-version
:
3.8
steps
:
-
uses
:
actions/checkout@v2
...
...
.github/workflows/pr_stage_test.yml
View file @
c7b8ccc6
...
...
@@ -132,13 +132,13 @@ jobs:
runs-on
:
windows-2019
strategy
:
matrix
:
torch
:
[
1.8.1
,
2.
0
.0
]
torch
:
[
1.8.1
,
2.
1
.0
]
include
:
-
torch
:
1.8.1
torchvision
:
0.9.1
python-version
:
3.7
-
torch
:
2.
0
.0
torchvision
:
0.1
5.1
-
torch
:
2.
1
.0
torchvision
:
0.1
6.0
python-version
:
3.8
steps
:
-
uses
:
actions/checkout@v2
...
...
@@ -164,13 +164,13 @@ jobs:
runs-on
:
macos-latest
strategy
:
matrix
:
torch
:
[
1.8.1
,
2.
0
.0
]
torch
:
[
1.8.1
,
2.
1
.0
]
include
:
-
torch
:
1.8.1
torchvision
:
0.9.1
python-version
:
3.7
-
torch
:
2.
0
.0
torchvision
:
0.1
5.1
-
torch
:
2.
1
.0
torchvision
:
0.1
6.0
python-version
:
3.8
steps
:
-
uses
:
actions/checkout@v2
...
...
mmcv/cnn/bricks/generalized_attention.py
View file @
c7b8ccc6
...
...
@@ -371,7 +371,7 @@ class GeneralizedAttention(nn.Module):
contiguous
().
\
view
(
1
,
1
,
h
*
w
,
h_kv
*
w_kv
)
energy
=
energy
.
masked_fill_
(
cur_local_constraint_map
,
energy
=
energy
.
masked_fill_
(
cur_local_constraint_map
.
bool
()
,
float
(
'-inf'
))
attention
=
F
.
softmax
(
energy
,
3
)
...
...
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