From 9086043090f80ee7695d043e84fbe8068b2f76e7 Mon Sep 17 00:00:00 2001
From: tangwei12 <tangwei12@baidu.com>
Date: Tue, 29 May 2018 20:52:01 +0800
Subject: [PATCH] bug fix and optimize

---
 python/paddle/fluid/io.py      | 1 -
 python/paddle/fluid/trainer.py | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/python/paddle/fluid/io.py b/python/paddle/fluid/io.py
index ed560304e25..2925e8eb289 100644
--- a/python/paddle/fluid/io.py
+++ b/python/paddle/fluid/io.py
@@ -529,7 +529,6 @@ def load_checkpoint(executor, checkpoint_dir, serial, main_program):
         raise ValueError("The values of 'main_program'should not be None")
 
     cur_dir = _get_serial_dir(checkpoint_dir, serial)
-    cur_dir = _get_model_dir(cur_dir)
     load_persist_vars_without_grad(executor, cur_dir, main_program)
 
 
diff --git a/python/paddle/fluid/trainer.py b/python/paddle/fluid/trainer.py
index 35bb8ded5d9..5ca93821e22 100644
--- a/python/paddle/fluid/trainer.py
+++ b/python/paddle/fluid/trainer.py
@@ -144,7 +144,7 @@ class Trainer(object):
             raise TypeError(
                 "The checkpoint_config shoule be an instance of CheckpointConfig"
             )
-        self.load_checkpoint_serial = io.need_load_checkpoint(
+        self.checkpoint._load_serial = io.need_load_checkpoint(
             self.checkpoint.checkpoint_dir)
 
         self.scope = core.Scope()
@@ -182,7 +182,7 @@ class Trainer(object):
                                self.startup_program)
 
             epoch_id, step_id = io.load_trainer_args(
-                self.checkpoint.checkpoint_dir, self.load_checkpoint_serial,
+                self.checkpoint.checkpoint_dir, self.checkpoint._load_serial,
                 self.trainer_id, ["epoch_id", "step_id"])
             self.checkpoint._epoch_id = int(epoch_id)
             self.checkpoint._step_id = int(step_id)
-- 
GitLab