From 7a7ff4ccab06604c2e101eefdd1c7c1644132dac Mon Sep 17 00:00:00 2001 From: Lorna Date: Wed, 4 Sep 2024 16:22:16 +0800 Subject: [PATCH 1/3] Fix 3 `Objects365.yaml` class names (#16002) --- ultralytics/cfg/datasets/Objects365.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ultralytics/cfg/datasets/Objects365.yaml b/ultralytics/cfg/datasets/Objects365.yaml index 9b117206f0..4994fd5f29 100644 --- a/ultralytics/cfg/datasets/Objects365.yaml +++ b/ultralytics/cfg/datasets/Objects365.yaml @@ -113,7 +113,7 @@ names: 95: Pot 96: Cow 97: Cake - 98: Dinning Table + 98: Dining Table 99: Sheep 100: Hanger 101: Blackboard/Whiteboard @@ -304,7 +304,7 @@ names: 286: Hammer 287: Cue 288: Avocado - 289: Hamimelon + 289: Hami melon 290: Flask 291: Mushroom 292: Screwdriver @@ -328,7 +328,7 @@ names: 310: Dishwasher 311: Crab 312: Hoverboard - 313: Meat ball + 313: Meatball 314: Rice Cooker 315: Tuba 316: Calculator From fcb73595eca116cbcdd4823bbbeabd16181b3314 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 4 Sep 2024 11:18:27 +0200 Subject: [PATCH 2/3] Add UltralyticsAssistant to mkdocs_github_authors.yaml (#15992) Co-authored-by: UltralyticsAssistant --- docs/mkdocs_github_authors.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/mkdocs_github_authors.yaml b/docs/mkdocs_github_authors.yaml index 6453f86569..b323b4a39e 100644 --- a/docs/mkdocs_github_authors.yaml +++ b/docs/mkdocs_github_authors.yaml @@ -115,6 +115,9 @@ sometimesocrazy@gmail.com: stormsson@users.noreply.github.com: avatar: https://avatars.githubusercontent.com/u/1133032?v=4 username: stormsson +web@ultralytics.com: + avatar: https://avatars.githubusercontent.com/u/135830346?v=4 + username: UltralyticsAssistant xinwang614@gmail.com: avatar: https://avatars.githubusercontent.com/u/17264618?v=4 username: GreatV From 88102eb5085a668fff0171fdaa6297af65c2d010 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 4 Sep 2024 14:14:06 +0200 Subject: [PATCH 3/3] Skip `test_workflow` on Windows CI (#16003) Signed-off-by: UltralyticsAssistant Co-authored-by: UltralyticsAssistant --- tests/test_python.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_python.py b/tests/test_python.py index f15dd48eff..aa18029d75 100644 --- a/tests/test_python.py +++ b/tests/test_python.py @@ -196,13 +196,14 @@ def test_all_model_yamls(): YOLO(m.name) +@pytest.mark.skipif(WINDOWS, reason="Windows slow CI export bug https://github.com/ultralytics/ultralytics/pull/16003") def test_workflow(): """Test the complete workflow including training, validation, prediction, and exporting.""" model = YOLO(MODEL) model.train(data="coco8.yaml", epochs=1, imgsz=32, optimizer="SGD") model.val(imgsz=32) model.predict(SOURCE, imgsz=32) - model.export(format="torchscript") + model.export(format="torchscript") # WARNING: Windows slow CI export bug def test_predict_callback_and_setup():