From a8f7bba16d0bac55a784733e7e3c39ab40a10e73 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 12:26:57 -0800 Subject: [PATCH 1/7] Try to test for torch 1.13 + lightning 1.8 --- multimodal/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimodal/setup.py b/multimodal/setup.py index c7c0088a337..b0586e1fbb6 100644 --- a/multimodal/setup.py +++ b/multimodal/setup.py @@ -33,13 +33,13 @@ "evaluate<=0.3.0", "accelerate>=0.9,<0.14", "timm<0.7.0", - "torch>=1.9,<1.13", + "torch>=1.9,<1.14", "torchvision<0.14.0", "torchtext<0.14.0", "fairscale>=0.4.5,<=0.4.6", "scikit-image>=0.19.1,<0.20.0", "smart_open>=5.2.1,<5.3.0", - "pytorch_lightning>=1.7.4,<1.8.0", + "pytorch_lightning>=1.7.4,<1.9.0", "text-unidecode<=1.3", "torchmetrics>=0.8.0,<0.9.0", "transformers>=4.23.0,<4.24.0", From 727b7da246cf3db9fdc2c9c87fcc068b9f21f3c1 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 12:34:49 -0800 Subject: [PATCH 2/7] upgrade dependencies --- .github/workflow_scripts/env_setup.sh | 2 +- multimodal/setup.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflow_scripts/env_setup.sh b/.github/workflow_scripts/env_setup.sh index 64ce1021fb5..51409f1902a 100644 --- a/.github/workflow_scripts/env_setup.sh +++ b/.github/workflow_scripts/env_setup.sh @@ -21,7 +21,7 @@ function setup_mxnet_gpu { } function setup_torch_gpu { - python3 -m pip install torch==1.12.0+cu113 torchvision==0.13.0+cu113 --extra-index-url https://download.pytorch.org/whl/cu113 + python3 -m pip install torch==1.13.0+cu117 torchvision==0.14.0+cu117 --extra-index-url https://download.pytorch.org/whl/cu117 } function install_common { diff --git a/multimodal/setup.py b/multimodal/setup.py index b0586e1fbb6..541aa82033e 100644 --- a/multimodal/setup.py +++ b/multimodal/setup.py @@ -34,22 +34,22 @@ "accelerate>=0.9,<0.14", "timm<0.7.0", "torch>=1.9,<1.14", - "torchvision<0.14.0", - "torchtext<0.14.0", + "torchvision<0.15.0", + "torchtext<0.15.0", "fairscale>=0.4.5,<=0.4.6", "scikit-image>=0.19.1,<0.20.0", "smart_open>=5.2.1,<5.3.0", "pytorch_lightning>=1.7.4,<1.9.0", "text-unidecode<=1.3", - "torchmetrics>=0.8.0,<0.9.0", - "transformers>=4.23.0,<4.24.0", + "torchmetrics>=0.8.0,<0.11.0", + "transformers>=4.23.0,<4.25.0", "nptyping>=1.4.4,<1.5.0", "omegaconf>=2.1.1,<2.2.0", "sentencepiece>=0.1.95,<0.2.0", f"autogluon.core[raytune]=={version}", f"autogluon.features=={version}", f"autogluon.common=={version}", - "pytorch-metric-learning>=1.3.0,<1.4.0", + "pytorch-metric-learning>=1.3.0,<1.7.0", "nlpaug>=1.1.10,<=1.1.10", "nltk>=3.4.5,<4.0.0", "openmim>0.1.5,<=0.2.1", From 5d10b008f8eb9870b3e9e09fd3c1541fad05348b Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 13:01:43 -0800 Subject: [PATCH 3/7] Update setup.py --- multimodal/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/multimodal/setup.py b/multimodal/setup.py index 541aa82033e..ee6a0f36203 100644 --- a/multimodal/setup.py +++ b/multimodal/setup.py @@ -32,6 +32,7 @@ "seqeval<=1.2.2", "evaluate<=0.3.0", "accelerate>=0.9,<0.14", + "tensorboard<2.12.0", "timm<0.7.0", "torch>=1.9,<1.14", "torchvision<0.15.0", From ba961915563e9d935970f43dd280a4469d4aadd9 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 13:21:36 -0800 Subject: [PATCH 4/7] Update checkpoint.py --- multimodal/src/autogluon/multimodal/utils/checkpoint.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimodal/src/autogluon/multimodal/utils/checkpoint.py b/multimodal/src/autogluon/multimodal/utils/checkpoint.py index 14ec1dfee0a..74bda2995fc 100644 --- a/multimodal/src/autogluon/multimodal/utils/checkpoint.py +++ b/multimodal/src/autogluon/multimodal/utils/checkpoint.py @@ -2,6 +2,7 @@ import os import re import shutil +from pathlib import Path from typing import Any, Dict, List, Optional, Tuple, Union import pytorch_lightning as pl @@ -10,13 +11,19 @@ from pytorch_lightning.utilities.cloud_io import atomic_save, get_filesystem from pytorch_lightning.utilities.cloud_io import load as pl_load from pytorch_lightning.utilities.rank_zero import rank_zero_warn -from pytorch_lightning.utilities.types import _METRIC, _PATH +from torch import Tensor +from torchmetrics import Metric from ..constants import AUTOMM, DEEPSPEED_STRATEGY logger = logging.getLogger(AUTOMM) +_PATH = Union[str, Path] +_NUMBER = Union[int, float] +_METRIC = Union[Metric, Tensor, _NUMBER] + + def average_checkpoints( checkpoint_paths: List[str], ): From 526dea022b3528164b97ccc2eea53362284cddc4 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 13:22:38 -0800 Subject: [PATCH 5/7] fix warning --- multimodal/src/autogluon/multimodal/data/templates.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multimodal/src/autogluon/multimodal/data/templates.py b/multimodal/src/autogluon/multimodal/data/templates.py index df539d77d56..7e55716a916 100644 --- a/multimodal/src/autogluon/multimodal/data/templates.py +++ b/multimodal/src/autogluon/multimodal/data/templates.py @@ -640,7 +640,8 @@ def read_from_file(self) -> Dict: "Please ignore this warning if you are creating new prompts for this dataset." ) return {} - yaml_dict = yaml.safe_load(open(self.yaml_path, "r")) + with open(self.yaml_path, "r") as f: + yaml_dict = yaml.safe_load(f) return yaml_dict[self.TEMPLATES_KEY] def write_to_file(self) -> None: From 4f156fb76bda78cd73b65a9d675b1dc8931fb805 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Sat, 26 Nov 2022 14:28:13 -0800 Subject: [PATCH 6/7] Update predictor.py --- multimodal/src/autogluon/multimodal/predictor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimodal/src/autogluon/multimodal/predictor.py b/multimodal/src/autogluon/multimodal/predictor.py index 8d3cbe957b4..39402386c2f 100644 --- a/multimodal/src/autogluon/multimodal/predictor.py +++ b/multimodal/src/autogluon/multimodal/predictor.py @@ -892,8 +892,9 @@ def _hyperparameter_tune(self, hyperparameter_tune_kwargs, resources, **_fit_arg ) ray_tune_adapter = AutommRayTuneAdapter() - if try_import_ray_lightning(): - ray_tune_adapter = AutommRayTuneLightningAdapter() + # Do not use ray lightning. + # if try_import_ray_lightning(): + # ray_tune_adapter = AutommRayTuneLightningAdapter() search_space = _fit_args.get("hyperparameters", dict()) metric = "val_" + _fit_args.get("validation_metric_name") mode = _fit_args.get("minmax_mode") From 60f20fc1eb4ac93e0591f8c7fd27da6d10c97e59 Mon Sep 17 00:00:00 2001 From: Xingjian Shi Date: Tue, 20 Dec 2022 10:36:28 -0800 Subject: [PATCH 7/7] Update setup.py --- multimodal/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimodal/setup.py b/multimodal/setup.py index ee6a0f36203..84cd4a4370c 100644 --- a/multimodal/setup.py +++ b/multimodal/setup.py @@ -43,7 +43,7 @@ "pytorch_lightning>=1.7.4,<1.9.0", "text-unidecode<=1.3", "torchmetrics>=0.8.0,<0.11.0", - "transformers>=4.23.0,<4.25.0", + "transformers>=4.23.0,<4.26.0", "nptyping>=1.4.4,<1.5.0", "omegaconf>=2.1.1,<2.2.0", "sentencepiece>=0.1.95,<0.2.0",