Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed manual accounting of field's count #12842

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
c7ff301
Removed manual accounting of field's count and added option to change…
igeni Mar 23, 2024
47e817c
Merge branch 'master' into remove-manual-accounting
glenn-jocher Apr 9, 2024
5851298
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Apr 14, 2024
bdad2c5
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Apr 18, 2024
b755550
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Apr 27, 2024
ce3258d
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Apr 28, 2024
70dae61
Auto-format by https://ultralytics.com/actions
UltralyticsAssistant Apr 28, 2024
a6f5c8c
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 5, 2024
623c7cd
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 12, 2024
df25307
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 12, 2024
84729a4
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 12, 2024
f13e1af
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 12, 2024
3d46db5
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 13, 2024
e21e701
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 18, 2024
68ff379
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 24, 2024
e0f0110
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 28, 2024
1140453
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 29, 2024
7048f53
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 29, 2024
0faa03c
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant May 30, 2024
52bf564
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 8, 2024
3fe4b9d
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 8, 2024
b37e281
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 9, 2024
d0c0f77
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 16, 2024
59639b3
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 16, 2024
a117670
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 17, 2024
5faab79
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 19, 2024
925d407
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 19, 2024
49675db
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 20, 2024
1bb4302
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 20, 2024
aa9d765
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 20, 2024
aea62ca
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 20, 2024
8b6d79d
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 22, 2024
d99f0be
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 30, 2024
2f9a0ba
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 30, 2024
93e6aea
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jun 30, 2024
dfe9cbd
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 5, 2024
819bf6b
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 8, 2024
b91e0fd
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 8, 2024
df0f06a
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 8, 2024
acc3591
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 10, 2024
6cdf59a
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 13, 2024
6a93229
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 15, 2024
e5b4c52
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 15, 2024
a7f25af
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 17, 2024
b4eb955
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 17, 2024
5c5b82a
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 22, 2024
019d527
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 23, 2024
30b136a
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 25, 2024
6775d7b
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 29, 2024
1d4130c
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Jul 29, 2024
e3c3c49
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 11, 2024
64b6b96
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 14, 2024
1bae8d5
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 14, 2024
2a826bf
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 19, 2024
0b9539b
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 20, 2024
73373de
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 20, 2024
44728eb
Merge branch 'master' into remove-manual-accounting
UltralyticsAssistant Aug 24, 2024
fa8c344
Auto-format by https://ultralytics.com/actions
UltralyticsAssistant Aug 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions segment/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,7 @@ def train(hyp, opt, device, callbacks):
if RANK != -1:
train_loader.sampler.set_epoch(epoch)
pbar = enumerate(train_loader)
LOGGER.info(
("\n" + "%11s" * 8)
% ("Epoch", "GPU_mem", "box_loss", "seg_loss", "obj_loss", "cls_loss", "Instances", "Size")
)
LOGGER.info('\n' + ''.join([f"{el:>11}" for el in ["Epoch", "GPU_mem", "box_loss", "seg_loss", "obj_loss", "cls_loss", "Instances", "Size"]]))
if RANK in {-1, 0}:
pbar = tqdm(pbar, total=nb, bar_format=TQDM_BAR_FORMAT) # progress bar
optimizer.zero_grad()
Expand Down
14 changes: 1 addition & 13 deletions segment/val.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,7 @@ def run(
if isinstance(names, (list, tuple)): # old format
names = dict(enumerate(names))
class_map = coco80_to_coco91_class() if is_coco else list(range(1000))
s = ("%22s" + "%11s" * 10) % (
"Class",
"Images",
"Instances",
"Box(P",
"R",
"mAP50",
"mAP50-95)",
"Mask(P",
"R",
"mAP50",
"mAP50-95)",
)
s = ''.join([f"{el:>11}" if idx>0 else f"{el:>22}" for idx, el in enumerate(["Class", "Images", "Instances", "Box(P", "R", "mAP50", "mAP50-95)", "Mask(P", "R", "mAP50", "mAP50-95)"])])
dt = Profile(device=device), Profile(device=device), Profile(device=device)
metrics = Metrics()
loss = torch.zeros(4, device=device)
Expand Down
2 changes: 1 addition & 1 deletion train.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def train(hyp, opt, device, callbacks):
if RANK != -1:
train_loader.sampler.set_epoch(epoch)
pbar = enumerate(train_loader)
LOGGER.info(("\n" + "%11s" * 7) % ("Epoch", "GPU_mem", "box_loss", "obj_loss", "cls_loss", "Instances", "Size"))
LOGGER.info('\n' + ''.join([f"{el:>11}" for el in ["Epoch", "GPU_mem", "box_loss", "obj_loss", "cls_loss", "Instances", "Size"]]))
if RANK in {-1, 0}:
pbar = tqdm(pbar, total=nb, bar_format=TQDM_BAR_FORMAT) # progress bar
optimizer.zero_grad()
Expand Down
2 changes: 1 addition & 1 deletion val.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def run(
if isinstance(names, (list, tuple)): # old format
names = dict(enumerate(names))
class_map = coco80_to_coco91_class() if is_coco else list(range(1000))
s = ("%22s" + "%11s" * 6) % ("Class", "Images", "Instances", "P", "R", "mAP50", "mAP50-95")
s = ''.join([f"{el:>11}" if idx>0 else f"{el:>22}" for idx, el in enumerate(["Class", "Images", "Instances", "P", "R", "mAP50", "mAP50-95"])])
tp, fp, p, r, f1, mp, mr, map50, ap50, map = 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
dt = Profile(device=device), Profile(device=device), Profile(device=device) # profiling times
loss = torch.zeros(3, device=device)
Expand Down
Loading