HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Change index to start from 1 by default in predictions.json (#18140)

Browse source 
Signed-off-by: Mohammed Yasin <32206511+Y-T-G@users.noreply.github.com>
Co-authored-by: UltralyticsAssistant <web@ultralytics.com>
This commit is contained in:
Mohammed Yasin 2024-12-11 01:00:24 +08:00 • committed by GitHub
parent d170f1ab6a
commit 16c573ac1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ultralytics/models/yolo/detect/val.py
View file

@ -74,7 +74,7 @@ class DetectionValidator(BaseValidator):
and (val.endswith(f"{os.sep}val2017.txt") or val.endswith(f"{os.sep}test-dev2017.txt")) and (val.endswith(f"{os.sep}val2017.txt") or val.endswith(f"{os.sep}test-dev2017.txt"))
) # is COCO ) # is COCO
self.is_lvis = isinstance(val, str) and "lvis" in val and not self.is_coco # is LVIS self.is_lvis = isinstance(val, str) and "lvis" in val and not self.is_coco # is LVIS
self.class_map = converter.coco80_to_coco91_class() if self.is_coco else list(range(len(model.names))) self.class_map = converter.coco80_to_coco91_class() if self.is_coco else list(range(1, len(model.names) + 1))
self.args.save_json |= self.args.val and (self.is_coco or self.is_lvis) and not self.training # run final val self.args.save_json |= self.args.val and (self.is_coco or self.is_lvis) and not self.training # run final val
self.names = model.names self.names = model.names
self.nc = len(model.names) self.nc = len(model.names)
@ -288,8 +288,7 @@ class DetectionValidator(BaseValidator):
self.jdict.append( self.jdict.append(
{ {
"image_id": image_id, "image_id": image_id,
"category_id": self.class_map[int(p[5])] "category_id": self.class_map[int(p[5])],
+ (1 if self.is_lvis else 0), # index starts from 1 if it's lvis
"bbox": [round(x, 3) for x in b], "bbox": [round(x, 3) for x in b],
"score": round(p[4], 5), "score": round(p[4], 5),
} }

4
ultralytics/models/yolo/obb/val.py
View file

@ -160,7 +160,7 @@ class OBBValidator(DetectionValidator):
for d in data: for d in data:
image_id = d["image_id"] image_id = d["image_id"]
score = d["score"] score = d["score"]
classname = self.names[d["category_id"]].replace(" ", "-") classname = self.names[d["category_id"] - 1].replace(" ", "-")
p = d["poly"] p = d["poly"]
with open(f'{pred_txt / f"Task1_{classname}"}.txt', "a") as f: with open(f'{pred_txt / f"Task1_{classname}"}.txt', "a") as f:
@ -175,7 +175,7 @@ class OBBValidator(DetectionValidator):
image_id = d["image_id"].split("__")[0] image_id = d["image_id"].split("__")[0]
pattern = re.compile(r"\d+___\d+") pattern = re.compile(r"\d+___\d+")
x, y = (int(c) for c in re.findall(pattern, d["image_id"])[0].split("___")) x, y = (int(c) for c in re.findall(pattern, d["image_id"])[0].split("___"))
bbox, score, cls = d["rbox"], d["score"], d["category_id"] bbox, score, cls = d["rbox"], d["score"], d["category_id"] - 1
bbox[0] += x bbox[0] += x
bbox[1] += y bbox[1] += y
bbox.extend([score, cls]) bbox.extend([score, cls])