From a12698f4c952d8804e7d0a5a70940202ff4844af Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sun, 4 Oct 2020 18:50:32 +0200 Subject: [PATCH] Update ci-testing.yml reflecting sys.path additions (#869) * Update ci-testing.yml * Update yolo.py * Update ci-testing.yml * Update export.py * Update yolo.py --- .github/workflows/ci-testing.yml | 8 ++++---- models/export.py | 6 +++--- models/yolo.py | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 23dbf48cc..a0905fcc4 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -53,13 +53,13 @@ jobs: - name: Download data run: | - curl -L -o temp.zip https://github.com/ultralytics/yolov5/releases/download/v1.0/coco128.zip - unzip -q temp.zip -d ../ - rm temp.zip + # curl -L -o tmp.zip https://github.com/ultralytics/yolov5/releases/download/v1.0/coco128.zip + # unzip -q tmp.zip -d ../ + # rm tmp.zip - name: Tests workflow run: | - export PYTHONPATH="$PWD" # to run *.py. files in subdirectories + # export PYTHONPATH="$PWD" # to run '$ python *.py' files in subdirectories di=cpu # inference devices # define device # train diff --git a/models/export.py b/models/export.py index 09af4677e..136ac6e4b 100644 --- a/models/export.py +++ b/models/export.py @@ -5,13 +5,13 @@ Usage: """ import argparse +import sys + +sys.path.append('./') # to run '$ python *.py' files in subdirectories import torch import torch.nn as nn -import sys -sys.path.append('./') - import models from models.experimental import attempt_load from utils.activations import Hardswish diff --git a/models/yolo.py b/models/yolo.py index 348c418e4..46f1375e5 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -1,9 +1,13 @@ import argparse import logging import math +import sys from copy import deepcopy from pathlib import Path +sys.path.append('./') # to run '$ python *.py' files in subdirectories +logger = logging.getLogger(__name__) + import torch import torch.nn as nn @@ -13,8 +17,6 @@ from utils.general import check_anchor_order, make_divisible, check_file, set_lo from utils.torch_utils import ( time_synchronized, fuse_conv_and_bn, model_info, scale_img, initialize_weights, select_device) -logger = logging.getLogger(__name__) - class Detect(nn.Module): stride = None # strides computed during build