From 055911d79d108a67b945f2d2e807856cd596146d Mon Sep 17 00:00:00 2001 From: Clay Rosenthal Date: Thu, 11 Sep 2025 16:10:04 -0700 Subject: [PATCH] Use https everywhere applicable --- README.md | 2 +- setup.py | 2 +- vlmeval/dataset/GUI/screenspot.py | 12 +++++----- vlmeval/dataset/GUI/screenspot_pro.py | 12 +++++----- vlmeval/dataset/charxiv.py | 4 ++-- vlmeval/dataset/image_ccocr.py | 4 ++-- vlmeval/dataset/image_mcq.py | 20 ++++++++--------- vlmeval/dataset/image_vqa.py | 32 +++++++++++++-------------- vlmeval/dataset/mmlongbench.py | 2 +- vlmeval/dataset/spatial457.py | 2 +- vlmeval/inference.py | 2 +- vlmeval/vlm/xcomposer/xcomposer2d5.py | 2 +- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 36a2d93ec..0c24eff37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![LOGO](http://opencompass.openxlab.space/utils/MMLB.jpg) +![LOGO](https://opencompass.openxlab.space/utils/MMLB.jpg) A Toolkit for Evaluating Large Vision-Language Models. diff --git a/setup.py b/setup.py index bff6b0a72..1e31006ad 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def parse_line(line): op, rest = parts[1:] if ';' in rest: # Handle platform specific dependencies - # http://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-platform-specific-dependencies + # https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-platform-specific-dependencies version, platform_deps = map(str.strip, rest.split(';')) info['platform_deps'] = platform_deps diff --git a/vlmeval/dataset/GUI/screenspot.py b/vlmeval/dataset/GUI/screenspot.py index ac2cbe3e2..0f9588f15 100644 --- a/vlmeval/dataset/GUI/screenspot.py +++ b/vlmeval/dataset/GUI/screenspot.py @@ -140,12 +140,12 @@ class ScreenSpot(ImageBaseDataset): MODALITY = "IMAGE" TYPE = "GUI" DATASET_URL = { - "ScreenSpot_Mobile": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Mobile.tsv", # noqa - "ScreenSpot_Desktop": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Desktop.tsv", # noqa - "ScreenSpot_Web": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Web.tsv", # noqa - "ScreenSpot_v2_Mobile": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Mobile.tsv", # noqa - "ScreenSpot_v2_Desktop": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Desktop.tsv", # noqa - "ScreenSpot_v2_Web": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Web.tsv", # noqa + "ScreenSpot_Mobile": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Mobile.tsv", # noqa + "ScreenSpot_Desktop": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Desktop.tsv", # noqa + "ScreenSpot_Web": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot/ScreenSpot_Web.tsv", # noqa + "ScreenSpot_v2_Mobile": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Mobile.tsv", # noqa + "ScreenSpot_v2_Desktop": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Desktop.tsv", # noqa + "ScreenSpot_v2_Web": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_v2/ScreenSpot_v2_Web.tsv", # noqa } # path DATASET_URL_V2 = { "ScreenSpot_Mobile": "$WORK_DIR/screenspot_mobile_ug.json", diff --git a/vlmeval/dataset/GUI/screenspot_pro.py b/vlmeval/dataset/GUI/screenspot_pro.py index 26fde4114..646b7d9bd 100644 --- a/vlmeval/dataset/GUI/screenspot_pro.py +++ b/vlmeval/dataset/GUI/screenspot_pro.py @@ -141,12 +141,12 @@ class ScreenSpot_Pro(ImageBaseDataset): MODALITY = "IMAGE" TYPE = "GUI" DATASET_URL = { - "ScreenSpot_Pro_Development": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Development.tsv", # noqa - "ScreenSpot_Pro_Creative": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Creative.tsv", # noqa - "ScreenSpot_Pro_CAD": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_CAD.tsv", # noqa - "ScreenSpot_Pro_Scientific": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Scientific.tsv", # noqa - "ScreenSpot_Pro_Office": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Office.tsv", # noqa - "ScreenSpot_Pro_OS": "http://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_OS.tsv", # noqa + "ScreenSpot_Pro_Development": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Development.tsv", # noqa + "ScreenSpot_Pro_Creative": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Creative.tsv", # noqa + "ScreenSpot_Pro_CAD": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_CAD.tsv", # noqa + "ScreenSpot_Pro_Scientific": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Scientific.tsv", # noqa + "ScreenSpot_Pro_Office": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_Office.tsv", # noqa + "ScreenSpot_Pro_OS": "https://opencompass.openxlab.space/utils/benchmarks/GUI/ScreenSpot_Pro/ScreenSpot_Pro_OS.tsv", # noqa } # path DATASET_MD5 = { 'ScreenSpot_Pro_Development': '45b93df1d5814885011d682fe1b0f959', diff --git a/vlmeval/dataset/charxiv.py b/vlmeval/dataset/charxiv.py index 0427632ba..6cf066420 100644 --- a/vlmeval/dataset/charxiv.py +++ b/vlmeval/dataset/charxiv.py @@ -103,8 +103,8 @@ def qid2category(mode: str) -> Tuple[Dict[int, str], str]: class CharXiv(ImageBaseDataset): TYPE = "VQA" DATASET_URL = { - "CharXiv_descriptive_val": "http://opencompass.openxlab.space/utils/VLMEval/CharXiv_descriptive_val.tsv", - "CharXiv_reasoning_val": "http://opencompass.openxlab.space/utils/VLMEval/CharXiv_reasoning_val.tsv", + "CharXiv_descriptive_val": "https://opencompass.openxlab.space/utils/VLMEval/CharXiv_descriptive_val.tsv", + "CharXiv_reasoning_val": "https://opencompass.openxlab.space/utils/VLMEval/CharXiv_reasoning_val.tsv", } DATASET_MD5 = { "CharXiv_descriptive_val": "e165037032f169a59dd09ea5d7ad3073", diff --git a/vlmeval/dataset/image_ccocr.py b/vlmeval/dataset/image_ccocr.py index b1286daba..86a664741 100644 --- a/vlmeval/dataset/image_ccocr.py +++ b/vlmeval/dataset/image_ccocr.py @@ -56,7 +56,7 @@ class CCOCRDataset(ImageBaseDataset): "CCOCR_MultiSceneOcr_UgcLaion": "https://www.modelscope.cn/datasets/Qwen/CC-OCR/resolve/master/multi_scene_ocr/ugc_text/ugc_laion_400.tsv", "CCOCR_MultiSceneOcr_ZhDense": "https://www.modelscope.cn/datasets/Qwen/CC-OCR/resolve/master/multi_scene_ocr/ugc_text/zh_dense_50.tsv", "CCOCR_MultiSceneOcr_ZhVertical": "https://www.modelscope.cn/datasets/Qwen/CC-OCR/resolve/master/multi_scene_ocr/ugc_text/zh_vertical_100.tsv", - "CCOCR": "http://opencompass.openxlab.space/utils/VLMEval/CCOCR.tsv" + "CCOCR": "https://opencompass.openxlab.space/utils/VLMEval/CCOCR.tsv" } DATASET_URL_HUGGINGFACE = { @@ -99,7 +99,7 @@ class CCOCRDataset(ImageBaseDataset): "CCOCR_MultiSceneOcr_UgcLaion": "https://huggingface.co/datasets/wulipc/CC-OCR/resolve/main/multi_scene_ocr/ugc_text/ugc_laion_400.tsv", "CCOCR_MultiSceneOcr_ZhDense": "https://huggingface.co/datasets/wulipc/CC-OCR/resolve/main/multi_scene_ocr/ugc_text/zh_dense_50.tsv", "CCOCR_MultiSceneOcr_ZhVertical": "https://huggingface.co/datasets/wulipc/CC-OCR/resolve/main/multi_scene_ocr/ugc_text/zh_vertical_100.tsv", - "CCOCR": "http://opencompass.openxlab.space/utils/VLMEval/CCOCR.tsv" + "CCOCR": "https://opencompass.openxlab.space/utils/VLMEval/CCOCR.tsv" } # define data path diff --git a/vlmeval/dataset/image_mcq.py b/vlmeval/dataset/image_mcq.py index b0892ad90..699c26e87 100644 --- a/vlmeval/dataset/image_mcq.py +++ b/vlmeval/dataset/image_mcq.py @@ -104,9 +104,9 @@ class ImageMCQDataset(ImageBaseDataset): 'https://huggingface.co/datasets/ryokamoi/VisOnlyQA_Eval_Real/' 'resolve/main/visonlyqa_vlmevalkit.tsv' ), - 'MMCR': 'http://opencompass.openxlab.space/utils/VLMEval/MMCR.tsv', + 'MMCR': 'https://opencompass.openxlab.space/utils/VLMEval/MMCR.tsv', 'MMSci_DEV_MCQ': 'https://opencompass.openxlab.space/utils/VLMEval/MMSci_DEV_MCQ.tsv', - "MMVP": "http://opencompass.openxlab.space/utils/VLMEval/MMVP.tsv", + "MMVP": "https://opencompass.openxlab.space/utils/VLMEval/MMVP.tsv", "K-DTCBench": "https://huggingface.co/datasets/NCSOFT/K-DTCBench/resolve/main/K-DTCBench.tsv", # For Internal Use Only 'MMBench_V11_MINI': 'https://opencompass.openxlab.space/utils/TEST/MMBench_V11_MINI.tsv', @@ -629,7 +629,7 @@ def evaluate(self, eval_file, **judge_kwargs): class MUIRDataset(ImageMCQDataset): DATASET_URL = { - 'MUIRBench': 'http://opencompass.openxxlab.com/utils/VLMEval/MUIRBench.tsv' + 'MUIRBench': 'https://opencompass.openxlab.space/utils/VLMEval/MUIRBench.tsv' } DATASET_MD5 = { @@ -1069,8 +1069,8 @@ class CVBench(ImageMCQDataset): See [Cambrian-1](https://arxiv.org/pdf/2406.16860) Appendix C """ DATASET_URL = { - "CV-Bench-2D": "http://opencompass.openxlab.space/utils/VLMEval/CV-Bench-2D.tsv", - "CV-Bench-3D": "http://opencompass.openxlab.space/utils/VLMEval/CV-Bench-3D.tsv", + "CV-Bench-2D": "https://opencompass.openxlab.space/utils/VLMEval/CV-Bench-2D.tsv", + "CV-Bench-3D": "https://opencompass.openxlab.space/utils/VLMEval/CV-Bench-3D.tsv", } DATASET_MD5 = { @@ -1585,7 +1585,7 @@ def build_prompt(self, line): class VisuLogic(ImageMCQDataset): TYPE = "MCQ" DATASET_URL = { - 'VisuLogic': 'http://opencompass.openxlab.space/utils/VLMEval/VisuLogic.tsv' + 'VisuLogic': 'https://opencompass.openxlab.space/utils/VLMEval/VisuLogic.tsv' } DATASET_MD5 = { 'VisuLogic': 'b0820b5ec1e01dfe3951927f0def73b6', @@ -2130,7 +2130,7 @@ def load_data(self, dataset="OmniMedVQA", repo_id="KKYYKK/OmniMed_VLM"): class MSEarthMCQ(ImageMCQDataset): DATASET_URL = { - 'MSEarthMCQ': 'http://opencompass.openxlab.space/utils/VLMEval/MSEarthMCQ.tsv', + 'MSEarthMCQ': 'https://opencompass.openxlab.space/utils/VLMEval/MSEarthMCQ.tsv', } DATASET_MD5 = { @@ -2195,7 +2195,7 @@ def build_prompt(self, line): class VLMBlind(ImageMCQDataset): TYPE = "MCQ" DATASET_URL = { - 'VLMBlind': 'http://opencompass.openxlab.space/utils/VLMEval/VLMBlind.tsv' + 'VLMBlind': 'https://opencompass.openxlab.space/utils/VLMEval/VLMBlind.tsv' } DATASET_MD5 = { 'VLMBlind': 'e0f960236afe08f9fa48e8ccc908b2a9', @@ -2326,7 +2326,7 @@ def convert_to_vlmeval_format(example): class _3DSRBench(ImageMCQDataset): - DATASET_URL = {'3DSRBench': 'http://opencompass.openxlab.space/utils/VLMEval/3DSRBench.tsv'} + DATASET_URL = {'3DSRBench': 'https://opencompass.openxlab.space/utils/VLMEval/3DSRBench.tsv'} DATASET_MD5 = {'3DSRBench': '610516a0b4710595545b7613c60524e8'} def evaluate(self, eval_file, **judge_kwargs): @@ -2381,7 +2381,7 @@ def evaluate(self, eval_file, **judge_kwargs): class AffordanceDataset(ImageMCQDataset): - DATASET_URL = {'A4Bench': "http://opencompass.openxlab.space/utils/VLMEval/A4Bench.tsv"} + DATASET_URL = {'A4Bench': "https://opencompass.openxlab.space/utils/VLMEval/A4Bench.tsv"} DATASET_MD5 = {'A4Bench': "7c0dc90e8c03e67ff937f3abb4a3fffb"} def build_prompt(self, line): diff --git a/vlmeval/dataset/image_vqa.py b/vlmeval/dataset/image_vqa.py index ad202d9e8..fd0ce1198 100644 --- a/vlmeval/dataset/image_vqa.py +++ b/vlmeval/dataset/image_vqa.py @@ -431,19 +431,19 @@ class MathVerse(ImageBaseDataset): TYPE = 'VQA' DATASET_URL = { 'MathVerse_MINI': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIV.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIV.tsv', # noqa 'MathVerse_MINI_Vision_Only': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVOnly.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVOnly.tsv', # noqa 'MathVerse_MINI_Vision_Only_cot': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVOnly.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVOnly.tsv', # noqa 'MathVerse_MINI_Vision_Dominant': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVDom.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVDom.tsv', # noqa 'MathVerse_MINI_Vision_Intensive': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVInt.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINIVInt.tsv', # noqa 'MathVerse_MINI_Text_Lite': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINITLite.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINITLite.tsv', # noqa 'MathVerse_MINI_Text_Dominant': - 'http://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINITDom.tsv', # noqa + 'https://opencompass.openxlab.space/utils/benchmarks/MathVerse/MathVerse_MINITDom.tsv', # noqa } DATASET_MD5 = { 'MathVerse_MINI': '5017caca32b7fa110c350a1bea861b65', @@ -706,19 +706,19 @@ class Physics_yale(ImageBaseDataset): TYPE = 'VQA' DATASET_URL = { 'atomic_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/atomic_dataset.tsv', + 'https://opencompass.openxlab.space/utils/benchmarks/physics/atomic_dataset.tsv', 'electro_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/electro_dataset.tsv', + 'https://opencompass.openxlab.space/utils/benchmarks/physics/electro_dataset.tsv', 'mechanics_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/mechanics_dataset.tsv', + 'https://opencompass.openxlab.space/utils/benchmarks/physics/mechanics_dataset.tsv', 'optics_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/optics_dataset.tsv', + 'https://opencompass.openxlab.space/utils/benchmarks/physics/optics_dataset.tsv', 'quantum_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/quantum_dataset.tsv', + 'https://opencompass.openxlab.space/utils/benchmarks/physics/quantum_dataset.tsv', 'statistics_dataset': - 'http://opencompass.openxlab.space/utils/benchmarks/physics/statistics_dataset.tsv', - 'Physics_blankim': 'http://opencompass.openxlab.space/utils/benchmarks/physics/Physics_blankim.tsv', - 'Physics': 'http://opencompass.openxlab.space/utils/benchmarks/physics/Physics.tsv' + 'https://opencompass.openxlab.space/utils/benchmarks/physics/statistics_dataset.tsv', + 'Physics_blankim': 'https://opencompass.openxlab.space/utils/benchmarks/physics/Physics_blankim.tsv', + 'Physics': 'https://opencompass.openxlab.space/utils/benchmarks/physics/Physics.tsv' } DATASET_MD5 = { 'atomic_dataset': 'b927fae6bcc6163b0bd89041e4421c70', @@ -1637,7 +1637,7 @@ class MMVet(ImageBaseDataset): 'MMVet': 'https://opencompass.openxlab.space/utils/VLMEval/MMVet.tsv', 'MMVet_Hard': - 'http://opencompass.openxlab.space/utils/VLMEval/MMVet_Hard.tsv' + 'https://opencompass.openxlab.space/utils/VLMEval/MMVet_Hard.tsv' } DATASET_MD5 = { 'MMVet': '748aa6d4aa9d4de798306a63718455e3', diff --git a/vlmeval/dataset/mmlongbench.py b/vlmeval/dataset/mmlongbench.py index 2b5dd3619..db73089fd 100644 --- a/vlmeval/dataset/mmlongbench.py +++ b/vlmeval/dataset/mmlongbench.py @@ -194,7 +194,7 @@ def isfloat(num): def get_font(): try: - truetype_url = "http://opencompass.openxlab.space/utils/Fonts/SimHei.ttf" + truetype_url = "https://opencompass.openxlab.space/utils/Fonts/SimHei.ttf" ff = urlopen(truetype_url) font = ImageFont.truetype(ff, size=40) except Exception as e: diff --git a/vlmeval/dataset/spatial457.py b/vlmeval/dataset/spatial457.py index 15475f1c3..60d139d44 100644 --- a/vlmeval/dataset/spatial457.py +++ b/vlmeval/dataset/spatial457.py @@ -17,7 +17,7 @@ class Spatial457(ImageBaseDataset): ROBUST = True DATASET_URL = { - "Spatial457": "http://opencompass.openxlab.space/utils/VLMEval/Spatial457.tsv", + "Spatial457": "https://opencompass.openxlab.space/utils/VLMEval/Spatial457.tsv", } DATASET_MD5 = { diff --git a/vlmeval/inference.py b/vlmeval/inference.py index de3bd34c0..dd39550e1 100644 --- a/vlmeval/inference.py +++ b/vlmeval/inference.py @@ -50,7 +50,7 @@ def infer_data_api(model, work_dir, model_name, dataset, index_set=None, api_npr v11_pred = f'{work_dir}/{model_name}_{dataset_name}_V11.xlsx' if osp.exists(v11_pred): try: - reuse_inds = load('http://opencompass.openxlab.space/utils/mmb_reuse.pkl') + reuse_inds = load('https://opencompass.openxlab.space/utils/mmb_reuse.pkl') data = load(v11_pred) ans_map = {x: y for x, y in zip(data['index'], data['prediction']) if x in reuse_inds} dump(ans_map, out_file) diff --git a/vlmeval/vlm/xcomposer/xcomposer2d5.py b/vlmeval/vlm/xcomposer/xcomposer2d5.py index 4120a5edf..dab954846 100644 --- a/vlmeval/vlm/xcomposer/xcomposer2d5.py +++ b/vlmeval/vlm/xcomposer/xcomposer2d5.py @@ -16,7 +16,7 @@ def get_font(): try: - truetype_url = "http://opencompass.openxlab.space/utils/Fonts/SimHei.ttf" + truetype_url = "https://opencompass.openxlab.space/utils/Fonts/SimHei.ttf" ff = urlopen(truetype_url) font = ImageFont.truetype(ff, size=40) except Exception as e: