From a730065e7b9855c980bf50fa071f5f1100081f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E4=B9=94?= <83450930+Liyulingyue@users.noreply.github.com> Date: Thu, 25 Apr 2024 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90OCR=20Issue=20No.9=E3=80=91=E4=BB=A5?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=BD=A2=E5=BC=8F=E6=94=AF=E6=8C=81Visualdl?= =?UTF-8?q?=20(#11947)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * delete visual dl * totally delete visual * delete vdl file * fix codestyle --- benchmark/PaddleOCR_DBNet/requirement.txt | 3 ++- ppocr/utils/loggers/__init__.py | 1 - ppocr/utils/loggers/vdl_logger.py | 22 ---------------------- requirements.txt | 1 - tools/program.py | 11 ++++++----- 5 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 ppocr/utils/loggers/vdl_logger.py diff --git a/benchmark/PaddleOCR_DBNet/requirement.txt b/benchmark/PaddleOCR_DBNet/requirement.txt index 191819f32c..23240ac28a 100644 --- a/benchmark/PaddleOCR_DBNet/requirement.txt +++ b/benchmark/PaddleOCR_DBNet/requirement.txt @@ -10,4 +10,5 @@ PyYAML scikit-image Shapely tqdm -addict \ No newline at end of file +addict +visualdl diff --git a/ppocr/utils/loggers/__init__.py b/ppocr/utils/loggers/__init__.py index b1e92f734e..a73351fa64 100644 --- a/ppocr/utils/loggers/__init__.py +++ b/ppocr/utils/loggers/__init__.py @@ -1,3 +1,2 @@ -from .vdl_logger import VDLLogger from .wandb_logger import WandbLogger from .loggers import Loggers diff --git a/ppocr/utils/loggers/vdl_logger.py b/ppocr/utils/loggers/vdl_logger.py deleted file mode 100644 index d2851e67a2..0000000000 --- a/ppocr/utils/loggers/vdl_logger.py +++ /dev/null @@ -1,22 +0,0 @@ -from .base_logger import BaseLogger -from visualdl import LogWriter - - -class VDLLogger(BaseLogger): - def __init__(self, save_dir): - super().__init__(save_dir) - self.vdl_writer = LogWriter(logdir=save_dir) - - def log_metrics(self, metrics, prefix=None, step=None): - if not prefix: - prefix = "" - updated_metrics = {prefix + "/" + k: v for k, v in metrics.items()} - - for k, v in updated_metrics.items(): - self.vdl_writer.add_scalar(k, v, step) - - def log_model(self, is_best, prefix, metadata=None): - pass - - def close(self): - self.vdl_writer.close() diff --git a/requirements.txt b/requirements.txt index d4c95b889f..aee6d2e2df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ pyclipper lmdb tqdm numpy -visualdl rapidfuzz opencv-python<=4.6.0.66 opencv-contrib-python<=4.6.0.66 diff --git a/tools/program.py b/tools/program.py index 65e8c00cd7..d9aa068209 100755 --- a/tools/program.py +++ b/tools/program.py @@ -33,7 +33,7 @@ from ppocr.utils.save_load import save_model from ppocr.utils.utility import print_dict, AverageMeter from ppocr.utils.logging import get_logger -from ppocr.utils.loggers import VDLLogger, WandbLogger, Loggers +from ppocr.utils.loggers import WandbLogger, Loggers from ppocr.utils import profiler from ppocr.data import build_dataloader @@ -796,10 +796,11 @@ def preprocess(is_train=False): loggers = [] if "use_visualdl" in config["Global"] and config["Global"]["use_visualdl"]: - save_model_dir = config["Global"]["save_model_dir"] - vdl_writer_path = save_model_dir - log_writer = VDLLogger(vdl_writer_path) - loggers.append(log_writer) + logger.warning( + "You are using VisualDL, the VisualDL is deprecated and " + "removed in ppocr!" + ) + log_writer = None if ( "use_wandb" in config["Global"] and config["Global"]["use_wandb"] ) or "wandb" in config: