From fa450096e2b78f6573cb87d639fe3c66f8580951 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 10 Jul 2024 20:44:30 +0200 Subject: [PATCH] Ultralytics Asset URL Update (#2248) Refactor code for speed and clarity --- README.md | 12 ++++++------ README.zh-CN.md | 12 ++++++------ classify/train.py | 2 +- classify/tutorial.ipynb | 2 +- data/GlobalWheat2020.yaml | 2 +- data/VisDrone.yaml | 8 ++++---- data/coco.yaml | 2 +- data/coco128-seg.yaml | 2 +- data/coco128.yaml | 2 +- data/voc.yaml | 2 +- segment/tutorial.ipynb | 4 ++-- tutorial.ipynb | 4 ++-- utils/general.py | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 89bea96cf8..6a50e7f476 100644 --- a/README.md +++ b/README.md @@ -409,22 +409,22 @@ Get started in seconds with our verified environments. Click each icon below for
- + - + - + - + - + - +
##
Contribute
diff --git a/README.zh-CN.md b/README.zh-CN.md index 0a367b1b7d..a63eabb4fb 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -409,22 +409,22 @@ python export.py --weights yolov5s-cls.pt resnet50.pt efficientnet_b0.pt --inclu
- + - + - + - + - + - +
##
贡献
diff --git a/classify/train.py b/classify/train.py index 9fb30fa2b5..9321a60bad 100644 --- a/classify/train.py +++ b/classify/train.py @@ -111,7 +111,7 @@ def train(opt, device): if str(data) == "imagenet": subprocess.run(["bash", str(ROOT / "data/scripts/get_imagenet.sh")], shell=True, check=True) else: - url = f"https://github.com/ultralytics/yolov5/releases/download/v1.0/{data}.zip" + url = f"https://github.com/ultralytics/assets/releases/download/v0.0.0/{data}.zip" download(url, dir=data_dir.parent) s = f"Dataset download success ✅ ({time.time() - t:.1f}s), saved to {colorstr('bold', data_dir)}\n" LOGGER.info(s) diff --git a/classify/tutorial.ipynb b/classify/tutorial.ipynb index d9e1d69137..34eaca9553 100644 --- a/classify/tutorial.ipynb +++ b/classify/tutorial.ipynb @@ -1290,7 +1290,7 @@ "\u001b[34m\u001b[1mTensorBoard: \u001b[0mStart with 'tensorboard --logdir runs/train-cls', view at http://localhost:6006/\n", "\n", "Dataset not found ⚠️, missing path /content/datasets/imagenette160, attempting download...\n", - "Downloading https://github.com/ultralytics/yolov5/releases/download/v1.0/imagenette160.zip to /content/datasets/imagenette160.zip...\n", + "Downloading https://github.com/ultralytics/assets/releases/download/v0.0.0/imagenette160.zip to /content/datasets/imagenette160.zip...\n", "100% 103M/103M [00:00<00:00, 347MB/s] \n", "Unzipping /content/datasets/imagenette160.zip...\n", "Dataset download success ✅ (3.3s), saved to \u001b[1m/content/datasets/imagenette160\u001b[0m\n", diff --git a/data/GlobalWheat2020.yaml b/data/GlobalWheat2020.yaml index 52e07a658a..007e4f0953 100644 --- a/data/GlobalWheat2020.yaml +++ b/data/GlobalWheat2020.yaml @@ -36,7 +36,7 @@ download: | # Download dir = Path(yaml['path']) # dataset root dir urls = ['https://zenodo.org/record/4298502/files/global-wheat-codalab-official.zip', - 'https://github.com/ultralytics/yolov5/releases/download/v1.0/GlobalWheat2020_labels.zip'] + 'https://github.com/ultralytics/assets/releases/download/v0.0.0/GlobalWheat2020_labels.zip'] download(urls, dir=dir) # Make Directories diff --git a/data/VisDrone.yaml b/data/VisDrone.yaml index 2934e01f1c..de42f7a384 100644 --- a/data/VisDrone.yaml +++ b/data/VisDrone.yaml @@ -57,10 +57,10 @@ download: | # Download dir = Path(yaml['path']) # dataset root dir - urls = ['https://github.com/ultralytics/yolov5/releases/download/v1.0/VisDrone2019-DET-train.zip', - 'https://github.com/ultralytics/yolov5/releases/download/v1.0/VisDrone2019-DET-val.zip', - 'https://github.com/ultralytics/yolov5/releases/download/v1.0/VisDrone2019-DET-test-dev.zip', - 'https://github.com/ultralytics/yolov5/releases/download/v1.0/VisDrone2019-DET-test-challenge.zip'] + urls = ['https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-train.zip', + 'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-val.zip', + 'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-dev.zip', + 'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-challenge.zip'] download(urls, dir=dir, curl=True, threads=4) # Convert diff --git a/data/coco.yaml b/data/coco.yaml index f7ddc80705..65224a06fd 100644 --- a/data/coco.yaml +++ b/data/coco.yaml @@ -103,7 +103,7 @@ download: | # Download labels segments = False # segment or box labels dir = Path(yaml['path']) # dataset root dir - url = 'https://github.com/ultralytics/yolov5/releases/download/v1.0/' + url = 'https://github.com/ultralytics/assets/releases/download/v0.0.0/' urls = [url + ('coco2017labels-segments.zip' if segments else 'coco2017labels.zip')] # labels download(urls, dir=dir.parent) diff --git a/data/coco128-seg.yaml b/data/coco128-seg.yaml index a3798158bf..363ced868a 100644 --- a/data/coco128-seg.yaml +++ b/data/coco128-seg.yaml @@ -96,4 +96,4 @@ names: 79: toothbrush # Download script/URL (optional) -download: https://ultralytics.com/assets/coco128-seg.zip +download: https://github.com/ultralytics/assets/releases/download/v0.0.0/coco128-seg.zip diff --git a/data/coco128.yaml b/data/coco128.yaml index 3a58985aaf..4bfbf3a2eb 100644 --- a/data/coco128.yaml +++ b/data/coco128.yaml @@ -96,4 +96,4 @@ names: 79: toothbrush # Download script/URL (optional) -download: https://ultralytics.com/assets/coco128.zip +download: https://github.com/ultralytics/assets/releases/download/v0.0.0/coco128.zip diff --git a/data/voc.yaml b/data/voc.yaml index b7f25e7235..732c96345f 100644 --- a/data/voc.yaml +++ b/data/voc.yaml @@ -75,7 +75,7 @@ download: | # Download dir = Path(yaml['path']) # dataset root dir - url = 'https://github.com/ultralytics/yolov5/releases/download/v1.0/' + url = 'https://github.com/ultralytics/assets/releases/download/v0.0.0/' urls = [f'{url}VOCtrainval_06-Nov-2007.zip', # 446MB, 5012 images f'{url}VOCtest_06-Nov-2007.zip', # 438MB, 4953 images f'{url}VOCtrainval_11-May-2012.zip'] # 1.95GB, 17126 images diff --git a/segment/tutorial.ipynb b/segment/tutorial.ipynb index 5b4b46303a..346dd2e961 100644 --- a/segment/tutorial.ipynb +++ b/segment/tutorial.ipynb @@ -162,7 +162,7 @@ "output_type": "stream", "name": "stdout", "text": [ - "Downloading https://github.com/ultralytics/yolov5/releases/download/v1.0/coco2017labels-segments.zip ...\n", + "Downloading https://github.com/ultralytics/assets/releases/download/v0.0.0/coco2017labels-segments.zip ...\n", "Downloading http://images.cocodataset.org/zips/val2017.zip ...\n", "######################################################################## 100.0%\n", "######################################################################## 100.0%\n" @@ -286,7 +286,7 @@ "\u001b[34m\u001b[1mTensorBoard: \u001b[0mStart with 'tensorboard --logdir runs/train-seg', view at http://localhost:6006/\n", "\n", "Dataset not found ⚠️, missing paths ['/content/datasets/coco128-seg/images/train2017']\n", - "Downloading https://ultralytics.com/assets/coco128-seg.zip to coco128-seg.zip...\n", + "Downloading https://github.com/ultralytics/assets/releases/download/v0.0.0/coco128-seg.zip to coco128-seg.zip...\n", "100% 6.79M/6.79M [00:01<00:00, 6.73MB/s]\n", "Dataset download success ✅ (1.9s), saved to \u001b[1m/content/datasets\u001b[0m\n", "\n", diff --git a/tutorial.ipynb b/tutorial.ipynb index 93949e4866..783c5ef718 100644 --- a/tutorial.ipynb +++ b/tutorial.ipynb @@ -171,7 +171,7 @@ }, "source": [ "# Download COCO val\n", - "torch.hub.download_url_to_file('https://ultralytics.com/assets/coco2017val.zip', 'tmp.zip') # download (780M - 5000 images)\n", + "torch.hub.download_url_to_file('https://github.com/ultralytics/assets/releases/download/v0.0.0/coco2017val.zip', 'tmp.zip') # download (780M - 5000 images)\n", "!unzip -q tmp.zip -d ../datasets && rm tmp.zip # unzip" ], "execution_count": 3, @@ -327,7 +327,7 @@ "\u001b[34m\u001b[1mTensorBoard: \u001b[0mStart with 'tensorboard --logdir runs/train', view at http://localhost:6006/\n", "\n", "Dataset not found ⚠️, missing paths ['/content/datasets/coco128/images/train2017']\n", - "Downloading https://ultralytics.com/assets/coco128.zip to coco128.zip...\n", + "Downloading https://github.com/ultralytics/assets/releases/download/v0.0.0/coco128.zip to coco128.zip...\n", "100% 6.66M/6.66M [00:00<00:00, 75.6MB/s]\n", "Dataset download success ✅ (0.6s), saved to \u001b[1m/content/datasets\u001b[0m\n", "\n", diff --git a/utils/general.py b/utils/general.py index 117ab059fd..209350eb26 100644 --- a/utils/general.py +++ b/utils/general.py @@ -49,7 +49,7 @@ AUTOINSTALL = str(os.getenv("YOLOv5_AUTOINSTALL", True)).lower() == "true" # global auto-install mode VERBOSE = str(os.getenv("YOLOv5_VERBOSE", True)).lower() == "true" # global verbose mode TQDM_BAR_FORMAT = "{l_bar}{bar:10}{r_bar}" # tqdm bar format -FONT = "Arial.ttf" # https://ultralytics.com/assets/Arial.ttf +FONT = "Arial.ttf" # https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf torch.set_printoptions(linewidth=320, precision=5, profile="long") np.set_printoptions(linewidth=320, formatter={"float_kind": "{:11.5g}".format}) # format short g, %precision=5 @@ -508,7 +508,7 @@ def check_font(font=FONT, progress=False): font = Path(font) file = CONFIG_DIR / font.name if not font.exists() and not file.exists(): - url = f"https://ultralytics.com/assets/{font.name}" + url = f"https://github.com/ultralytics/assets/releases/download/v0.0.0/{font.name}" LOGGER.info(f"Downloading {url} to {file}...") torch.hub.download_url_to_file(url, str(file), progress=progress)