From 4c62cc0b52124000b18f0b4f4ec1d4d2a4a952f9 Mon Sep 17 00:00:00 2001 From: will-jl944 Date: Mon, 13 Sep 2021 18:03:22 +0800 Subject: [PATCH] Revert "glog does not need to be ebabled explictly" --- paddlex/cv/models/classifier.py | 4 ++-- paddlex/cv/models/detector.py | 2 +- paddlex/deploy.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/paddlex/cv/models/classifier.py b/paddlex/cv/models/classifier.py index 83d1fa7095..58bff9f493 100644 --- a/paddlex/cv/models/classifier.py +++ b/paddlex/cv/models/classifier.py @@ -154,11 +154,11 @@ def default_optimizer(self, parameters, learning_rate, warmup_steps, if warmup_steps > lr_decay_epochs[0] * num_steps_each_epoch: logging.error( "In function train(), parameters should satisfy: " - "warmup_steps <= lr_decay_epochs[0]*num_samples_in_train_dataset.", + "warmup_steps <= lr_decay_epochs[0]*num_samples_in_train_dataset", exit=False) logging.error( "See this doc for more information: " - "https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md", + "https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md", exit=False) logging.error( "warmup_steps should less than {} or lr_decay_epochs[0] greater than {}, " diff --git a/paddlex/cv/models/detector.py b/paddlex/cv/models/detector.py index 4b7e73ecbe..38d9929654 100644 --- a/paddlex/cv/models/detector.py +++ b/paddlex/cv/models/detector.py @@ -127,7 +127,7 @@ def default_optimizer(self, parameters, learning_rate, warmup_steps, exit=False) logging.error( "See this doc for more information: " - "https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md", + "https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md", exit=False) scheduler = paddle.optimizer.lr.LinearWarmup( diff --git a/paddlex/deploy.py b/paddlex/deploy.py index 939f2d46df..1bcf5f4b4a 100644 --- a/paddlex/deploy.py +++ b/paddlex/deploy.py @@ -116,7 +116,9 @@ def create_predictor(self, ) pass - if not use_glog: + if use_glog: + config.enable_glog_info() + else: config.disable_glog_info() if memory_optimize: config.enable_memory_optim()