check_file() update from yolov5

This commit is contained in:
Glenn Jocher 2020-06-15 12:25:48 -07:00
parent 936ac746ce
commit c78d49f190
4 changed files with 16 additions and 6 deletions

View File

@ -183,8 +183,8 @@ if __name__ == '__main__':
parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS') parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS')
parser.add_argument('--augment', action='store_true', help='augmented inference') parser.add_argument('--augment', action='store_true', help='augmented inference')
opt = parser.parse_args() opt = parser.parse_args()
opt.cfg = list(glob.iglob('./**/' + opt.cfg, recursive=True))[0] # find file opt.cfg = check_file(opt.cfg) # check file
opt.names = list(glob.iglob('./**/' + opt.names, recursive=True))[0] # find file opt.names = check_file(opt.names) # check file
print(opt) print(opt)
with torch.no_grad(): with torch.no_grad():

View File

@ -243,8 +243,8 @@ if __name__ == '__main__':
parser.add_argument('--augment', action='store_true', help='augmented inference') parser.add_argument('--augment', action='store_true', help='augmented inference')
opt = parser.parse_args() opt = parser.parse_args()
opt.save_json = opt.save_json or any([x in opt.data for x in ['coco.data', 'coco2014.data', 'coco2017.data']]) opt.save_json = opt.save_json or any([x in opt.data for x in ['coco.data', 'coco2014.data', 'coco2017.data']])
opt.cfg = list(glob.iglob('./**/' + opt.cfg, recursive=True))[0] # find file opt.cfg = check_file(opt.cfg) # check file
opt.data = list(glob.iglob('./**/' + opt.data, recursive=True))[0] # find file opt.data = check_file(opt.data) # check file
print(opt) print(opt)
# task = 'test', 'study', 'benchmark' # task = 'test', 'study', 'benchmark'

View File

@ -397,8 +397,8 @@ if __name__ == '__main__':
opt = parser.parse_args() opt = parser.parse_args()
opt.weights = last if opt.resume else opt.weights opt.weights = last if opt.resume else opt.weights
check_git_status() check_git_status()
opt.cfg = list(glob.iglob('./**/' + opt.cfg, recursive=True))[0] # find file opt.cfg = check_file(opt.cfg) # check file
# opt.data = list(glob.iglob('./**/' + opt.data, recursive=True))[0] # find file opt.data = check_file(opt.data) # check file
print(opt) print(opt)
opt.img_size.extend([opt.img_size[-1]] * (3 - len(opt.img_size))) # extend to 3 sizes (min, max, test) opt.img_size.extend([opt.img_size[-1]] * (3 - len(opt.img_size))) # extend to 3 sizes (min, max, test)
device = torch_utils.select_device(opt.device, apex=mixed_precision, batch_size=opt.batch_size) device = torch_utils.select_device(opt.device, apex=mixed_precision, batch_size=opt.batch_size)

View File

@ -43,6 +43,16 @@ def check_git_status():
print(s[s.find('Your branch is behind'):s.find('\n\n')] + '\n') print(s[s.find('Your branch is behind'):s.find('\n\n')] + '\n')
def check_file(file):
# Searches for file if not found locally
if os.path.isfile(file):
return file
else:
files = glob.glob('./**/' + file, recursive=True) # find file
assert len(files), 'File Not Found: %s' % file # assert file was found
return files[0] # return first file if multiple found
def load_classes(path): def load_classes(path):
# Loads *.names file at 'path' # Loads *.names file at 'path'
with open(path, 'r') as f: with open(path, 'r') as f: