From e7c2879fa918cf211adfa740b3665774e9457b45 Mon Sep 17 00:00:00 2001 From: Lornatang Date: Sun, 21 Jun 2020 07:40:58 +0800 Subject: [PATCH 1/3] Fix the problem that Torch does not correspond to Torchvision version --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1100495b9c0d..b7d35eb0051d 100755 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ Cython numpy==1.17 opencv-python -torch>=1.4 +torch==1.4 matplotlib pillow tensorboard PyYAML>=5.3 -torchvision +torchvision==0.5.0 scipy tqdm git+https://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI From de2c7847a06b15bc90b466f50d3a1c6b4b3722d2 Mon Sep 17 00:00:00 2001 From: Lornatang Date: Sun, 21 Jun 2020 08:24:43 +0800 Subject: [PATCH 2/3] Add support for YOLOv4 --- models/yolov4.yaml | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 models/yolov4.yaml diff --git a/models/yolov4.yaml b/models/yolov4.yaml new file mode 100644 index 000000000000..6d2e4327cb4a --- /dev/null +++ b/models/yolov4.yaml @@ -0,0 +1,53 @@ +# parameters +nc: 80 # number of classes +depth_multiple: 1.0 # model depth multiple +width_multiple: 1.0 # layer channel multiple + +# anchors +anchors: + - [10,13, 16,30, 33,23] # P3/8 + - [30,61, 62,45, 59,119] # P4/16 + - [116,90, 156,198, 373,326] # P5/32 + +# CSPDarknet-53 backbone +backbone: + # [from, number, module, args] + [[-1, 1, Conv, [32, 3, 1]], # 0 + [-1, 1, Conv, [64, 3, 2]], # 1-P1/2 + [-1, 1, BottleneckCSP, [64]], + [-1, 1, Conv, [128, 3, 2]], # 3-P2/4 + [-1, 2, BottleneckCSP, [128]], + [-1, 1, Conv, [256, 3, 2]], # 5-P3/8 + [-1, 8, BottleneckCSP, [256]], + [-1, 1, Conv, [512, 3, 2]], # 7-P4/16 + [-1, 8, BottleneckCSP, [512]], + [-1, 1, Conv, [1024, 3, 2]], # 9-P5/32 + [-1, 4, BottleneckCSP, [1024]], # 10 + ] + +# YOLOv3-SPP head + +head: + [[-1, 1, Bottleneck, [1024, False]], # 11 + [-1, 1, Conv, [512, 1, 1]], + [-1, 1, SPP, [512, [5, 9, 13]]], + [-1, 1, Bottleneck, [1024, False]], + [-1, 1, Bottleneck, [1024, False]], + [-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 12 (P5/32-large) + + [-3, 1, Conv, [256, 1, 1]], + [-1, 1, nn.Upsample, [None, 2, "nearest"]], + [[-1, 8], 1, Concat, [1]], # concat backbone P4 + [-1, 1, Bottleneck, [512, False]], + [-1, 2, Bottleneck, [512, False]], + [-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 18 (P4/16-medium) + + [-3, 1, Conv, [128, 1, 1]], + [-1, 1, nn.Upsample, [None, 2, "nearest"]], + [[-1, 6], 1, Concat, [1]], # concat backbone P3 + [-1, 1, Bottleneck, [256, False]], + [-1, 2, Bottleneck, [256, False]], + [-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 24 (P3/8-small) + + [[], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5) + ] From e5e0b70c871a3ec6cfc7bd9afe19b76aa5411f6e Mon Sep 17 00:00:00 2001 From: Liu Changyu Date: Thu, 25 Jun 2020 08:51:55 +0800 Subject: [PATCH 3/3] Delete requirements.txt --- requirements.txt | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100755 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100755 index b7d35eb0051d..000000000000 --- a/requirements.txt +++ /dev/null @@ -1,24 +0,0 @@ -# pip install -U -r requirements.txt -Cython -numpy==1.17 -opencv-python -torch==1.4 -matplotlib -pillow -tensorboard -PyYAML>=5.3 -torchvision==0.5.0 -scipy -tqdm -git+https://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI - -# Nvidia Apex (optional) for mixed precision training -------------------------- -# git clone https://github.com/NVIDIA/apex && cd apex && pip install -v --no-cache-dir --global-option="--cpp_ext" --global-option="--cuda_ext" . --user && cd .. && rm -rf apex - -# Conda commands (in place of pip) --------------------------------------------- -# conda update -yn base -c defaults conda -# conda install -yc anaconda numpy opencv matplotlib tqdm pillow ipython -# conda install -yc conda-forge scikit-image pycocotools tensorboard -# conda install -yc spyder-ide spyder-line-profiler -# conda install -yc pytorch pytorch torchvision -# conda install -yc conda-forge protobuf numpy && pip install onnx==1.6.0 # https://github.com/onnx/onnx#linux-and-macos