From 263710c9cb20bf3ba11d89a9fd79f08672b7a004 Mon Sep 17 00:00:00 2001 From: WeiXin Date: Thu, 29 Apr 2021 13:59:27 +0800 Subject: [PATCH] edit paddle.save/load API (#32532) (#32612) * edit paddle.save/load API * Update io.py edit doc * delete cpython-37.pyc * Update io.py edit doc * Update io.py recommit * Update io.py recommit * Update io.py recommit * Update io.py recommit --- python/paddle/framework/io.py | 8 ++++---- .../static_mode_white_list.cpython-37.pyc | Bin 20443 -> 0 bytes 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tools/__pycache__/static_mode_white_list.cpython-37.pyc diff --git a/python/paddle/framework/io.py b/python/paddle/framework/io.py index f84ed941e3..493574c5be 100644 --- a/python/paddle/framework/io.py +++ b/python/paddle/framework/io.py @@ -496,7 +496,7 @@ def save(obj, path, protocol=2, **configs): Save an object to the specified path. .. note:: - Now supports saving ``state_dict`` of Layer or Optimizer, Tensor. + Now supports saving ``state_dict`` of Layer/Optimizer, Layer, Tensor and nested structure containing Tensor. .. note:: Different from ``paddle.jit.save``, since the save result of ``paddle.save`` is a single file, @@ -560,7 +560,7 @@ def save(obj, path, protocol=2, **configs): prog = paddle.static.default_main_program() for var in prog.list_vars(): if list(var.shape) == [224, 10]: - tensor = var.get_tensor() + tensor = var.get_value() break # save/load tensor @@ -667,7 +667,7 @@ def load(path, **configs): Load an object can be used in paddle from specified path. .. note:: - Now supports load ``state_dict`` of Layer or Optimizer, Tensor. + Now supports loading ``state_dict`` of Layer/Optimizer, Layer, Tensor and nested structure containing Tensor. .. note:: In order to use the model parameters saved by paddle more efficiently, @@ -760,7 +760,7 @@ def load(path, **configs): prog = paddle.static.default_main_program() for var in prog.list_vars(): if list(var.shape) == [224, 10]: - tensor = var.get_tensor() + tensor = var.get_value() break # save/load tensor diff --git a/tools/__pycache__/static_mode_white_list.cpython-37.pyc b/tools/__pycache__/static_mode_white_list.cpython-37.pyc deleted file mode 100644 index b1e58ce7689c7db6cc0ce4ed18f87752b16d8beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20443 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 M_}gEn4mt3D0KTbuYybcN -- GitLab