Skip to content

Commit

Permalink
PyTorch Hub model.save() increment as runs/hub/exp (ultralytics#2684)
Browse files Browse the repository at this point in the history
* PyTorch Hub model.save() increment as runs/hub/exp

This chane will align PyTorch Hub results saving with the existing unified results saving directory structure of

runs/
  /train
  /detect
  /test
  /hub
    /exp
    /exp2
    ...

* cleanup

(cherry picked from commit 2af059c)
  • Loading branch information
glenn-jocher authored and Lechtr committed Apr 12, 2021
1 parent 0e92d5f commit 7c8d014
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions models/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from torch.cuda import amp

from utils.datasets import letterbox
from utils.general import non_max_suppression, make_divisible, scale_coords, xyxy2xywh
from utils.general import non_max_suppression, make_divisible, scale_coords, increment_path, xyxy2xywh
from utils.plots import color_list, plot_one_box
from utils.torch_utils import time_synchronized

Expand Down Expand Up @@ -324,9 +324,9 @@ def display(self, pprint=False, show=False, save=False, render=False, save_dir='
if show:
img.show(self.files[i]) # show
if save:
f = Path(save_dir) / self.files[i]
img.save(f) # save
print(f"{'Saving' * (i == 0)} {f},", end='' if i < self.n - 1 else ' done.\n')
f = self.files[i]
img.save(Path(save_dir) / f) # save
print(f"{'Saved' * (i == 0)} {f}", end=',' if i < self.n - 1 else f' to {save_dir}\n')
if render:
self.imgs[i] = np.asarray(img)

Expand All @@ -337,8 +337,9 @@ def print(self):
def show(self):
self.display(show=True) # show results

def save(self, save_dir='results/'):
Path(save_dir).mkdir(exist_ok=True)
def save(self, save_dir='runs/hub/exp'):
save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/hub/exp') # increment save_dir
Path(save_dir).mkdir(parents=True, exist_ok=True)
self.display(save=True, save_dir=save_dir) # save results

def render(self):
Expand Down

0 comments on commit 7c8d014

Please sign in to comment.