From d75d24642120a6cad5df366f1a7ceeda1ebae22d Mon Sep 17 00:00:00 2001 From: Liufang Sang Date: Thu, 17 Oct 2019 16:33:13 +0800 Subject: [PATCH] update data layer test=release/1.6 (#3640) --- PaddleSlim/classification/distillation/compress.py | 4 ++-- PaddleSlim/classification/pruning/compress.py | 4 ++-- PaddleSlim/classification/quantization/compress.py | 4 ++-- PaddleSlim/compress.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PaddleSlim/classification/distillation/compress.py b/PaddleSlim/classification/distillation/compress.py index 3cb8f2bc..0d16aabc 100644 --- a/PaddleSlim/classification/distillation/compress.py +++ b/PaddleSlim/classification/distillation/compress.py @@ -44,8 +44,8 @@ def compress(args): assert args.model in model_list, "{} is not in lists: {}".format(args.model, model_list) - image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') - label = fluid.layers.data(name='label', shape=[1], dtype='int64') + image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32') + label = fluid.data(name='label', shape=[None, 1], dtype='int64') # model definition model = models.__dict__[args.model]() diff --git a/PaddleSlim/classification/pruning/compress.py b/PaddleSlim/classification/pruning/compress.py index 77f4f83a..f730440c 100644 --- a/PaddleSlim/classification/pruning/compress.py +++ b/PaddleSlim/classification/pruning/compress.py @@ -72,8 +72,8 @@ def compress(args): image_shape="3,224,224" image_shape = [int(m) for m in image_shape.split(",")] assert args.model in model_list, "{} is not in lists: {}".format(args.model, model_list) - image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') - label = fluid.layers.data(name='label', shape=[1], dtype='int64') + image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32') + label = fluid.data(name='label', shape=[None, 1], dtype='int64') # model definition model = models.__dict__[args.model]() out = model.net(input=image, class_dim=class_dim) diff --git a/PaddleSlim/classification/quantization/compress.py b/PaddleSlim/classification/quantization/compress.py index 41b76788..f972bad5 100644 --- a/PaddleSlim/classification/quantization/compress.py +++ b/PaddleSlim/classification/quantization/compress.py @@ -38,8 +38,8 @@ def compress(args): image_shape = "3,224,224" image_shape = [int(m) for m in image_shape.split(",")] - image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') - label = fluid.layers.data(name='label', shape=[1], dtype='int64') + image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32') + label = fluid.data(name='label', shape=[None, 1], dtype='int64') # model definition model = models.__dict__[args.model]() diff --git a/PaddleSlim/compress.py b/PaddleSlim/compress.py index 2f5c52c0..b5f0365e 100644 --- a/PaddleSlim/compress.py +++ b/PaddleSlim/compress.py @@ -43,8 +43,8 @@ def compress(args): assert args.model in model_list, "{} is not in lists: {}".format(args.model, model_list) - image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') - label = fluid.layers.data(name='label', shape=[1], dtype='int64') + image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32') + label = fluid.data(name='label', shape=[None, 1], dtype='int64') # model definition model = models.__dict__[args.model]() -- GitLab