diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/pointnet_lib.py b/PaddleCV/3d_vision/PointNet++/ext_op/pointnet_lib.py
index 5f607bf8775a6c0b20440f1635ae1c05b2ad8f07..cd4692d3ef7b9f4ef659ecf7e46764ae553f0dcf 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/pointnet_lib.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/pointnet_lib.py
@@ -53,8 +53,8 @@ def three_nn(input, known, eps=1e-10, name=None):
.. code-block:: python
import paddle.fluid as fluid
- x = fluid.layers.data(name='x', shape=[16, 3], dtype='float32')
- known = fluid.layers.data(name='known', shape=[32, 3], dtype='float32')
+ x = fluid.data(name='x', shape=[None, 16, 3], dtype='float32')
+ known = fluid.data(name='known', shape=[None, 32, 3], dtype='float32')
distance, idx = fluid.layers.three_nn(input, known)
"""
helper = LayerHelper('three_nn', **locals())
@@ -97,9 +97,9 @@ def three_interp(input, weight, idx, name=None):
.. code-block:: python
import paddle.fluid as fluid
- x = fluid.layers.data(name='x', shape=[16, 3], dtype='float32')
- weight = fluid.layers.data(name='weight', shape=[32, 3], dtype='float32')
- index = fluid.layers.data(name='index', shape=[32, 3], dtype='int32')
+ x = fluid.data(name='x', shape=[None, 16, 3], dtype='float32')
+ weight = fluid.data(name='weight', shape=[None, 32, 3], dtype='float32')
+ index = fluid.data(name='index', shape=[None, 32, 3], dtype='int32')
out = fluid.layers.three_interp(x, weight, index)
"""
helper = LayerHelper('three_interp', **locals())
@@ -132,8 +132,8 @@ def query_ball(input, new_points, radius, n_sample):
.. code-block::python
import paddle.fluid as fluid
- x = fluid.layers.data(name='points',shape=[-1,5,3],dtype='float32')
- new_points = fluid.layers.data(name='new_points', shape=[-1,2,3], dtype='float32')
+ x = fluid.data(name='points',shape=[None,5,3],dtype='float32')
+ new_points = fluid.data(name='new_points', shape=[None,2,3], dtype='float32')
output = fluid.layers.query_ball(x,new_points,radius=4.0,n_sample=5)
@@ -167,7 +167,7 @@ def farthest_point_sampling(input, sampled_point_num):
Examples:
.. code-block:: python
- x = fluid.layers.data(name='data', shape=(2,100,3), dtype='float32')
+ x = fluid.data(name='data', shape=(None ,100, 3), dtype='float32')
sampled_points = fluid.layers.farthest_point_sampling(
x, 50
)
@@ -210,8 +210,8 @@ def gather_point(input, index):
Examples:
.. code-block:: python
import paddle.fluid as fluid
- x = fluid.layers.data(name='x', shape=[-1, 5, 3], dtype='float32')
- index = fluid.layers.data(name='index', shape=[-1, 1], dtype='int32')
+ x = fluid.data(name='x', shape=[None, 5, 3], dtype='float32')
+ index = fluid.data(name='index', shape=[None, 1], dtype='int32')
output = fluid.layers.gather_point(x, index)
"""
@@ -249,8 +249,8 @@ def group_points(input, idx, name=None):
.. code-block:: python
import paddle.fluid as fluid
- x = fluid.layers.data(name='x', shape=[16, 3], dtype='float32')
- index = fluid.layers.data(name='index', shape=[32, 3], dtype='int32')
+ x = fluid.data(name='x', shape=[None, 16, 3], dtype='float32')
+ index = fluid.data(name='index', shape=[None, 32, 3], dtype='int32')
out = fluid.layers.group_points(x, index)
"""
helper = LayerHelper('group_points', **locals())
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_farthest_point_sampling_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_farthest_point_sampling_op.py
index 76df7c77f100070a75f253cfe9ac005663ecb3d7..5cae1ec35564b28131b34a849efe419707b93697 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_farthest_point_sampling_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_farthest_point_sampling_op.py
@@ -44,8 +44,8 @@ class TestFarthestPointSamplingOp(unittest.TestCase):
x_type = 'float32'
sampled_point_num = 256
- x = fluid.layers.data(
- name='x', shape=x_shape, dtype=x_type, append_batch_size=False)
+ x = fluid.data(
+ name='x', shape=x_shape, dtype=x_type)
y = pointnet_lib.farthest_point_sampling(x, sampled_point_num)
x_np = np.random.randint(1, 100, (x_shape[0] * x_shape[1] *
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_gather_point_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_gather_point_op.py
index ff01bc8ad70e1a20ff854b270fa4d4fc2c2f08e1..cc97a9e935c7a5a61ba7ab2aa874ea00d324a548 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_gather_point_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_gather_point_op.py
@@ -35,10 +35,10 @@ class TestGatherPointOp(unittest.TestCase):
idx_shape = (1, 32)
idx_type = 'int32'
- x = fluid.layers.data(
- name='x', shape=x_shape, dtype=x_type, append_batch_size=False)
- idx = fluid.layers.data(
- name='idx', shape=idx_shape, dtype=idx_type, append_batch_size=False)
+ x = fluid.data(
+ name='x', shape=x_shape, dtype=x_type)
+ idx = fluid.data(
+ name='idx', shape=idx_shape, dtype=idx_type)
y = pointnet_lib.gather_point(x, idx)
x_np = np.random.uniform(-10, 10, x_shape).astype(x_type)
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_group_points_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_group_points_op.py
index 8ab4fb7a9c5040bf2c8130d1bd211243038c046f..6af446bd03ea8f9c148d87062f55f1f9cbd0c5f3 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_group_points_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_group_points_op.py
@@ -39,10 +39,10 @@ class TestGroupPointsOp(unittest.TestCase):
idx_shape = [8, 37, 41]
idx_type = 'int32'
- x = fluid.layers.data(
- name='x', shape=x_shape, dtype=x_type, append_batch_size=False)
- idx = fluid.layers.data(
- name='idx', shape=idx_shape, dtype=idx_type, append_batch_size=False)
+ x = fluid.data(
+ name='x', shape=x_shape, dtype=x_type)
+ idx = fluid.data(
+ name='idx', shape=idx_shape, dtype=idx_type)
y = pointnet_lib.group_points(x, idx)
x_np = np.random.uniform(-10, 10, x_shape).astype(x_type)
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_query_ball_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_query_ball_op.py
index ab3ea1821f388108edf753420e90d37c8abfcbc0..a20068478677f7c9e25fbd1da7b10c5ba792f39d 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_query_ball_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_query_ball_op.py
@@ -48,10 +48,10 @@ class TestQueryBallOp(unittest.TestCase):
radius = 6
nsample = 5
- points = fluid.layers.data(
- name='points', shape=points_shape, dtype=points_type, append_batch_size=False)
- new_points = fluid.layers.data(
- name='new_points', shape=new_points_shape, dtype=points_type, append_batch_size=False)
+ points = fluid.data(
+ name='points', shape=points_shape, dtype=points_type)
+ new_points = fluid.data(
+ name='new_points', shape=new_points_shape, dtype=points_type)
y = pointnet_lib.query_ball(points, new_points, radius, nsample)
points_np = np.random.randint(1, 5, points_shape).astype(points_type)
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_interp_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_interp_op.py
index e73fbad756ac5e5d3703f8354e2b0641b7cc9383..0264838fd7677b4b31958a7bfd8e2e07d0349903 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_interp_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_interp_op.py
@@ -42,12 +42,12 @@ class TestThreeInterpOp(unittest.TestCase):
weight_shape = [8, 37, 3]
weight_type = 'float32'
- x = fluid.layers.data(
- name='x', shape=input_shape, dtype=input_type, append_batch_size=False)
- weight = fluid.layers.data(
- name='weight', shape=weight_shape, dtype=weight_type, append_batch_size=False)
- idx = fluid.layers.data(
- name='idx', shape=weight_shape, dtype="int32", append_batch_size=False)
+ x = fluid.data(
+ name='x', shape=input_shape, dtype=input_type)
+ weight = fluid.data(
+ name='weight', shape=weight_shape, dtype=weight_type)
+ idx = fluid.data(
+ name='idx', shape=weight_shape, dtype="int32")
y = pointnet_lib.three_interp(x, weight, idx)
x_np = np.random.random(input_shape).astype(input_type)
diff --git a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_nn_op.py b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_nn_op.py
index c6468e8b8cf881e3bbd1a16b1f8a6896fce07333..d37a3257a2fc0ad8567400332a142a8981d0d5e3 100644
--- a/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_nn_op.py
+++ b/PaddleCV/3d_vision/PointNet++/ext_op/tests/test_three_nn_op.py
@@ -57,10 +57,10 @@ class TestThreeNNOp(unittest.TestCase):
input_type = 'float32'
eps = 1e-10
- x = fluid.layers.data(
- name='x', shape=input_shape, dtype=input_type, append_batch_size=False)
- known = fluid.layers.data(
- name='known', shape=known_shape, dtype=input_type, append_batch_size=False)
+ x = fluid.data(
+ name='x', shape=input_shape, dtype=input_type)
+ known = fluid.data(
+ name='known', shape=known_shape, dtype=input_type)
dist, idx = pointnet_lib.three_nn(x, known, eps)
x_np = np.random.random(input_shape).astype(input_type)
diff --git a/PaddleCV/3d_vision/PointRCNN/utils/proposal_utils.py b/PaddleCV/3d_vision/PointRCNN/utils/proposal_utils.py
index 9160ffe8e4e4a1aff7f8e8984e5ddd3711d1ffb0..16a3c2df4d1963bc6dd3e86b105df76067e98f13 100644
--- a/PaddleCV/3d_vision/PointRCNN/utils/proposal_utils.py
+++ b/PaddleCV/3d_vision/PointRCNN/utils/proposal_utils.py
@@ -257,7 +257,7 @@ if __name__ == "__main__":
# cfg.RPN.NMS_TYPE = 'rotate'
proposal_func = get_proposal_func(cfg)
- x = fluid.layers.data(name="x", shape=[256, 84], dtype='float32')
+ x = fluid.data(name="x", shape=[None, 256, 84], dtype='float32')
proposal = fluid.default_main_program().current_block().create_var(
name="proposal", dtype='float32', shape=[256, 7])
fluid.layers.py_func(proposal_func, x, proposal)
diff --git a/PaddleCV/gan/c_gan/c_gan.py b/PaddleCV/gan/c_gan/c_gan.py
index 53a79e3b2d05991bc44a88272ecbd5c3a2b20c43..4ab1d59a9b48656716eb635af5552da6b4661225 100644
--- a/PaddleCV/gan/c_gan/c_gan.py
+++ b/PaddleCV/gan/c_gan/c_gan.py
@@ -61,18 +61,18 @@ def train(args):
dg_program = fluid.Program()
with fluid.program_guard(d_program):
- conditions = fluid.layers.data(
- name='conditions', shape=[1], dtype='float32')
- img = fluid.layers.data(name='img', shape=[784], dtype='float32')
- label = fluid.layers.data(name='label', shape=[1], dtype='float32')
+ conditions = fluid.data(
+ name='conditions', shape=[None, 1], dtype='float32')
+ img = fluid.data(name='img', shape=[None, 784], dtype='float32')
+ label = fluid.data(name='label', shape=[None, 1], dtype='float32')
d_logit = D_cond(img, conditions)
d_loss = loss(d_logit, label)
with fluid.program_guard(dg_program):
- conditions = fluid.layers.data(
- name='conditions', shape=[1], dtype='float32')
- noise = fluid.layers.data(
- name='noise', shape=[NOISE_SIZE], dtype='float32')
+ conditions = fluid.data(
+ name='conditions', shape=[None, 1], dtype='float32')
+ noise = fluid.data(
+ name='noise', shape=[None, NOISE_SIZE], dtype='float32')
g_img = G_cond(z=noise, y=conditions)
g_program = dg_program.clone()
diff --git a/PaddleCV/gan/c_gan/dc_gan.py b/PaddleCV/gan/c_gan/dc_gan.py
index 9ad42d4fe0b0a49c23af0d658962e2dadaa30aab..11520d48f2cd0b945e74bce61061724315d5647f 100644
--- a/PaddleCV/gan/c_gan/dc_gan.py
+++ b/PaddleCV/gan/c_gan/dc_gan.py
@@ -60,14 +60,14 @@ def train(args):
dg_program = fluid.Program()
with fluid.program_guard(d_program):
- img = fluid.layers.data(name='img', shape=[784], dtype='float32')
- label = fluid.layers.data(name='label', shape=[1], dtype='float32')
+ img = fluid.data(name='img', shape=[None, 784], dtype='float32')
+ label = fluid.data(name='label', shape=[None, 1], dtype='float32')
d_logit = D(img)
d_loss = loss(d_logit, label)
with fluid.program_guard(dg_program):
- noise = fluid.layers.data(
- name='noise', shape=[NOISE_SIZE], dtype='float32')
+ noise = fluid.data(
+ name='noise', shape=[None, NOISE_SIZE], dtype='float32')
g_img = G(x=noise)
g_program = dg_program.clone()
diff --git a/PaddleCV/gan/network/base_network.py b/PaddleCV/gan/network/base_network.py
index 2aba0eb737190c5f968ad429da3a58442a0106aa..f856401e5594f45b69e4b85054ab27dd8d85cc83 100644
--- a/PaddleCV/gan/network/base_network.py
+++ b/PaddleCV/gan/network/base_network.py
@@ -508,9 +508,9 @@ def conv2d_with_filter(input,
groups mismatch.
Examples:
.. code-block:: python
- data = fluid.layers.data(name='data', shape=[3, 32, 32], \
+ data = fluid.data(name='data', shape=[None, 3, 32, 32], \
dtype='float32')
- filter = fluid.layers.data(name='filter',shape=[10,3,3,3], \
+ filter = fluid.data(name='filter',shape=[None, 10, 3, 3, 3], \
dtype='float32',append_batch_size=False)
conv2d = fluid.layers.conv2d(input=data,
filter=filter,
diff --git a/PaddleCV/metric_learning/eval.py b/PaddleCV/metric_learning/eval.py
index a11e6bc19c5bae54d8a761b70e3bce7109c1fa6a..dd4aef51cff4035c51b05124156d3f1e2b74dc74 100644
--- a/PaddleCV/metric_learning/eval.py
+++ b/PaddleCV/metric_learning/eval.py
@@ -52,8 +52,9 @@ def eval(args):
assert model_name in model_list, "{} is not in lists: {}".format(args.model,
model_list)
- image = fluid.layers.data(name='image', shape=[None] + image_shape, dtype='float32')
- label = fluid.layers.data(name='label', shape=[None, 1], dtype='int64')
+ image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32')
+ label = fluid.data(name='label', shape=[None, 1], dtype='int64')
+
test_loader = fluid.io.DataLoader.from_generator(
feed_list=[image, label],
capacity=64,
@@ -75,7 +76,7 @@ def eval(args):
def if_exist(var):
return os.path.exists(os.path.join(pretrained_model, var.name))
- fluid.io.load_vars(exe, pretrained_model, predicate=if_exist)
+ fluid.load(program=test_program, model_path=pretrained_model, executor=exe)
test_loader.set_sample_generator(
reader.test(args),
diff --git a/PaddleCV/metric_learning/infer.py b/PaddleCV/metric_learning/infer.py
index 4710cfc89ff4b02fab1c31d2c7d7e13c0549cb2a..fa419435d2f80db182df866b13aceaf7147963e6 100644
--- a/PaddleCV/metric_learning/infer.py
+++ b/PaddleCV/metric_learning/infer.py
@@ -51,7 +51,7 @@ def infer(args):
assert model_name in model_list, "{} is not in lists: {}".format(args.model,
model_list)
- image = fluid.layers.data(name='image', shape=[None] + image_shape, dtype='float32')
+ image = fluid.data(name='image', shape=[None] + image_shape, dtype='float32')
infer_loader = fluid.io.DataLoader.from_generator(
feed_list=[image],
@@ -74,7 +74,7 @@ def infer(args):
def if_exist(var):
return os.path.exists(os.path.join(pretrained_model, var.name))
- fluid.io.load_vars(exe, pretrained_model, predicate=if_exist)
+ fluid.load(model_path=pretrained_model, program=test_program, executor=exe)
infer_loader.set_sample_generator(
reader.test(args),
diff --git a/PaddleCV/metric_learning/train_elem.py b/PaddleCV/metric_learning/train_elem.py
index a06a349012e049b3b7eceb1f1aabd32bcaca8224..6d13be5283640413c6c140b9be864e428b5033d6 100644
--- a/PaddleCV/metric_learning/train_elem.py
+++ b/PaddleCV/metric_learning/train_elem.py
@@ -108,9 +108,9 @@ def build_program(is_train, main_prog, startup_prog, args):
model = models.__dict__[args.model]()
with fluid.program_guard(main_prog, startup_prog):
queue_capacity = 64
- image = fluid.layers.data(
+ image = fluid.data(
name='image', shape=[None] + image_shape, dtype='float32')
- label = fluid.layers.data(
+ label = fluid.data(
name='label', shape=[None, 1], dtype='int64')
loader = fluid.io.DataLoader.from_generator(
feed_list=[image, label],
@@ -190,15 +190,14 @@ def train_async(args):
logging.debug('after run startup program')
if checkpoint is not None:
- fluid.io.load_persistables(exe, checkpoint, main_program=train_prog)
+ fluid.load(program=train_prog, model_path=checkpoint, executor=exe)
if pretrained_model:
def if_exist(var):
return os.path.exists(os.path.join(pretrained_model, var.name))
- fluid.io.load_vars(
- exe, pretrained_model, main_program=train_prog, predicate=if_exist)
+ fluid.load(program=train_prog, model_path=pretrained_model, executor=exe)
if args.use_gpu:
devicenum = get_gpu_num()
@@ -287,7 +286,7 @@ def train_async(args):
str(iter_no))
if not os.path.isdir(model_path):
os.makedirs(model_path)
- fluid.io.save_persistables(exe, model_path, main_program=train_prog)
+ fluid.save(program=train_prog, model_path=model_path)
iter_no += 1
diff --git a/PaddleCV/metric_learning/train_pair.py b/PaddleCV/metric_learning/train_pair.py
index 9bc2b5becde3d540b577f3170df273756e9e2293..aa31f8944cfb79ef91c3d9d48bc0c8b6c7567d58 100644
--- a/PaddleCV/metric_learning/train_pair.py
+++ b/PaddleCV/metric_learning/train_pair.py
@@ -115,9 +115,9 @@ def build_program(is_train, main_prog, startup_prog, args):
model = models.__dict__[args.model]()
with fluid.program_guard(main_prog, startup_prog):
queue_capacity = 64
- image = fluid.layers.data(
+ image = fluid.data(
name='image', shape=[None] + image_shape, dtype='float32')
- label = fluid.layers.data(
+ label = fluid.data(
name='label', shape=[None, 1], dtype='int64')
loader = fluid.io.DataLoader.from_generator(
feed_list=[image, label],
@@ -188,15 +188,15 @@ def train_async(args):
logging.debug('after run startup program')
if checkpoint is not None:
- fluid.io.load_persistables(exe, checkpoint, main_program=train_prog)
+ fluid.load(program=train_prog, model_path=checkpoint, executor=exe)
if pretrained_model:
def if_exist(var):
return os.path.exists(os.path.join(pretrained_model, var.name))
- fluid.io.load_vars(
- exe, pretrained_model, main_program=train_prog, predicate=if_exist)
+ fluid.load(program=train_prog, model_path=pretrained_model, executor=exe)
+
if args.use_gpu:
devicenum = get_gpu_num()
@@ -283,7 +283,7 @@ def train_async(args):
str(iter_no))
if not os.path.isdir(model_path):
os.makedirs(model_path)
- fluid.io.save_persistables(exe, model_path, main_program=train_prog)
+ fluid.save(program=train_prog, model_path=model_path)
iter_no += 1
diff --git a/PaddleCV/ocr_recognition/README.md b/PaddleCV/ocr_recognition/README.md
index 70c5fae52c2a823b4e977bccdaf382cc75fcf0f5..7bb6519072dc228feb55ea422a4e51054c7cfe6b 100644
--- a/PaddleCV/ocr_recognition/README.md
+++ b/PaddleCV/ocr_recognition/README.md
@@ -1,4 +1,8 @@
+## 注意
+注意:该OCR库已迁移至新的github地址:https://github.com/PaddlePaddle/PaddleOCR
+该新库包含总模型仅8.6M的超轻量级中文OCR,单模型支持中英文数字组合识别、竖排文本识别、长文本识别。同时支持多种文本检测、文本识别的训练算法。欢迎大家去新的代码仓库中,查看与阅读更多关于OCR的详细介绍以及新功能。
+
## 代码结构
```
├── data_reader.py # 下载、读取、处理数据。
diff --git a/PaddleCV/tracking/pytracking/libs/Fconv2d.py b/PaddleCV/tracking/pytracking/libs/Fconv2d.py
index 6d926b53934ac4b5b91f1d3859f00afffde8d7a2..22552e25589ce75a137c3a08f7f58d05d3c482cf 100644
--- a/PaddleCV/tracking/pytracking/libs/Fconv2d.py
+++ b/PaddleCV/tracking/pytracking/libs/Fconv2d.py
@@ -72,10 +72,10 @@ def Fconv2d(
groups mismatch.
Examples:
.. code-block:: python
- data = fluid.layers.data(name='data', shape=[3, 32, 32], \
+ data = fluid.data(name='data', shape=[None, 3, 32, 32], \
dtype='float32')
- filter = fluid.layers.data(name='filter',shape=[10,3,3,3], \
- dtype='float32',append_batch_size=False)
+ filter = fluid.data(name='filter',shape=[10,3,3,3], \
+ dtype='float32')
conv2d = fluid.layers.conv2d(input=data,
filter=filter,
act="relu")
diff --git a/PaddleCV/tracking/pytracking/libs/Fconv2d_static.py b/PaddleCV/tracking/pytracking/libs/Fconv2d_static.py
index d62edb7083d67559c7c6c0304be976a163a00117..ba6368739a4ac3ca163bdcabbab7d13fd5808b06 100644
--- a/PaddleCV/tracking/pytracking/libs/Fconv2d_static.py
+++ b/PaddleCV/tracking/pytracking/libs/Fconv2d_static.py
@@ -60,9 +60,9 @@ def Fconv2d(input,
groups mismatch.
Examples:
.. code-block:: python
- data = fluid.layers.data(name='data', shape=[3, 32, 32], \
+ data = fluid.data(name='data', shape=[3, 32, 32], \
dtype='float32')
- filter = fluid.layers.data(name='filter',shape=[10,3,3,3], \
+ filter = fluid.data(name='filter',shape=[10,3,3,3], \
dtype='float32',append_batch_size=False)
conv2d = fluid.layers.conv2d(input=data,
filter=filter,
@@ -112,62 +112,4 @@ def Fconv2d(input,
return pre_bias
-def test_conv2d_with_filter():
- exemplar = np.random.random((8, 4, 6, 6)).astype(np.float32)
- instance = np.random.random((8, 4, 22, 22)).astype(np.float32)
- # fluid.layers.data(append_batch_size=)
- use_gpu = False
- place = fluid.CUDAPlace(0) if use_gpu else fluid.CPUPlace()
-
- train_program = fluid.Program()
- start_program = fluid.Program()
-
- with fluid.program_guard(train_program, start_program):
- x = fluid.layers.data(
- name="inst", shape=[8, 4, 22, 22], append_batch_size=False)
- y = fluid.layers.data(
- name="exem", shape=[8, 4, 6, 6], append_batch_size=False)
- bias_att = fluid.ParamAttr(
- name="bias_", initializer=fluid.initializer.ConstantInitializer(1.))
- out = conv2d_with_filter(x, y, groups=1)
- weight_att = fluid.ParamAttr(
- name='weight',
- initializer=fluid.initializer.NumpyArrayInitializer(exemplar))
- bias_att = fluid.ParamAttr(
- name="bias", initializer=fluid.initializer.ConstantInitializer(0.))
- res = fluid.layers.conv2d(
- x,
- 8,
- 6,
- param_attr=weight_att,
- bias_attr=bias_att,
- stride=1,
- padding=0,
- dilation=1)
-
- exe = fluid.Executor(place)
- exe.run(program=fluid.default_startup_program())
- print(out.shape)
-
- compiled_prog = fluid.compiler.CompiledProgram(train_program)
- out, res = exe.run(compiled_prog,
- feed={"inst": instance,
- "exem": exemplar},
- fetch_list=[out.name, res.name])
-
- print(np.sum(out - res))
- np.testing.assert_allclose(out, res, rtol=1e-5, atol=0)
-
- with fluid.dygraph.guard():
- exem = fluid.dygraph.to_variable(exemplar)
- inst = fluid.dygraph.to_variable(instance)
-
- out = conv2d_with_filter(inst, exem, groups=1)
-
- print(np.sum(out.numpy() - res))
- np.testing.assert_allclose(out.numpy(), res, rtol=1e-5, atol=0)
-
-
-if __name__ == '__main__':
- test_conv2d_with_filter()
diff --git a/PaddleCV/tracking/pytracking/libs/optimization.py b/PaddleCV/tracking/pytracking/libs/optimization.py
index 41236ad8c9f26451903020da77a5b3910345cd62..3965fcfa2725338c8724f948221b098f9061ca69 100644
--- a/PaddleCV/tracking/pytracking/libs/optimization.py
+++ b/PaddleCV/tracking/pytracking/libs/optimization.py
@@ -3,7 +3,7 @@ from paddle.fluid import layers
from paddle import fluid
from pytracking.libs.tensorlist import TensorList
from pytracking.utils.plotting import plot_graph
-from pytracking.libs.paddle_utils import n2p, clone, static_clone
+from pytracking.libs.paddle_utils import n2p, clone, static_clone, create_var_list
class L2Problem:
@@ -243,20 +243,9 @@ class ConjugateGradient(ConjugateGradientBase):
start_program = fluid.Program()
with fluid.program_guard(train_program, start_program):
scope = 'first/'
- self.x_ph = TensorList([
- fluid.layers.data(
- '{}x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
- self.p_ph = TensorList([
- fluid.layers.data(
- '{}p_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
+ self.x_ph = TensorList(create_var_list(scope+"x", self.x, None))
+
+ self.p_ph = TensorList(create_var_list(scope+"p", self.x, None))
# problem forward
self.f0 = self.problem(self.x_ph, scope)
@@ -277,20 +266,10 @@ class ConjugateGradient(ConjugateGradientBase):
start_program2 = fluid.Program()
with fluid.program_guard(train_program2, start_program2):
scope = 'second/'
- self.x_ph_2 = TensorList([
- fluid.layers.data(
- '{}x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
- self.dfdx_x_ph = TensorList([
- fluid.layers.data(
- '{}dfdx_x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.g)
- ])
+
+ self.x_ph_2 = TensorList(create_var_list(scope+"x", self.x, None))
+
+ self.dfdx_x_ph = TensorList(create_var_list(scope+"dfdx_x", self.g, None))
self.f0_2 = self.problem(self.x_ph_2, scope)
self.dfdx_dfdx = TensorList(
@@ -444,20 +423,9 @@ class GaussNewtonCG(ConjugateGradientBase):
start_program = fluid.Program()
with fluid.program_guard(train_program, start_program):
scope = 'first/'
- self.x_ph = TensorList([
- fluid.layers.data(
- '{}x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
- self.p_ph = TensorList([
- fluid.layers.data(
- '{}p_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
+ self.x_ph = TensorList(create_var_list(scope+"x", self.x, None))
+
+ self.p_ph = TensorList(create_var_list(scope+"p", self.x, None))
# problem forward
self.f0 = self.problem(self.x_ph, scope)
@@ -477,20 +445,9 @@ class GaussNewtonCG(ConjugateGradientBase):
start_program2 = fluid.Program()
with fluid.program_guard(train_program2, start_program2):
scope = 'second/'
- self.x_ph_2 = TensorList([
- fluid.layers.data(
- '{}x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
- self.dfdx_x_ph = TensorList([
- fluid.layers.data(
- '{}dfdx_x_{}'.format(scope, idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.g)
- ])
+ self.x_ph_2 = TensorList(create_var_list(scope+"x", self.x, None))
+
+ self.dfdx_x_ph = TensorList(create_var_list(scope+"dfdx_x", self.g, None))
self.f0_2 = self.problem(self.x_ph_2, scope)
self.dfdx_dfdx = TensorList(
@@ -654,13 +611,7 @@ class GradientDescentL2:
train_program = fluid.Program()
start_program = fluid.Program()
with fluid.program_guard(train_program, start_program):
- self.x_ph = TensorList([
- fluid.layers.data(
- 'x_{}'.format(idx),
- v.shape,
- append_batch_size=False,
- stop_gradient=False) for idx, v in enumerate(self.x)
- ])
+ self.x_ph = TensorList(create_var_list("x", self.x, None))
# problem forward
self.f0 = self.problem(self.x_ph)
diff --git a/PaddleCV/tracking/pytracking/libs/paddle_utils.py b/PaddleCV/tracking/pytracking/libs/paddle_utils.py
index 79cf8b7d8ffc6f3975dee8378328891d10eca5ed..f23a71a8050fe4915264a6e7b88b6036d010a7a6 100644
--- a/PaddleCV/tracking/pytracking/libs/paddle_utils.py
+++ b/PaddleCV/tracking/pytracking/libs/paddle_utils.py
@@ -1,5 +1,6 @@
import numpy as np
import paddle
+import paddle.fluid as fluid
from paddle.fluid import dygraph
from paddle.fluid import layers
from paddle.fluid.framework import Variable
@@ -216,3 +217,17 @@ def dropout2d(input, prob, is_train=False):
binary_tensor = layers.floor(random_tensor)
output = input / keep_prob * binary_tensor
return output
+
+
+def create_var_list(scope, var_lists, shape):
+ vars = []
+ for idx, v in enumerate(var_lists):
+ name = "{}_{}".format(scope, idx)
+ if shape is None:
+ var = fluid.data(name, shape=v.shape)
+ else:
+ var = fluid.data(name, shape=shape + list(v[0].shape))
+ var.stop_gradient = False
+ vars.append(var)
+ return vars
+
diff --git a/PaddleCV/tracking/pytracking/tracker/atom/optim.py b/PaddleCV/tracking/pytracking/tracker/atom/optim.py
index 8c25c43d6123187baf9ffbffef5b75f2e016a4dc..ae0c4f29659b581d53fe5cdfe14c723df8108158 100644
--- a/PaddleCV/tracking/pytracking/tracker/atom/optim.py
+++ b/PaddleCV/tracking/pytracking/tracker/atom/optim.py
@@ -5,6 +5,7 @@ from paddle import fluid
from pytracking.libs import optimization, TensorList, operation
from pytracking.libs.paddle_utils import PTensor, broadcast_op, n2p, static_identity
import math
+from pytracking.libs.paddle_utils import create_var_list
def stack_input(e):
@@ -50,29 +51,18 @@ class FactorizedConvProblem(optimization.L2Problem):
def get_inputs(self, scope=''):
if scope not in self.inputs_dict:
- training_samples_p = TensorList([
- fluid.layers.data(
- '{}training_samples_{}'.format(scope, idx),
- shape=[None] + list(v[0].shape),
- stop_gradient=False,
- append_batch_size=False)
- for idx, v in enumerate(self.training_samples)
- ])
- y_p = TensorList([
- fluid.layers.data(
- '{}y_{}'.format(scope, idx),
- shape=[None] + list(v[0].shape),
- stop_gradient=False,
- append_batch_size=False) for idx, v in enumerate(self.y)
- ])
- sample_weights_p = TensorList([
- fluid.layers.data(
- '{}sample_weights_{}'.format(scope, idx),
- shape=[None, 1],
- stop_gradient=False,
- append_batch_size=False)
- for idx, v in enumerate(self.sample_weights)
- ])
+ name = scope + "training_samples"
+ vars = create_var_list(name, self.sample_weights, [None])
+ training_samples_p = TensorList(vars)
+
+ name = scope + "y"
+ vars = create_var_list(name, self.y, [None])
+ y_p = TensorList(vars)
+
+ name = scope + "sample_weights"
+ vars = create_var_list(name, self.sample_weights, [None, 1])
+ sample_weights_p = TensorList(vars)
+
self.inputs_dict[scope] = (training_samples_p, y_p,
sample_weights_p)
@@ -189,29 +179,18 @@ class ConvProblem(optimization.L2Problem):
def get_inputs(self, scope=''):
if scope not in self.inputs_dict:
- training_samples_p = TensorList([
- fluid.layers.data(
- '{}training_samples_{}'.format(scope, idx),
- shape=[None] + list(v[0].shape),
- stop_gradient=False,
- append_batch_size=False)
- for idx, v in enumerate(self.training_samples)
- ])
- y_p = TensorList([
- fluid.layers.data(
- '{}y_{}'.format(scope, idx),
- shape=[None] + list(v[0].shape),
- stop_gradient=False,
- append_batch_size=False) for idx, v in enumerate(self.y)
- ])
- sample_weights_p = TensorList([
- fluid.layers.data(
- '{}sample_weights_{}'.format(scope, idx),
- shape=[None] + list(v[0].shape),
- stop_gradient=False,
- append_batch_size=False)
- for idx, v in enumerate(self.sample_weights)
- ])
+ name = scope + "training_samples"
+ vars = create_var_list(name, self.training_samples, [None])
+ training_samples_p = TensorList(vars)
+
+ name = scope + "y"
+ vars = create_var_list(name, self.y, [None])
+ y_p = TensorList(vars)
+
+ name = scope + "sample_weights"
+ vars = create_var_list(name, self.sample_weights, [None])
+ sample_weights_p = TensorList(vars)
+
self.inputs_dict[scope] = (training_samples_p, y_p,
sample_weights_p)
diff --git a/PaddleCV/video/README.md b/PaddleCV/video/README.md
index e7d1785241d5f93d5302b074b99ec2e65e227e26..abeadebb3ad71797f53c1ccaffc38592d114e362 100644
--- a/PaddleCV/video/README.md
+++ b/PaddleCV/video/README.md
@@ -25,6 +25,13 @@
- 提供了适合视频分类和动作定位任务的通用骨架代码,用户可一键式高效配置模型完成训练和评测。
+### 推荐用法
+
+- 视频分类共开源7个模型,可分为:端到端模型、序列模型。端到端模型:TSN推荐在时序不敏感视频场景(比如互联网视频场景)使用;TSM、StNet推荐在时序敏感视频场景(比如Kinetics数据集)使用;Non-local模型计算量较大,在科研场景推荐。序列模型:Attention LSTM,Attention Cluster和NeXtVLAD 整体性能接近,但是网络结构不同,推荐集成多个模型使用。
+
+- 视频动作定位共开源3个模型,视频动作定位推荐使用CTCN模型,时序提名生成推荐使用BMN模型。
+
+
## 安装
在当前模型库运行样例代码需要PaddlePaddle Fluid v.1.6.0或以上的版本。如果你的运行环境中的PaddlePaddle低于此版本,请根据[安装文档](http://www.paddlepaddle.org/documentation/docs/zh/1.6/beginners_guide/install/index_cn.html)中的说明来更新PaddlePaddle。
diff --git a/PaddleCV/video/metrics/youtube8m/eval_util.py b/PaddleCV/video/metrics/youtube8m/eval_util.py
index f7742236f1176073eae84fdc7c3a3a1a2e294fe0..67bc2e54d14df350ab659ebaedeec9dd9dd176bc 100644
--- a/PaddleCV/video/metrics/youtube8m/eval_util.py
+++ b/PaddleCV/video/metrics/youtube8m/eval_util.py
@@ -37,7 +37,7 @@ def calculate_hit_at_one(predictions, actuals):
float: The average hit at one across the entire batch.
"""
top_prediction = numpy.argmax(predictions, 1)
- hits = actuals[numpy.arange(actuals.shape[0]), top_prediction]
+ hits = actuals[:, top_prediction]
return numpy.average(hits)
diff --git a/PaddleCV/video/models/attention_cluster/shifting_attention.py b/PaddleCV/video/models/attention_cluster/shifting_attention.py
index e27ad8dd58b882eb96fbb9763eecccc36ddfe28a..e39dddee8e663c35386c017c3937df4da2e2b136 100644
--- a/PaddleCV/video/models/attention_cluster/shifting_attention.py
+++ b/PaddleCV/video/models/attention_cluster/shifting_attention.py
@@ -32,8 +32,7 @@ class ShiftingAttentionModel(object):
x_shape.stop_gradient = True
flat_x = fluid.layers.reshape(x, shape=(-1, self.seg_num))
flat_softmax = fluid.layers.softmax(flat_x)
- return fluid.layers.reshape(
- flat_softmax, shape=x.shape, actual_shape=x_shape)
+ return fluid.layers.reshape(flat_softmax, shape=x_shape)
def glorot(self, n):
return np.sqrt(1.0 / np.sqrt(n))
diff --git a/PaddleCV/video/reader/bmn_reader.py b/PaddleCV/video/reader/bmn_reader.py
index 7a3bc944253d54f473d5efec43ae5a0771392741..eb5c0b2ef91b67e4e6c438ee08e80f2c3ca95805 100644
--- a/PaddleCV/video/reader/bmn_reader.py
+++ b/PaddleCV/video/reader/bmn_reader.py
@@ -21,6 +21,7 @@ import json
import logging
import functools
import paddle
+import paddle.fluid as fluid
logger = logging.getLogger(__name__)
@@ -228,8 +229,8 @@ class BMNReader(DataReader):
mapper = functools.partial(process_data, mode=self.mode)
def batch_reader():
- xreader = paddle.reader.xmap_readers(mapper, reader,
- self.num_threads, 1024)
+ xreader = fluid.io.xmap_readers(mapper, reader, self.num_threads,
+ 1024)
batch = []
for item in xreader():
batch.append(item)
diff --git a/PaddleCV/video/reader/bsn_reader.py b/PaddleCV/video/reader/bsn_reader.py
index a94074b53473cc4b801cc4772133ff27bf6f9b15..ae4c6b72c01d17d1836f33248598fb110e26113e 100644
--- a/PaddleCV/video/reader/bsn_reader.py
+++ b/PaddleCV/video/reader/bsn_reader.py
@@ -22,6 +22,7 @@ import json
import logging
import functools
import paddle
+import paddle.fluid as fluid
logger = logging.getLogger(__name__)
from .reader_utils import DataReader
@@ -214,8 +215,8 @@ class BSNVideoReader(DataReader):
mapper = functools.partial(process_data, mode=self.mode)
def batch_reader():
- xreader = paddle.reader.xmap_readers(mapper, reader,
- self.num_threads, 1024)
+ xreader = fluid.io.xmap_readers(mapper, reader, self.num_threads,
+ 1024)
batch = []
for item in xreader():
batch.append(item)
@@ -444,8 +445,8 @@ class BSNProposalReader(DataReader):
mapper = functools.partial(process_data, mode=self.mode)
def batch_reader():
- xreader = paddle.reader.xmap_readers(mapper, reader,
- self.num_threads, 1024)
+ xreader = fluid.io.xmap_readers(mapper, reader, self.num_threads,
+ 1024)
batch = []
for item in xreader():
batch.append(item)
diff --git a/PaddleCV/video/reader/ets_reader.py b/PaddleCV/video/reader/ets_reader.py
index 745887eedf734308d5397722774f8cdcd711064b..a53250116ea344eaca9ef1333f05f1394a839a46 100644
--- a/PaddleCV/video/reader/ets_reader.py
+++ b/PaddleCV/video/reader/ets_reader.py
@@ -18,6 +18,7 @@ import sys
import numpy as np
import functools
import paddle
+import paddle.fluid as fluid
import logging
logger = logging.getLogger(__name__)
@@ -154,8 +155,8 @@ class ETSReader(DataReader):
mapper = functools.partial(process_data)
- return paddle.reader.xmap_readers(mapper, reader, self.num_threads,
- self.buffer_size)
+ return fluid.io.xmap_readers(mapper, reader, self.num_threads,
+ self.buffer_size)
def batch_reader():
batch_out = []
diff --git a/PaddleCV/video/reader/kinetics_reader.py b/PaddleCV/video/reader/kinetics_reader.py
index 2960096948730deda6ba986081d5b74b692904d2..55a70a1d812e5be4641de184899df95d8820ec0f 100644
--- a/PaddleCV/video/reader/kinetics_reader.py
+++ b/PaddleCV/video/reader/kinetics_reader.py
@@ -26,7 +26,7 @@ except ImportError:
from io import BytesIO
import numpy as np
import paddle
-
+import paddle.fluid as fluid
try:
from nvidia.dali.pipeline import Pipeline
import nvidia.dali.ops as ops
@@ -34,6 +34,7 @@ try:
import tempfile
from nvidia.dali.plugin.paddle import DALIGenericIterator
except:
+ Pipeline = object
print("DALI is not installed, you can improve performance if use DALI")
from PIL import Image, ImageEnhance
@@ -272,8 +273,7 @@ class KineticsReader(DataReader):
img_mean=img_mean,
img_std=img_std)
- return paddle.reader.xmap_readers(mapper, reader_, num_threads,
- buf_size)
+ return fluid.io.xmap_readers(mapper, reader_, num_threads, buf_size)
def build_dali_reader(self):
"""
diff --git a/PaddleNLP/dialogue_system/auto_dialogue_evaluation/ade/utils/save_load_io.py b/PaddleNLP/dialogue_system/auto_dialogue_evaluation/ade/utils/save_load_io.py
deleted file mode 100644
index bdcdd811dd1ebb27542e5facc3ba050f00df08f8..0000000000000000000000000000000000000000
--- a/PaddleNLP/dialogue_system/auto_dialogue_evaluation/ade/utils/save_load_io.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""save or load model api"""
-
-import os
-import sys
-
-import paddle
-import paddle.fluid as fluid
-
-
-def init_from_pretrain_model(args, exe, program):
-
- assert isinstance(args.init_from_pretrain_model, str)
-
- if not os.path.exists(args.init_from_pretrain_model):
- raise Warning("The pretrained params do not exist.")
- return False
-
- def existed_params(var):
- if not isinstance(var, fluid.framework.Parameter):
- return False
- return os.path.exists(
- os.path.join(args.init_from_pretrain_model, var.name))
-
- fluid.io.load_vars(
- exe,
- args.init_from_pretrain_model,
- main_program=program,
- predicate=existed_params)
-
- print("finish initing model from pretrained params from %s" %
- (args.init_from_pretrain_model))
-
- return True
-
-
-def init_from_checkpoint(args, exe, program):
-
- assert isinstance(args.init_from_checkpoint, str)
-
- if not os.path.exists(args.init_from_checkpoint):
- raise Warning("the checkpoint path does not exist.")
- return False
-
- fluid.io.load_persistables(
- executor=exe,
- dirname=args.init_from_checkpoint,
- main_program=program,
- filename="checkpoint.pdckpt")
-
- print("finish initing model from checkpoint from %s" %
- (args.init_from_checkpoint))
-
- return True
-
-
-def init_from_params(args, exe, program):
-
- assert isinstance(args.init_from_params, str)
-
- if not os.path.exists(args.init_from_params):
- raise Warning("the params path does not exist.")
- return False
-
- fluid.io.load_params(
- executor=exe,
- dirname=args.init_from_params,
- main_program=program,
- filename="params.pdparams")
-
- print("finish init model from params from %s" % (args.init_from_params))
-
- return True
-
-
-def save_checkpoint(args, exe, program, dirname):
-
- assert isinstance(args.save_model_path, str)
-
- checkpoint_dir = os.path.join(args.save_model_path, args.save_checkpoint)
-
- if not os.path.exists(checkpoint_dir):
- os.mkdir(checkpoint_dir)
-
- fluid.io.save_persistables(
- exe,
- os.path.join(checkpoint_dir, dirname),
- main_program=program,
- filename="checkpoint.pdckpt")
-
- print("save checkpoint at %s" % (os.path.join(checkpoint_dir, dirname)))
-
- return True
-
-
-def save_param(args, exe, program, dirname):
-
- assert isinstance(args.save_model_path, str)
-
- param_dir = os.path.join(args.save_model_path, args.save_param)
-
- if not os.path.exists(param_dir):
- os.makedirs(param_dir)
-
- fluid.io.save_params(
- exe,
- os.path.join(param_dir, dirname),
- main_program=program,
- filename="params.pdparams")
- print("save parameters at %s" % (os.path.join(param_dir, dirname)))
-
- return True
diff --git a/PaddleNLP/dialogue_system/dialogue_general_understanding/dgu/utils/save_load_io.py b/PaddleNLP/dialogue_system/dialogue_general_understanding/dgu/utils/save_load_io.py
deleted file mode 100644
index bdcdd811dd1ebb27542e5facc3ba050f00df08f8..0000000000000000000000000000000000000000
--- a/PaddleNLP/dialogue_system/dialogue_general_understanding/dgu/utils/save_load_io.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""save or load model api"""
-
-import os
-import sys
-
-import paddle
-import paddle.fluid as fluid
-
-
-def init_from_pretrain_model(args, exe, program):
-
- assert isinstance(args.init_from_pretrain_model, str)
-
- if not os.path.exists(args.init_from_pretrain_model):
- raise Warning("The pretrained params do not exist.")
- return False
-
- def existed_params(var):
- if not isinstance(var, fluid.framework.Parameter):
- return False
- return os.path.exists(
- os.path.join(args.init_from_pretrain_model, var.name))
-
- fluid.io.load_vars(
- exe,
- args.init_from_pretrain_model,
- main_program=program,
- predicate=existed_params)
-
- print("finish initing model from pretrained params from %s" %
- (args.init_from_pretrain_model))
-
- return True
-
-
-def init_from_checkpoint(args, exe, program):
-
- assert isinstance(args.init_from_checkpoint, str)
-
- if not os.path.exists(args.init_from_checkpoint):
- raise Warning("the checkpoint path does not exist.")
- return False
-
- fluid.io.load_persistables(
- executor=exe,
- dirname=args.init_from_checkpoint,
- main_program=program,
- filename="checkpoint.pdckpt")
-
- print("finish initing model from checkpoint from %s" %
- (args.init_from_checkpoint))
-
- return True
-
-
-def init_from_params(args, exe, program):
-
- assert isinstance(args.init_from_params, str)
-
- if not os.path.exists(args.init_from_params):
- raise Warning("the params path does not exist.")
- return False
-
- fluid.io.load_params(
- executor=exe,
- dirname=args.init_from_params,
- main_program=program,
- filename="params.pdparams")
-
- print("finish init model from params from %s" % (args.init_from_params))
-
- return True
-
-
-def save_checkpoint(args, exe, program, dirname):
-
- assert isinstance(args.save_model_path, str)
-
- checkpoint_dir = os.path.join(args.save_model_path, args.save_checkpoint)
-
- if not os.path.exists(checkpoint_dir):
- os.mkdir(checkpoint_dir)
-
- fluid.io.save_persistables(
- exe,
- os.path.join(checkpoint_dir, dirname),
- main_program=program,
- filename="checkpoint.pdckpt")
-
- print("save checkpoint at %s" % (os.path.join(checkpoint_dir, dirname)))
-
- return True
-
-
-def save_param(args, exe, program, dirname):
-
- assert isinstance(args.save_model_path, str)
-
- param_dir = os.path.join(args.save_model_path, args.save_param)
-
- if not os.path.exists(param_dir):
- os.makedirs(param_dir)
-
- fluid.io.save_params(
- exe,
- os.path.join(param_dir, dirname),
- main_program=program,
- filename="params.pdparams")
- print("save parameters at %s" % (os.path.join(param_dir, dirname)))
-
- return True
diff --git a/PaddleNLP/lexical_analysis/creator.py b/PaddleNLP/lexical_analysis/creator.py
index bf02b57ae219512c97c3a428400ba99e750c7ce0..bc8e492f1b66e4474b626aa3dbfa767889f73e1d 100644
--- a/PaddleNLP/lexical_analysis/creator.py
+++ b/PaddleNLP/lexical_analysis/creator.py
@@ -105,15 +105,15 @@ def create_pyreader(args,
# create lac pyreader
if mode == 'train':
pyreader.set_sample_list_generator(
- paddle.batch(
- paddle.reader.shuffle(
+ fluid.io.batch(
+ fluid.io.shuffle(
reader.file_reader(file_name),
buf_size=args.traindata_shuffle_buffer),
batch_size=args.batch_size / device_count),
places=place)
else:
pyreader.set_sample_list_generator(
- paddle.batch(
+ fluid.io.batch(
reader.file_reader(
file_name, mode=mode),
batch_size=args.batch_size / device_count),
diff --git a/PaddleNLP/machine_translation/transformer/README.md b/PaddleNLP/machine_translation/transformer/README.md
index ee945ea05db9b9e52aac9a40dee0ab48fceb7318..9bc8462bf0f6f3203beda0d34d9c6021f63a3ef5 100644
--- a/PaddleNLP/machine_translation/transformer/README.md
+++ b/PaddleNLP/machine_translation/transformer/README.md
@@ -32,7 +32,7 @@
1. paddle安装
- 本项目依赖于 PaddlePaddle 1.6及以上版本或适当的develop版本,请参考 [安装指南](http://www.paddlepaddle.org/#quick-start) 进行安装
+ 本项目依赖于 PaddlePaddle 1.8及以上版本或适当的develop版本,请参考 [安装指南](https://www.paddlepaddle.org.cn/install/quick) 进行安装
2. 下载代码
@@ -44,7 +44,7 @@
3. 环境依赖
- 请参考PaddlePaddle[安装说明](https://www.paddlepaddle.org.cn/documentation/docs/zh/1.5/beginners_guide/install/index_cn.html)部分的内容
+ 请参考PaddlePaddle[安装说明](https://www.paddlepaddle.org.cn/documentation/docs/zh/install/index_cn.html)部分的内容
### 数据准备
diff --git a/PaddleNLP/machine_translation/transformer/transformer.py b/PaddleNLP/machine_translation/transformer/transformer.py
index a73ce9f3006a30c0183cb4a71c96ce36c9677b07..66901bb1cf40d1fb09e7a51dc1b6d94ef00559c9 100644
--- a/PaddleNLP/machine_translation/transformer/transformer.py
+++ b/PaddleNLP/machine_translation/transformer/transformer.py
@@ -752,18 +752,17 @@ def fast_decode(model_input, src_vocab_size, trg_vocab_size, max_in_len,
# caches contains states of history steps in decoder self-attention
# and static encoder output projections in encoder-decoder attention
# to reduce redundant computation.
+ batch_size = layers.shape(start_tokens)[0]
caches = [
{
"k": # for self attention
- layers.fill_constant_batch_size_like(
- input=start_tokens,
- shape=[-1, n_head, 0, d_key],
+ layers.fill_constant(
+ shape=[batch_size, n_head, 0, d_key],
dtype=enc_output.dtype,
value=0),
"v": # for self attention
- layers.fill_constant_batch_size_like(
- input=start_tokens,
- shape=[-1, n_head, 0, d_value],
+ layers.fill_constant(
+ shape=[batch_size, n_head, 0, d_value],
dtype=enc_output.dtype,
value=0),
"static_k": # for encoder-decoder attention
@@ -792,12 +791,10 @@ def fast_decode(model_input, src_vocab_size, trg_vocab_size, max_in_len,
lambda x: layers.gather(x, index=gather_idx), caches)
pre_src_attn_bias = layers.gather(
trg_src_attn_bias, index=gather_idx)
+ bias_batch_size = layers.shape(pre_src_attn_bias)[0]
pre_pos = layers.elementwise_mul(
- x=layers.fill_constant_batch_size_like(
- input=pre_src_attn_bias, # cann't use lod tensor here
- value=1,
- shape=[-1, 1],
- dtype=pre_ids.dtype),
+ x=layers.fill_constant(
+ value=1, shape=[bias_batch_size, 1], dtype=pre_ids.dtype),
y=step_idx,
axis=0)
logits = wrap_decoder(
diff --git a/PaddleNLP/shared_modules/models/matching/paddle_layers.py b/PaddleNLP/shared_modules/models/matching/paddle_layers.py
index f8782a93860630f26f94d03afbd471e594b8ac9d..c3650f5c7054dba19fb9849decab4e06a91924e9 100644
--- a/PaddleNLP/shared_modules/models/matching/paddle_layers.py
+++ b/PaddleNLP/shared_modules/models/matching/paddle_layers.py
@@ -210,7 +210,7 @@ class DataLayer(object):
"""
operation
"""
- data = fluid.layers.data(
+ data = fluid.data(
name=name, shape=shape, dtype=dtype, lod_level=lod_level)
return data
@@ -383,8 +383,10 @@ class ConstantLayer(object):
"""
operation
"""
- constant = fluid.layers.fill_constant_batch_size_like(input, shape,
- dtype, value)
+ shape = list(shape)
+ input_shape = fluid.layers.shape(input)
+ shape[0] = input_shape[0]
+ constant = fluid.layers.fill_constant(shape, dtype, value)
return constant
diff --git a/PaddleNLP/similarity_net/README.md b/PaddleNLP/similarity_net/README.md
index 61e8ce603eba123c147dbcad05de017ef1e18945..90208707cd051ab418a8b7f9f3e534e09b1a6b05 100644
--- a/PaddleNLP/similarity_net/README.md
+++ b/PaddleNLP/similarity_net/README.md
@@ -22,7 +22,7 @@
|UNICOM|联通客服|客服|
## 快速开始
#### 版本依赖
-本项目依赖于 Paddlepaddle Fluid 1.6,请参考[安装指南](http://www.paddlepaddle.org/#quick-start)进行安装。
+本项目依赖于 Paddlepaddle Fluid 1.8,请参考[安装指南](https://www.paddlepaddle.org.cn/install/quick)进行安装。
python版本依赖python 2.7
#### 安装代码
diff --git a/PaddleNLP/similarity_net/run_classifier.py b/PaddleNLP/similarity_net/run_classifier.py
index 77271c463dbe9310164b1590436fd154cf726a62..4c25cf2c5a4bd2fa10ed909dd205964fd6585b62 100644
--- a/PaddleNLP/similarity_net/run_classifier.py
+++ b/PaddleNLP/similarity_net/run_classifier.py
@@ -47,46 +47,51 @@ from models.model_check import check_version
from models.model_check import check_cuda
-def create_model(args, pyreader_name, is_inference=False, is_pointwise=False):
+def create_model(args, is_inference=False, is_pointwise=False):
"""
Create Model for simnet
"""
if is_inference:
- inf_pyreader = fluid.layers.py_reader(
- capacity=16,
- shapes=([-1], [-1]),
- dtypes=('int64', 'int64'),
- lod_levels=(1, 1),
- name=pyreader_name,
- use_double_buffer=False)
+ left = fluid.data(name='left', shape=[None], dtype='int64', lod_level=1)
+ pos_right = fluid.data(
+ name='pos_right', shape=[None], dtype='int64', lod_level=1)
+ inf_loader = fluid.io.DataLoader.from_generator(
+ capacity=16,
+ feed_list=[left, pos_right],
+ iterable=False,
+ use_double_buffer=False)
- left, pos_right = fluid.layers.read_file(inf_pyreader)
- return inf_pyreader, left, pos_right
+ return inf_loader, left, pos_right
else:
if is_pointwise:
- pointwise_pyreader = fluid.layers.py_reader(
- capacity=16,
- shapes=([-1], [-1], [-1]),
- dtypes=('int64', 'int64', 'int64'),
- lod_levels=(1, 1, 0),
- name=pyreader_name,
- use_double_buffer=False)
-
- left, right, label = fluid.layers.read_file(pointwise_pyreader)
- return pointwise_pyreader, left, right, label
+ left = fluid.data(
+ name='left', shape=[None], dtype='int64', lod_level=1)
+ right = fluid.data(
+ name='right', shape=[None], dtype='int64', lod_level=1)
+ label = fluid.data(name='label', shape=[None], dtype='int64')
+ pointwise_loader = fluid.io.DataLoader.from_generator(
+ capacity=16,
+ feed_list=[left, right, label],
+ iterable=False,
+ use_double_buffer=False)
+
+ return pointwise_loader, left, right, label
else:
- pairwise_pyreader = fluid.layers.py_reader(
- capacity=16,
- shapes=([-1], [-1], [-1]),
- dtypes=('int64', 'int64', 'int64'),
- lod_levels=(1, 1, 1),
- name=pyreader_name,
- use_double_buffer=False)
+ left = fluid.data(
+ name='left', shape=[None], dtype='int64', lod_level=1)
+ pos_right = fluid.data(
+ name='pos_right', shape=[None], dtype='int64', lod_level=1)
+ neg_right = fluid.data(
+ name='neg_right', shape=[None], dtype='int64', lod_level=1)
+ pairwise_loader = fluid.io.DataLoader.from_generator(
+ capacity=16,
+ feed_list=[left, pos_right, neg_right],
+ iterable=False,
+ use_double_buffer=False)
- left, pos_right, neg_right = fluid.layers.read_file(pairwise_pyreader)
- return pairwise_pyreader, left, pos_right, neg_right
+ return pairwise_loader, left, pos_right, neg_right
def train(conf_dict, args):
@@ -131,8 +136,7 @@ def train(conf_dict, args):
# Build network
with fluid.program_guard(train_program, startup_prog):
with fluid.unique_name.guard():
- train_pyreader, left, pos_right, neg_right = create_model(
- args, pyreader_name='train_reader')
+ train_loader, left, pos_right, neg_right = create_model(args)
left_feat, pos_score = net.predict(left, pos_right)
pred = pos_score
_, neg_score = net.predict(left, neg_right)
@@ -147,8 +151,8 @@ def train(conf_dict, args):
test_prog = fluid.Program()
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- test_pyreader, left, pos_right = create_model(
- args, pyreader_name='test_reader', is_inference=True)
+ test_loader, left, pos_right = create_model(
+ args, is_inference=True)
left_feat, pos_score = net.predict(left, pos_right)
pred = pos_score
test_prog = test_prog.clone(for_test=True)
@@ -157,8 +161,8 @@ def train(conf_dict, args):
# Build network
with fluid.program_guard(train_program, startup_prog):
with fluid.unique_name.guard():
- train_pyreader, left, right, label = create_model(
- args, pyreader_name='train_reader', is_pointwise=True)
+ train_loader, left, right, label = create_model(
+ args, is_pointwise=True)
left_feat, pred = net.predict(left, right)
avg_cost = loss.compute(pred, label)
avg_cost.persistable = True
@@ -171,15 +175,15 @@ def train(conf_dict, args):
test_prog = fluid.Program()
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- test_pyreader, left, right = create_model(
- args, pyreader_name='test_reader', is_inference=True)
+ test_loader, left, right = create_model(
+ args, is_inference=True)
left_feat, pred = net.predict(left, right)
test_prog = test_prog.clone(for_test=True)
if args.init_checkpoint is not "":
utils.init_checkpoint(exe, args.init_checkpoint, startup_prog)
- def valid_and_test(test_program, test_pyreader, get_valid_examples, process,
+ def valid_and_test(test_program, test_loader, get_valid_examples, process,
mode, exe, fetch_list):
"""
return auc and acc
@@ -187,15 +191,15 @@ def train(conf_dict, args):
# Get Batch Data
batch_data = fluid.io.batch(
get_valid_examples, args.batch_size, drop_last=False)
- test_pyreader.decorate_paddle_reader(batch_data)
- test_pyreader.start()
+ test_loader.set_sample_list_generator(batch_data)
+ test_loader.start()
pred_list = []
while True:
try:
_pred = exe.run(program=test_program, fetch_list=[pred.name])
pred_list += list(_pred)
except fluid.core.EOFException:
- test_pyreader.reset()
+ test_loader.reset()
break
pred_list = np.vstack(pred_list)
if mode == "test":
@@ -233,8 +237,8 @@ def train(conf_dict, args):
get_train_examples, buf_size=10000),
args.batch_size,
drop_last=False)
- train_pyreader.decorate_paddle_reader(train_batch_data)
- train_pyreader.start()
+ train_loader.set_sample_list_generator(train_batch_data)
+ train_loader.start()
exe.run(startup_prog)
losses = []
start_time = time.time()
@@ -248,8 +252,8 @@ def train(conf_dict, args):
if args.do_valid and global_step % args.validation_steps == 0:
get_valid_examples = simnet_process.get_reader("valid")
valid_result = valid_and_test(
- test_prog, test_pyreader, get_valid_examples,
- simnet_process, "valid", exe, [pred.name])
+ test_prog, test_loader, get_valid_examples, simnet_process,
+ "valid", exe, [pred.name])
if args.compute_accuracy:
valid_auc, valid_acc = valid_result
logging.info(
@@ -281,7 +285,7 @@ def train(conf_dict, args):
logging.info("saving infer model in %s" % model_path)
except fluid.core.EOFException:
- train_pyreader.reset()
+ train_loader.reset()
break
end_time = time.time()
#logging.info("epoch: %d, loss: %f, used time: %d sec" %
@@ -327,9 +331,8 @@ def train(conf_dict, args):
else:
# Get Feeder and Reader
get_test_examples = simnet_process.get_reader("test")
- test_result = valid_and_test(test_prog, test_pyreader,
- get_test_examples, simnet_process, "test",
- exe, [pred.name])
+ test_result = valid_and_test(test_prog, test_loader, get_test_examples,
+ simnet_process, "test", exe, [pred.name])
if args.compute_accuracy:
test_auc, test_acc = test_result
logging.info("AUC of test is %f, Accuracy of test is %f" %
@@ -371,8 +374,8 @@ def test(conf_dict, args):
if args.task_mode == "pairwise":
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- test_pyreader, left, pos_right = create_model(
- args, pyreader_name='test_reader', is_inference=True)
+ test_loader, left, pos_right = create_model(
+ args, is_inference=True)
left_feat, pos_score = net.predict(left, pos_right)
pred = pos_score
test_prog = test_prog.clone(for_test=True)
@@ -380,8 +383,8 @@ def test(conf_dict, args):
else:
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- test_pyreader, left, right = create_model(
- args, pyreader_name='test_reader', is_inference=True)
+ test_loader, left, right = create_model(
+ args, is_inference=True)
left_feat, pred = net.predict(left, right)
test_prog = test_prog.clone(for_test=True)
@@ -390,10 +393,10 @@ def test(conf_dict, args):
utils.init_checkpoint(exe, args.init_checkpoint, main_program=test_prog)
test_exe = exe
- test_pyreader.decorate_paddle_reader(batch_data)
+ test_loader.set_sample_list_generator(batch_data)
logging.info("start test process ...")
- test_pyreader.start()
+ test_loader.start()
pred_list = []
fetch_list = [pred.name]
output = []
@@ -412,7 +415,7 @@ def test(conf_dict, args):
map(lambda item: str(np.argmax(item)), output[0])) +
"\n")
except fluid.core.EOFException:
- test_pyreader.reset()
+ test_loader.reset()
break
if args.task_mode == "pairwise":
pred_list = np.array(pred_list).reshape((-1, 1))
@@ -468,16 +471,16 @@ def infer(conf_dict, args):
if args.task_mode == "pairwise":
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- infer_pyreader, left, pos_right = create_model(
- args, pyreader_name='infer_reader', is_inference=True)
+ infer_loader, left, pos_right = create_model(
+ args, is_inference=True)
left_feat, pos_score = net.predict(left, pos_right)
pred = pos_score
test_prog = test_prog.clone(for_test=True)
else:
with fluid.program_guard(test_prog, startup_prog):
with fluid.unique_name.guard():
- infer_pyreader, left, right = create_model(
- args, pyreader_name='infer_reader', is_inference=True)
+ infer_loader, left, right = create_model(
+ args, is_inference=True)
left_feat, pred = net.predict(left, right)
test_prog = test_prog.clone(for_test=True)
@@ -486,13 +489,13 @@ def infer(conf_dict, args):
utils.init_checkpoint(exe, args.init_checkpoint, main_program=test_prog)
test_exe = exe
- infer_pyreader.decorate_sample_list_generator(batch_data)
+ infer_loader.set_sample_list_generator(batch_data)
logging.info("start test process ...")
preds_list = []
fetch_list = [pred.name]
output = []
- infer_pyreader.start()
+ infer_loader.start()
while True:
try:
output = test_exe.run(program=test_prog, fetch_list=fetch_list)
@@ -502,7 +505,7 @@ def infer(conf_dict, args):
else:
preds_list += map(lambda item: str(np.argmax(item)), output[0])
except fluid.core.EOFException:
- infer_pyreader.reset()
+ infer_loader.reset()
break
with io.open(args.infer_result_path, "w", encoding="utf8") as infer_file:
for _data, _pred in zip(simnet_process.get_infer_data(), preds_list):
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/README.md b/PaddleRec/ctr/Paddle_baseline_KDD2019/README.md
deleted file mode 100644
index 4555bb2a87c39e89fb922522e8368f4a3acccf3b..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Paddle_baseline_KDD2019
-Paddle baseline for KDD2019 "Context-Aware Multi-Modal Transportation Recommendation"(https://dianshi.baidu.com/competition/29/question)
-
-This repository is the demo codes for the KDD2019 "Context-Aware Multi-Modal Transportation Recommendation" competition using PaddlePaddle. It is written by python and uses PaddlePaddle to solve the task. Note that this repository is on developing and welcome everyone to contribute. The current baseline solution codes can get 0.68 - 0.69 score of online submission. As an example, my submission based on these networks programmed by PaddlePaddle is 0.6898.
-The reason of the publication of this baseline codes is to encourage us to use PaddlePaddle and build the most powerful recommendation model via PaddlePaddle.
-
-The example codes are ran on Linux, python2.7, single machine with CPU . Note that distributed train options are not provided here, if you want to learn more about this, please check more modes examples on https://github.com/PaddlePaddle/models. About the speed of training, for one epoch, 1000 batch size, it would take about 8 mins to train the whole training instances generated from raw data using SGD optimizer (it would take relatively longer using Adam optimizer).
-
-The configuration and process of all the networks are fundamental, a lot of optimizations can be done based on them to achieve better results e.g. better cost function, more powerful feature engineering, designed model validation, NN optimization tricks...
-
-The code is rough and from my daily use. They will be trimmed these days...
-## Install PaddlePaddle
-please visit the official site of PaddlePaddle(http://www.paddlepaddle.org/documentation/docs/zh/1.4/beginners_guide/install/index_cn.html)
-## preprocess feature
-```python
-python preprocess_dense.py # change for different feature strategy
-python pre_test_dense.py
-```
-preprocess.py and preprocess_dense.py is the code for preprocessing the raw data. Two versions are provided to deal with all sparse features and sparse plus dense features. Correspondingly, pre_process_test.py and pre_test_dense.py are the codes to preproccess test raw data. The training instances are saved in json. It is very easy to add new features. In our demo, all features are generated from provided raw data except for weather feature, which is gengerated from open weather records.
-Note that the feature generated in this step need to fit in the input of the model input. Make sure we use the right version. In demo codes, The sparse plus dense features are used for network_confv6.
-
-## build the network
-main network logic is in network_confv?.py. The networks are base on fm & deep related algorithms. I try several networks and public some of them. There may be some defects in the networks but all of them are functional.
-
-## train the network
-```python
-python local_train.py
-```
-In local_train.py and map_reader.py, I use dataset API, so we need to download the corresponding .whl package or clone codes on develop branch of PaddlePaddle. The reason to use this is the speed of feeding data is much faster.
-Note that the input format feed into the network is self-defined. make sure we build the same format between training and test.
-
-## test results
-```python
-python generate_test.py
-python build_submit.py
-```
-In generate_test.py and build_submit, for convenience, I use the whole train data to train the network and test the network with provided data without label
-
-
-
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/args.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/args.py
deleted file mode 100644
index 55745918ead086db1a0a9f80db673f9353b06ecd..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/args.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import argparse
-
-def parse_args():
- parser = argparse.ArgumentParser(description="PaddlePaddle CTR example")
- parser.add_argument(
- '--train_data_path',
- type=str,
- default='./data/raw/train.txt',
- help="The path of training dataset")
- parser.add_argument(
- '--test_data_path',
- type=str,
- default='./data/raw/valid.txt',
- help="The path of testing dataset")
- parser.add_argument(
- '--batch_size',
- type=int,
- default=1000,
- help="The size of mini-batch (default:1000)")
- parser.add_argument(
- '--embedding_size',
- type=int,
- default=16,
- help="The size for embedding layer (default:10)")
- parser.add_argument(
- '--num_passes',
- type=int,
- default=10,
- help="The number of passes to train (default: 10)")
- parser.add_argument(
- '--model_output_dir',
- type=str,
- default='models',
- help='The path for model to store (default: models)')
- parser.add_argument(
- '--sparse_feature_dim',
- type=int,
- default=1000001,
- help='sparse feature hashing space for index processing')
- parser.add_argument(
- '--is_local',
- type=int,
- default=1,
- help='Local train or distributed train (default: 1)')
- parser.add_argument(
- '--cloud_train',
- type=int,
- default=0,
- help='Local train or distributed train on paddlecloud (default: 0)')
- parser.add_argument(
- '--async_mode',
- action='store_true',
- default=False,
- help='Whether start pserver in async mode to support ASGD')
- parser.add_argument(
- '--no_split_var',
- action='store_true',
- default=False,
- help='Whether split variables into blocks when update_method is pserver')
- parser.add_argument(
- '--role',
- type=str,
- default='pserver', # trainer or pserver
- help='The path for model to store (default: models)')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000,127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The path for model to store (default: 127.0.0.1:6000)')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='The path for model to store (default: models)')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- return parser.parse_args()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/build_submit.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/build_submit.py
deleted file mode 100644
index b4ffc498a2e5f1f7ccae6b99974258878a62fa04..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/build_submit.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import json
-import csv
-import io
-
-
-def build():
- submit_map = {}
- with io.open('./submit/submit.csv', 'wb') as csv_file:
- writer = csv.writer(csv_file, delimiter=',')
- writer.writerow(['sid', 'recommend_mode'])
- with open('./out/normed_test_session.txt', 'r') as f1:
- with open('./testres/res8', 'r') as f2:
- cur_session =''
- for x, y in zip(f1.readlines(), f2.readlines()):
- m1 = json.loads(x)
- session_id = m1["session_id"]
- if cur_session == '':
- cur_session = session_id
-
- transport_mode = m1["plan"]["transport_mode"]
-
- if cur_session != session_id:
- writer.writerow([str(cur_session), str(submit_map[cur_session]["transport_mode"])])
- cur_session = session_id
- if session_id not in submit_map:
- submit_map[session_id] = {}
- submit_map[session_id]["transport_mode"] = transport_mode
- submit_map[session_id]["probability"] = y
- #if int(submit_map[session_id]["transport_mode"]) == 0 and submit_map[session_id]["probability"] > 0.02:
- #submit_map[session_id]["probability"] = 0.99
- else:
- if float(y) > float(submit_map[session_id]["probability"]):
- submit_map[session_id]["transport_mode"] = transport_mode
- submit_map[session_id]["probability"] = y
- #if int(submit_map[session_id]["transport_mode"]) == 0 and submit_map[session_id]["probability"] > 0.02:
- #submit_map[session_id]["transport_mode"] = 0
- #submit_map[session_id]["probability"] = 0.99
-
-
- writer.writerow([cur_session, submit_map[cur_session]["transport_mode"]])
-
-
-
-if __name__ == "__main__":
- build()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._profiles.csv b/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._profiles.csv
deleted file mode 100644
index 3e7a69fbd3cccda1242c8056ce0f887f97775226..0000000000000000000000000000000000000000
Binary files a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._profiles.csv and /dev/null differ
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_plans.csv b/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_plans.csv
deleted file mode 100755
index 6070f2260eb3d5a7069741ec4ebb7e0ef57d13f3..0000000000000000000000000000000000000000
Binary files a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_plans.csv and /dev/null differ
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_queries.csv b/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_queries.csv
deleted file mode 100755
index 98060354f5bf046fff792ca359aecac750cce85e..0000000000000000000000000000000000000000
Binary files a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._test_queries.csv and /dev/null differ
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_clicks.csv b/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_clicks.csv
deleted file mode 100755
index 35f23f78ab5c254ccc1e631b8736a2854f5dfefa..0000000000000000000000000000000000000000
Binary files a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_clicks.csv and /dev/null differ
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_queries.csv b/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_queries.csv
deleted file mode 100755
index 3359b92b109fd1c12c60e1757c264c0b6f6a5313..0000000000000000000000000000000000000000
Binary files a/PaddleRec/ctr/Paddle_baseline_KDD2019/data_set_phase1/._train_queries.csv and /dev/null differ
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/generate_test.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/generate_test.py
deleted file mode 100644
index 66bf13d250e5487696177f6d710cd2ec73944d97..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/generate_test.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import argparse
-import logging
-import numpy as np
-# disable gpu training for this example
-import os
-
-os.environ["CUDA_VISIBLE_DEVICES"] = ""
-import paddle
-import paddle.fluid as fluid
-logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("fluid")
-logger.setLevel(logging.INFO)
-num_context_feature = 22
-
-
-def parse_args():
- parser = argparse.ArgumentParser(description="PaddlePaddle DeepFM example")
- parser.add_argument(
- '--model_path',
- type=str,
- #required=True,
- default='models',
- help="The path of model parameters gz file")
- parser.add_argument(
- '--data_path',
- type=str,
- required=False,
- help="The path of the dataset to infer")
- parser.add_argument(
- '--embedding_size',
- type=int,
- default=16,
- help="The size for embedding layer (default:10)")
- parser.add_argument(
- '--sparse_feature_dim',
- type=int,
- default=1000001,
- help="The size for embedding layer (default:1000001)")
- parser.add_argument(
- '--batch_size',
- type=int,
- default=1000,
- help="The size of mini-batch (default:1000)")
-
- return parser.parse_args()
-
-
-def to_lodtensor(data, place):
- seq_lens = [len(seq) for seq in data]
- cur_len = 0
- lod = [cur_len]
- for l in seq_lens:
- cur_len += l
- lod.append(cur_len)
- flattened_data = np.concatenate(data, axis=0).astype("int64")
- flattened_data = flattened_data.reshape([len(flattened_data), 1])
- res = fluid.LoDTensor()
- res.set(flattened_data, place)
- res.set_lod([lod])
-
- return res
-
-
-def data2tensor(data, place):
- feed_dict = {}
- dense = data[0]
- sparse = data[1:-1]
- y = data[-1]
- #user_data = np.array([x[0] for x in data]).astype("float32")
- #user_data = user_data.reshape([-1, 10])
- #feed_dict["user_profile"] = user_data
- dense_data = np.array([x[0] for x in data]).astype("float32")
- dense_data = dense_data.reshape([-1, 3])
- feed_dict["dense_feature"] = dense_data
- for i in range(num_context_feature):
- sparse_data = to_lodtensor([x[1 + i] for x in data], place)
- feed_dict["context" + str(i)] = sparse_data
-
- context_fm = to_lodtensor(
- np.array([x[-2] for x in data]).astype("float32"), place)
-
- feed_dict["context_fm"] = context_fm
- y_data = np.array([x[-1] for x in data]).astype("int64")
- y_data = y_data.reshape([-1, 1])
- feed_dict["label"] = y_data
- return feed_dict
-
-
-def test():
- args = parse_args()
-
- place = fluid.CPUPlace()
- test_scope = fluid.core.Scope()
-
- # filelist = ["%s/%s" % (args.data_path, x) for x in os.listdir(args.data_path)]
- from map_reader import MapDataset
- map_dataset = MapDataset()
- map_dataset.setup(args.sparse_feature_dim)
- exe = fluid.Executor(place)
-
- whole_filelist = ["./out/normed_test_session.txt"]
- test_files = whole_filelist[int(0.0 * len(whole_filelist)):int(1.0 * len(
- whole_filelist))]
-
- epochs = 1
-
- for i in range(epochs):
- cur_model_path = os.path.join(args.model_path,
- "epoch" + str(1) + ".model")
- with open("./testres/res" + str(i), 'w') as r:
- with fluid.scope_guard(test_scope):
- [inference_program, feed_target_names, fetch_targets] = \
- fluid.io.load_inference_model(cur_model_path, exe)
-
- test_reader = map_dataset.test_reader(test_files, 1000, 100000)
- k = 0
- for batch_id, data in enumerate(test_reader()):
- print(len(data[0]))
- feed_dict = data2tensor(data, place)
- loss_val, auc_val, accuracy, predict, _ = exe.run(
- inference_program,
- feed=feed_dict,
- fetch_list=fetch_targets,
- return_numpy=False)
-
- x = np.array(predict)
- for j in range(x.shape[0]):
- r.write(str(x[j][1]))
- r.write("\n")
-
-
-if __name__ == '__main__':
- test()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/infer.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/infer.py
deleted file mode 100644
index c218ce0fccc94ee595fd1681b54258d8d6ce43c0..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/infer.py
+++ /dev/null
@@ -1,141 +0,0 @@
-import argparse
-import logging
-
-import numpy as np
-# disable gpu training for this example
-import os
-
-os.environ["CUDA_VISIBLE_DEVICES"] = ""
-import paddle
-import paddle.fluid as fluid
-
-import map_reader
-from network_conf import ctr_deepfm_dataset
-
-logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("fluid")
-logger.setLevel(logging.INFO)
-
-
-def parse_args():
- parser = argparse.ArgumentParser(description="PaddlePaddle DeepFM example")
- parser.add_argument(
- '--model_path',
- type=str,
- #required=True,
- default='models',
- help="The path of model parameters gz file")
- parser.add_argument(
- '--data_path',
- type=str,
- required=False,
- help="The path of the dataset to infer")
- parser.add_argument(
- '--embedding_size',
- type=int,
- default=16,
- help="The size for embedding layer (default:10)")
- parser.add_argument(
- '--sparse_feature_dim',
- type=int,
- default=1000001,
- help="The size for embedding layer (default:1000001)")
- parser.add_argument(
- '--batch_size',
- type=int,
- default=1000,
- help="The size of mini-batch (default:1000)")
-
- return parser.parse_args()
-
-
-def to_lodtensor(data, place):
- seq_lens = [len(seq) for seq in data]
- cur_len = 0
- lod = [cur_len]
- for l in seq_lens:
- cur_len += l
- lod.append(cur_len)
- flattened_data = np.concatenate(data, axis=0).astype("int64")
- flattened_data = flattened_data.reshape([len(flattened_data), 1])
- res = fluid.LoDTensor()
- res.set(flattened_data, place)
- res.set_lod([lod])
- return res
-
-
-def data2tensor(data, place):
- feed_dict = {}
- test_dict = {}
- dense = data[0]
- sparse = data[1:-1]
- y = data[-1]
- dense_data = np.array([x[0] for x in data]).astype("float32")
- dense_data = dense_data.reshape([-1, 65])
- feed_dict["user_profile"] = dense_data
- for i in range(10):
- sparse_data = to_lodtensor([x[1 + i] for x in data], place)
- feed_dict["context" + str(i)] = sparse_data
-
- y_data = np.array([x[-1] for x in data]).astype("int64")
- y_data = y_data.reshape([-1, 1])
- feed_dict["label"] = y_data
- test_dict["test"] = [1]
- return feed_dict, test_dict
-
-
-def infer():
- args = parse_args()
-
- place = fluid.CPUPlace()
- inference_scope = fluid.core.Scope()
-
- filelist = [
- "%s/%s" % (args.data_path, x) for x in os.listdir(args.data_path)
- ]
- from map_reader import MapDataset
- map_dataset = MapDataset()
- map_dataset.setup(args.sparse_feature_dim)
- exe = fluid.Executor(place)
-
- whole_filelist = [
- "raw_data/part-%d" % x for x in range(len(os.listdir("raw_data")))
- ]
- #whole_filelist = ["./out/normed_train09", "./out/normed_train10", "./out/normed_train11"]
- test_files = whole_filelist[int(0.0 * len(whole_filelist)):int(1.0 * len(
- whole_filelist))]
-
- # file_groups = [whole_filelist[i:i+train_thread_num] for i in range(0, len(whole_filelist), train_thread_num)]
-
- def set_zero(var_name):
- param = inference_scope.var(var_name).get_tensor()
- param_array = np.zeros(param._get_dims()).astype("int64")
- param.set(param_array, place)
-
- epochs = 2
- for i in range(epochs):
- cur_model_path = os.path.join(args.model_path,
- "epoch" + str(i + 1) + ".model")
- with fluid.scope_guard(inference_scope):
- [inference_program, feed_target_names, fetch_targets] = \
- fluid.io.load_inference_model(cur_model_path, exe)
- auc_states_names = ['_generated_var_2', '_generated_var_3']
- for name in auc_states_names:
- set_zero(name)
-
- test_reader = map_dataset.infer_reader(test_files, 1000, 100000)
- for batch_id, data in enumerate(test_reader()):
- loss_val, auc_val, accuracy, predict, label = exe.run(
- inference_program,
- feed=data2tensor(data, place),
- fetch_list=fetch_targets,
- return_numpy=False)
-
- #print(np.array(predict))
- #x = np.array(predict)
- #print(.shape)x
- #print("train_pass_%d, test_pass_%d\t%f\t" % (i - 1, i, auc_val))
-
-
-if __name__ == '__main__':
- infer()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/local_train.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/local_train.py
deleted file mode 100644
index 9d7e9452a14e08d293d77bc41fc2806ca9c0d1a2..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/local_train.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from __future__ import print_function
-
-from args import parse_args
-import os
-import paddle.fluid as fluid
-import sys
-from network_confv6 import ctr_deepfm_dataset
-
-NUM_CONTEXT_FEATURE = 22
-DIM_USER_PROFILE = 10
-DIM_DENSE_FEATURE = 3
-PYTHON_PATH = "/home/yaoxuefeng/whls/paddle_release_home/python/bin/python" # this is mine change yours
-
-
-def train():
- args = parse_args()
- if not os.path.isdir(args.model_output_dir):
- os.mkdir(args.model_output_dir)
-
- #set the input format for our model. Note that you need to carefully modify them when you define a new network
- #user_profile = fluid.layers.data(
- #name="user_profile", shape=[DIM_USER_PROFILE], dtype='int64', lod_level=1)
- dense_feature = fluid.layers.data(
- name="dense_feature", shape=[DIM_DENSE_FEATURE], dtype='float32')
- context_feature = [
- fluid.layers.data(
- name="context" + str(i), shape=[1], lod_level=1, dtype="int64")
- for i in range(0, NUM_CONTEXT_FEATURE)
- ]
- context_feature_fm = fluid.layers.data(
- name="context_fm", shape=[1], dtype='int64', lod_level=1)
- label = fluid.layers.data(name='label', shape=[1], dtype='int64')
-
- print("ready to network")
- #self define network
- loss, auc_var, batch_auc_var, accuracy, predict = ctr_deepfm_dataset(
- dense_feature, context_feature, context_feature_fm, label,
- args.embedding_size, args.sparse_feature_dim)
-
- print("ready to optimize")
- optimizer = fluid.optimizer.SGD(learning_rate=1e-4)
- optimizer.minimize(loss)
- #single machine CPU training. more options on trainig please visit PaddlePaddle site
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(fluid.default_startup_program())
- #use dataset api for much faster speed
- dataset = fluid.DatasetFactory().create_dataset()
- dataset.set_use_var([dense_feature] + context_feature +
- [context_feature_fm] + [label])
- #self define how to process generated training insatnces in map_reader.py
- pipe_command = PYTHON_PATH + " map_reader.py %d" % args.sparse_feature_dim
- dataset.set_pipe_command(pipe_command)
- dataset.set_batch_size(args.batch_size)
- thread_num = 1
- dataset.set_thread(thread_num)
- #self define how to split training files for example:"split -a 2 -d -l 200000 normed_train.txt normed_train"
- whole_filelist = [
- "./out/normed_train%d" % x for x in range(len(os.listdir("out")))
- ]
- whole_filelist = [
- "./out/normed_train00", "./out/normed_train01", "./out/normed_train02",
- "./out/normed_train03", "./out/normed_train04", "./out/normed_train05",
- "./out/normed_train06", "./out/normed_train07", "./out/normed_train08",
- "./out/normed_train09", "./out/normed_train10", "./out/normed_train11"
- ]
- print("ready to epochs")
- epochs = 10
- for i in range(epochs):
- print("start %dth epoch" % i)
- dataset.set_filelist(whole_filelist[:int(len(whole_filelist))])
- #print the informations you want by setting fetch_list and fetch_info
- exe.train_from_dataset(
- program=fluid.default_main_program(),
- dataset=dataset,
- fetch_list=[auc_var, accuracy, predict, label],
- fetch_info=["auc", "accuracy", "predict", "label"],
- debug=False)
- model_dir = os.path.join(args.model_output_dir,
- '/epoch' + str(i + 1) + ".model")
- sys.stderr.write("epoch%d finished" % (i + 1))
- #save model
- fluid.io.save_inference_model(
- model_dir,
- [dense_feature.name] + [x.name for x in context_feature] +
- [context_feature_fm.name] + [label.name],
- [loss, auc_var, accuracy, predict, label], exe)
-
-
-if __name__ == '__main__':
- train()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/map_reader.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/map_reader.py
deleted file mode 100644
index 4a07e512d01c66e5bd778c0ab11a00f78fb138a0..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/map_reader.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import json
-import paddle.fluid.incubate.data_generator as dg
-
-
-class MapDataset(dg.MultiSlotDataGenerator):
- def setup(self, sparse_feature_dim):
- self.profile_length = 65
- self.dense_length = 3
- #feature names
- self.dense_feature_list = ["distance", "price", "eta"]
-
- self.pid_list = ["pid"]
- self.query_feature_list = ["weekday", "hour", "o1", "o2", "d1", "d2"]
- self.plan_feature_list = ["transport_mode"]
- self.rank_feature_list = ["plan_rank", "whole_rank", "price_rank", "eta_rank", "distance_rank"]
- self.rank_whole_pic_list = ["mode_rank1", "mode_rank2", "mode_rank3", "mode_rank4",
- "mode_rank5"]
- self.weather_feature_list = ["max_temp", "min_temp", "wea", "wind"]
- self.hash_dim = 1000001
- self.train_idx_ = 2000000
- #carefully set if you change the features
- self.categorical_range_ = range(0, 22)
-
- #process one instance
- def _process_line(self, line):
- instance = json.loads(line)
- """
- profile = instance["profile"]
- len_profile = len(profile)
- if len_profile >= 10:
- user_profile_feature = profile[0:10]
- else:
- profile.extend([0]*(10-len_profile))
- user_profile_feature = profile
-
- if len(profile) > 1 or (len(profile) == 1 and profile[0] != 0):
- for p in profile:
- if p >= 1 and p <= 65:
- user_profile_feature[p - 1] = 1
- """
- context_feature = []
- context_feature_fm = []
- dense_feature = [0] * self.dense_length
- plan = instance["plan"]
- for i, val in enumerate(self.dense_feature_list):
- dense_feature[i] = plan[val]
-
- if (instance["pid"] == ""):
- instance["pid"] = 0
-
- query = instance["query"]
- weather_dic = instance["weather"]
- for fea in self.pid_list:
- context_feature.append([hash(fea + str(instance[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(instance[fea])) % self.hash_dim)
- for fea in self.query_feature_list:
- context_feature.append([hash(fea + str(query[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(query[fea])) % self.hash_dim)
- for fea in self.plan_feature_list:
- context_feature.append([hash(fea + str(plan[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(plan[fea])) % self.hash_dim)
- for fea in self.rank_feature_list:
- context_feature.append([hash(fea + str(instance[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(instance[fea])) % self.hash_dim)
- for fea in self.rank_whole_pic_list:
- context_feature.append([hash(fea + str(instance[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(instance[fea])) % self.hash_dim)
- for fea in self.weather_feature_list:
- context_feature.append([hash(fea + str(weather_dic[fea])) % self.hash_dim])
- context_feature_fm.append(hash(fea + str(weather_dic[fea])) % self.hash_dim)
-
- label = [int(instance["label"])]
-
- return dense_feature, context_feature, context_feature_fm, label
-
- def infer_reader(self, filelist, batch, buf_size):
- print(filelist)
-
- def local_iter():
- for fname in filelist:
- with open(fname.strip(), "r") as fin:
- for line in fin:
- dense_feature, sparse_feature, sparse_feature_fm, label = self._process_line(line)
- yield [dense_feature] + sparse_feature + [sparse_feature_fm] + [label]
-
- import paddle
- batch_iter = paddle.batch(
- paddle.reader.shuffle(
- local_iter, buf_size=buf_size),
- batch_size=batch)
- return batch_iter
-
- #generat inputs for testing
- def test_reader(self, filelist, batch, buf_size):
- print(filelist)
-
- def local_iter():
- for fname in filelist:
- with open(fname.strip(), "r") as fin:
- for line in fin:
- dense_feature, sparse_feature, sparse_feature_fm, label = self._process_line(line)
- yield [dense_feature] + sparse_feature + [sparse_feature_fm] + [label]
-
- import paddle
- batch_iter = paddle.batch(
- paddle.reader.buffered(
- local_iter, size=buf_size),
- batch_size=batch)
- return batch_iter
-
- #generate inputs for trainig
- def generate_sample(self, line):
- def data_iter():
- dense_feature, sparse_feature, sparse_feature_fm, label = self._process_line(line)
- #feature_name = ["user_profile"]
- feature_name = []
- feature_name.append("dense_feature")
- for idx in self.categorical_range_:
- feature_name.append("context" + str(idx))
- feature_name.append("context_fm")
- feature_name.append("label")
- yield zip(feature_name, [dense_feature] + sparse_feature + [sparse_feature_fm] + [label])
-
- return data_iter
-
-
-if __name__ == "__main__":
- map_dataset = MapDataset()
- map_dataset.setup(int(sys.argv[1]))
- map_dataset.run_from_stdin()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/network_confv6.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/network_confv6.py
deleted file mode 100644
index 5a9a5d4b18dd99133b50b143da451495735311dd..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/network_confv6.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import paddle.fluid as fluid
-import math
-
-user_profile_dim = 65
-dense_feature_dim = 3
-
-def ctr_deepfm_dataset(dense_feature, context_feature, context_feature_fm, label,
- embedding_size, sparse_feature_dim):
- def dense_fm_layer(input, emb_dict_size, factor_size, fm_param_attr):
-
- first_order = fluid.layers.fc(input=input, size=1)
- emb_table = fluid.layers.create_parameter(shape=[emb_dict_size, factor_size],
- dtype='float32', attr=fm_param_attr)
-
- input_mul_factor = fluid.layers.matmul(input, emb_table)
- input_mul_factor_square = fluid.layers.square(input_mul_factor)
- input_square = fluid.layers.square(input)
- factor_square = fluid.layers.square(emb_table)
- input_square_mul_factor_square = fluid.layers.matmul(input_square, factor_square)
-
- second_order = 0.5 * (input_mul_factor_square - input_square_mul_factor_square)
- return first_order, second_order
-
-
- dense_fm_param_attr = fluid.param_attr.ParamAttr(name="DenseFeatFactors",
- initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(dense_feature_dim)))
- dense_fm_first, dense_fm_second = dense_fm_layer(
- dense_feature, dense_feature_dim, 16, dense_fm_param_attr)
-
-
- def sparse_fm_layer(input, emb_dict_size, factor_size, fm_param_attr):
-
- first_embeddings = fluid.layers.embedding(
- input=input, dtype='float32', size=[emb_dict_size, 1], is_sparse=True)
- first_order = fluid.layers.sequence_pool(input=first_embeddings, pool_type='sum')
-
- nonzero_embeddings = fluid.layers.embedding(
- input=input, dtype='float32', size=[emb_dict_size, factor_size],
- param_attr=fm_param_attr, is_sparse=True)
- summed_features_emb = fluid.layers.sequence_pool(input=nonzero_embeddings, pool_type='sum')
- summed_features_emb_square = fluid.layers.square(summed_features_emb)
-
- squared_features_emb = fluid.layers.square(nonzero_embeddings)
- squared_sum_features_emb = fluid.layers.sequence_pool(
- input=squared_features_emb, pool_type='sum')
-
- second_order = 0.5 * (summed_features_emb_square - squared_sum_features_emb)
- return first_order, second_order
-
- sparse_fm_param_attr = fluid.param_attr.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(sparse_feature_dim)))
-
- #data = fluid.layers.data(name='ids', shape=[1], dtype='float32')
- sparse_fm_first, sparse_fm_second = sparse_fm_layer(
- context_feature_fm, sparse_feature_dim, 16, sparse_fm_param_attr)
-
- def embedding_layer(input):
- return fluid.layers.embedding(
- input=input,
- is_sparse=True,
- # you need to patch https://github.com/PaddlePaddle/Paddle/pull/14190
- # if you want to set is_distributed to True
- is_distributed=False,
- size=[sparse_feature_dim, embedding_size],
- param_attr=fluid.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Uniform()))
-
- sparse_embed_seq = list(map(embedding_layer, context_feature))
-
- concated_ori = fluid.layers.concat(sparse_embed_seq + [dense_feature], axis=1)
- concated = fluid.layers.batch_norm(input=concated_ori, name="bn", epsilon=1e-4)
-
- deep = deep_net(concated)
-
- predict = fluid.layers.fc(input=[deep, sparse_fm_first, sparse_fm_second, dense_fm_first, dense_fm_second], size=2, act="softmax",
- param_attr=fluid.ParamAttr(initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(deep.shape[1])), learning_rate=0.01))
-
- #similarity_norm = fluid.layers.sigmoid(fluid.layers.clip(predict, min=-15.0, max=15.0), name="similarity_norm")
-
- cost = fluid.layers.cross_entropy(input=predict, label=label)
-
- avg_cost = fluid.layers.reduce_sum(cost)
- accuracy = fluid.layers.accuracy(input=predict, label=label)
- auc_var, batch_auc_var, auc_states = \
- fluid.layers.auc(input=predict, label=label, num_thresholds=2 ** 12, slide_steps=20)
- return avg_cost, auc_var, batch_auc_var, accuracy, predict
-
-
-def deep_net(concated, lr_x=0.0001):
- fc_layers_input = [concated]
- fc_layers_size = [400, 400, 400]
- fc_layers_act = ["relu"] * (len(fc_layers_size))
-
- for i in range(len(fc_layers_size)):
- fc = fluid.layers.fc(
- input=fc_layers_input[-1],
- size=fc_layers_size[i],
- act=fc_layers_act[i],
- param_attr=fluid.ParamAttr(learning_rate=lr_x * 0.5))
-
- fc_layers_input.append(fc)
- #w_res = fluid.layers.create_parameter(shape=[353, 16], dtype='float32', name="w_res")
- #high_path = fluid.layers.matmul(concated, w_res)
-
- #return fluid.layers.elementwise_add(high_path, fc_layers_input[-1])
- return fc_layers_input[-1]
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_conf.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_conf.py
deleted file mode 100644
index ef6d0103fe26b10cd74047cb8de2c8442b13cbff..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_conf.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import paddle.fluid as fluid
-import math
-
-user_profile_dim = 65
-num_context = 25
-dim_fm_vector = 16
-dim_concated = user_profile_dim + dim_fm_vector * (num_context)
-
-
-def ctr_deepfm_dataset(user_profile, context_feature, label,
- embedding_size, sparse_feature_dim):
- def embedding_layer(input):
- return fluid.layers.embedding(
- input=input,
- is_sparse=True,
- # you need to patch https://github.com/PaddlePaddle/Paddle/pull/14190
- # if you want to set is_distributed to True
- is_distributed=False,
- size=[sparse_feature_dim, embedding_size],
- param_attr=fluid.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Uniform()))
-
- sparse_embed_seq = list(map(embedding_layer, context_feature))
-
- w = fluid.layers.create_parameter(
- shape=[65, 65], dtype='float32',
- name="w_fm")
- user_profile_emb = fluid.layers.matmul(user_profile, w)
-
- concated_ori = fluid.layers.concat(sparse_embed_seq + [user_profile_emb], axis=1)
- concated = fluid.layers.batch_norm(input=concated_ori, name="bn", epsilon=1e-4)
-
- deep = deep_net(concated)
- linear_term, second_term = fm(concated, dim_concated, 8) #depend on the number of context feature
-
- predict = fluid.layers.fc(input=[deep, linear_term, second_term], size=2, act="softmax",
- param_attr=fluid.ParamAttr(initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(deep.shape[1])), learning_rate=0.01))
-
- #similarity_norm = fluid.layers.sigmoid(fluid.layers.clip(predict, min=-15.0, max=15.0), name="similarity_norm")
-
-
- cost = fluid.layers.cross_entropy(input=predict, label=label)
-
- avg_cost = fluid.layers.reduce_sum(cost)
- accuracy = fluid.layers.accuracy(input=predict, label=label)
- auc_var, batch_auc_var, auc_states = \
- fluid.layers.auc(input=predict, label=label, num_thresholds=2 ** 12, slide_steps=20)
- return avg_cost, auc_var, batch_auc_var, accuracy, predict
-
-
-def deep_net(concated, lr_x=0.0001):
- fc_layers_input = [concated]
- fc_layers_size = [128, 64, 32, 16]
- fc_layers_act = ["relu"] * (len(fc_layers_size))
-
- for i in range(len(fc_layers_size)):
- fc = fluid.layers.fc(
- input=fc_layers_input[-1],
- size=fc_layers_size[i],
- act=fc_layers_act[i],
- param_attr=fluid.ParamAttr(learning_rate=lr_x * 0.5))
-
- fc_layers_input.append(fc)
-
- return fc_layers_input[-1]
-
-
-def fm(concated, emb_dict_size, factor_size, lr_x=0.0001):
- linear_term = fluid.layers.fc(input=concated, size=8, act=None, param_attr=fluid.ParamAttr(learning_rate=lr_x))
-
- emb_table = fluid.layers.create_parameter(shape=[emb_dict_size, factor_size],
- dtype='float32')
-
- input_mul_factor = fluid.layers.matmul(concated, emb_table)
- input_mul_factor_square = fluid.layers.square(input_mul_factor)
- input_square = fluid.layers.square(concated)
- factor_square = fluid.layers.square(emb_table)
- input_square_mul_factor_square = fluid.layers.matmul(input_square, factor_square)
-
- second_term = 0.5 * (input_mul_factor_square - input_square_mul_factor_square)
-
- return linear_term, second_term
-
-
-
-
-
-
-
-
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv4.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv4.py
deleted file mode 100644
index 9700016813b6cef7ed5c9b37c63ebecee6f66f32..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv4.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import paddle.fluid as fluid
-import math
-
-user_profile_dim = 65
-slot_1 = [0, 1, 2, 3, 4, 5]
-slot_2 = [6]
-slot_3 = [7, 8, 9, 10, 11]
-slot_4 = [12, 13, 14, 15, 16]
-slot_5 = [17, 18, 19, 20]
-num_context = 25
-num_slots_pair = 5
-dim_fm_vector = 16
-dim_concated = user_profile_dim + dim_fm_vector * (num_context + num_slots_pair)
-
-def ctr_deepfm_dataset(user_profile, dense_feature, context_feature, label,
- embedding_size, sparse_feature_dim):
- def embedding_layer(input):
- return fluid.layers.embedding(
- input=input,
- is_sparse=True,
- # you need to patch https://github.com/PaddlePaddle/Paddle/pull/14190
- # if you want to set is_distributed to True
- is_distributed=False,
- size=[sparse_feature_dim, embedding_size],
- param_attr=fluid.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Uniform()))
-
- sparse_embed_seq = list(map(embedding_layer, context_feature))
-
- w = fluid.layers.create_parameter(
- shape=[65, 65], dtype='float32',
- name="w_fm")
-
- user_emb_list = []
- user_profile_emb = fluid.layers.matmul(user_profile, w)
- user_emb_list.append(user_profile_emb)
- user_emb_list.append(dense_feature)
-
- w1 = fluid.layers.create_parameter(shape=[65, dim_fm_vector], dtype='float32', name="w_1")
- w2 = fluid.layers.create_parameter(shape=[65, dim_fm_vector], dtype='float32', name="w_2")
- w3 = fluid.layers.create_parameter(shape=[65, dim_fm_vector], dtype='float32', name="w_3")
- w4 = fluid.layers.create_parameter(shape=[65, dim_fm_vector], dtype='float32', name="w_4")
- w5 = fluid.layers.create_parameter(shape=[65, dim_fm_vector], dtype='float32', name="w_5")
- user_profile_emb_1 = fluid.layers.matmul(user_profile, w1)
- user_profile_emb_2 = fluid.layers.matmul(user_profile, w2)
- user_profile_emb_3 = fluid.layers.matmul(user_profile, w3)
- user_profile_emb_4 = fluid.layers.matmul(user_profile, w4)
- user_profile_emb_5 = fluid.layers.matmul(user_profile, w5)
-
- sparse_embed_seq_1 = embedding_layer(context_feature[slot_1[0]])
- sparse_embed_seq_2 = embedding_layer(context_feature[slot_2[0]])
- sparse_embed_seq_3 = embedding_layer(context_feature[slot_3[0]])
- sparse_embed_seq_4 = embedding_layer(context_feature[slot_4[0]])
- sparse_embed_seq_5 = embedding_layer(context_feature[slot_5[0]])
- for i in slot_1[1:-1]:
- sparse_embed_seq_1 = fluid.layers.elementwise_add(sparse_embed_seq_1, embedding_layer(context_feature[i]))
- for i in slot_2[1:-1]:
- sparse_embed_seq_2 = fluid.layers.elementwise_add(sparse_embed_seq_2, embedding_layer(context_feature[i]))
- for i in slot_3[1:-1]:
- sparse_embed_seq_3 = fluid.layers.elementwise_add(sparse_embed_seq_3, embedding_layer(context_feature[i]))
- for i in slot_4[1:-1]:
- sparse_embed_seq_4 = fluid.layers.elementwise_add(sparse_embed_seq_4, embedding_layer(context_feature[i]))
- for i in slot_5[1:-1]:
- sparse_embed_seq_5 = fluid.layers.elementwise_add(sparse_embed_seq_5, embedding_layer(context_feature[i]))
-
- ele_product_1 = fluid.layers.elementwise_mul(user_profile_emb_1, sparse_embed_seq_1)
- user_emb_list.append(ele_product_1)
- ele_product_2 = fluid.layers.elementwise_mul(user_profile_emb_2, sparse_embed_seq_2)
- user_emb_list.append(ele_product_2)
- ele_product_3 = fluid.layers.elementwise_mul(user_profile_emb_3, sparse_embed_seq_3)
- user_emb_list.append(ele_product_3)
- ele_product_4 = fluid.layers.elementwise_mul(user_profile_emb_4, sparse_embed_seq_4)
- user_emb_list.append(ele_product_4)
- ele_product_5 = fluid.layers.elementwise_mul(user_profile_emb_5, sparse_embed_seq_5)
- user_emb_list.append(ele_product_5)
-
- ffm_1 = fluid.layers.reduce_sum(ele_product_1, dim=1, keep_dim=True)
- ffm_2 = fluid.layers.reduce_sum(ele_product_2, dim=1, keep_dim=True)
- ffm_3 = fluid.layers.reduce_sum(ele_product_3, dim=1, keep_dim=True)
- ffm_4 = fluid.layers.reduce_sum(ele_product_4, dim=1, keep_dim=True)
- ffm_5 = fluid.layers.reduce_sum(ele_product_5, dim=1, keep_dim=True)
-
-
- concated_ori = fluid.layers.concat(sparse_embed_seq + user_emb_list, axis=1)
- concated = fluid.layers.batch_norm(input=concated_ori, name="bn", epsilon=1e-4)
-
- deep = deep_net(concated)
- linear_term, second_term = fm(concated, dim_concated, 8) #depend on the number of context feature
-
- predict = fluid.layers.fc(input=[deep, linear_term, second_term, ffm_1, ffm_2, ffm_3, ffm_4, ffm_5], size=2, act="softmax",
- param_attr=fluid.ParamAttr(initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(deep.shape[1])), learning_rate=0.01))
-
- #similarity_norm = fluid.layers.sigmoid(fluid.layers.clip(predict, min=-15.0, max=15.0), name="similarity_norm")
-
-
- cost = fluid.layers.cross_entropy(input=predict, label=label)
-
- avg_cost = fluid.layers.reduce_sum(cost)
- accuracy = fluid.layers.accuracy(input=predict, label=label)
- auc_var, batch_auc_var, auc_states = \
- fluid.layers.auc(input=predict, label=label, num_thresholds=2 ** 12, slide_steps=20)
- return avg_cost, auc_var, batch_auc_var, accuracy, predict
-
-
-def deep_net(concated, lr_x=0.0001):
- fc_layers_input = [concated]
- fc_layers_size = [256, 128, 64, 32, 16]
- fc_layers_act = ["relu"] * (len(fc_layers_size))
-
- for i in range(len(fc_layers_size)):
- fc = fluid.layers.fc(
- input=fc_layers_input[-1],
- size=fc_layers_size[i],
- act=fc_layers_act[i],
- param_attr=fluid.ParamAttr(learning_rate=lr_x * 0.5))
-
- fc_layers_input.append(fc)
- w_res = fluid.layers.create_parameter(shape=[dim_concated, 16], dtype='float32', name="w_res")
- high_path = fluid.layers.matmul(concated, w_res)
-
- return fluid.layers.elementwise_add(high_path, fc_layers_input[-1])
- #return fc_layers_input[-1]
-
-
-def fm(concated, emb_dict_size, factor_size, lr_x=0.0001):
- linear_term = fluid.layers.fc(input=concated, size=8, act=None, param_attr=fluid.ParamAttr(learning_rate=lr_x))
-
- emb_table = fluid.layers.create_parameter(shape=[emb_dict_size, factor_size],
- dtype='float32')
-
- input_mul_factor = fluid.layers.matmul(concated, emb_table)
- input_mul_factor_square = fluid.layers.square(input_mul_factor)
- input_square = fluid.layers.square(concated)
- factor_square = fluid.layers.square(emb_table)
- input_square_mul_factor_square = fluid.layers.matmul(input_square, factor_square)
-
- second_term = 0.5 * (input_mul_factor_square - input_square_mul_factor_square)
-
- return linear_term, second_term
\ No newline at end of file
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv6.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv6.py
deleted file mode 100644
index ed638e97a981e1af24388f59e7b446d0e6507749..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/networks/network_confv6.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import paddle.fluid as fluid
-import math
-
-user_profile_dim = 65
-dense_feature_dim = 3
-
-def ctr_deepfm_dataset(dense_feature, context_feature, context_feature_fm, label,
- embedding_size, sparse_feature_dim):
- def dense_fm_layer(input, emb_dict_size, factor_size, fm_param_attr):
-
- first_order = fluid.layers.fc(input=input, size=1)
- emb_table = fluid.layers.create_parameter(shape=[emb_dict_size, factor_size],
- dtype='float32', attr=fm_param_attr)
-
- input_mul_factor = fluid.layers.matmul(input, emb_table)
- input_mul_factor_square = fluid.layers.square(input_mul_factor)
- input_square = fluid.layers.square(input)
- factor_square = fluid.layers.square(emb_table)
- input_square_mul_factor_square = fluid.layers.matmul(input_square, factor_square)
-
- second_order = 0.5 * (input_mul_factor_square - input_square_mul_factor_square)
- return first_order, second_order
-
-
- dense_fm_param_attr = fluid.param_attr.ParamAttr(name="DenseFeatFactors",
- initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(dense_feature_dim)))
- dense_fm_first, dense_fm_second = dense_fm_layer(
- dense_feature, dense_feature_dim, 16, dense_fm_param_attr)
-
-
- def sparse_fm_layer(input, emb_dict_size, factor_size, fm_param_attr):
-
- first_embeddings = fluid.layers.embedding(
- input=input, dtype='float32', size=[emb_dict_size, 1], is_sparse=True)
- first_order = fluid.layers.sequence_pool(input=first_embeddings, pool_type='sum')
-
- nonzero_embeddings = fluid.layers.embedding(
- input=input, dtype='float32', size=[emb_dict_size, factor_size],
- param_attr=fm_param_attr, is_sparse=True)
- summed_features_emb = fluid.layers.sequence_pool(input=nonzero_embeddings, pool_type='sum')
- summed_features_emb_square = fluid.layers.square(summed_features_emb)
-
- squared_features_emb = fluid.layers.square(nonzero_embeddings)
- squared_sum_features_emb = fluid.layers.sequence_pool(
- input=squared_features_emb, pool_type='sum')
-
- second_order = 0.5 * (summed_features_emb_square - squared_sum_features_emb)
- return first_order, second_order
-
- sparse_fm_param_attr = fluid.param_attr.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(sparse_feature_dim)))
-
- #data = fluid.layers.data(name='ids', shape=[1], dtype='float32')
- sparse_fm_first, sparse_fm_second = sparse_fm_layer(
- context_feature_fm, sparse_feature_dim, 16, sparse_fm_param_attr)
-
- def embedding_layer(input):
- return fluid.layers.embedding(
- input=input,
- is_sparse=True,
- # you need to patch https://github.com/PaddlePaddle/Paddle/pull/14190
- # if you want to set is_distributed to True
- is_distributed=False,
- size=[sparse_feature_dim, embedding_size],
- param_attr=fluid.ParamAttr(name="SparseFeatFactors",
- initializer=fluid.initializer.Uniform()))
-
- sparse_embed_seq = list(map(embedding_layer, context_feature))
-
- concated_ori = fluid.layers.concat(sparse_embed_seq + [dense_feature], axis=1)
- concated = fluid.layers.batch_norm(input=concated_ori, name="bn", epsilon=1e-4)
-
- deep = deep_net(concated)
-
- predict = fluid.layers.fc(input=[deep, sparse_fm_first, sparse_fm_second, dense_fm_first, dense_fm_second], size=2, act="softmax",
- param_attr=fluid.ParamAttr(initializer=fluid.initializer.Normal(
- scale=1 / math.sqrt(deep.shape[1])), learning_rate=0.01))
-
- #similarity_norm = fluid.layers.sigmoid(fluid.layers.clip(predict, min=-15.0, max=15.0), name="similarity_norm")
-
- cost = fluid.layers.cross_entropy(input=predict, label=label)
-
- avg_cost = fluid.layers.reduce_sum(cost)
- accuracy = fluid.layers.accuracy(input=predict, label=label)
- auc_var, batch_auc_var, auc_states = \
- fluid.layers.auc(input=predict, label=label, num_thresholds=2 ** 12, slide_steps=20)
- return avg_cost, auc_var, batch_auc_var, accuracy, predict
-
-
-def deep_net(concated, lr_x=0.0001):
- fc_layers_input = [concated]
- fc_layers_size = [400, 400, 400]
- fc_layers_act = ["relu"] * (len(fc_layers_size))
-
- for i in range(len(fc_layers_size)):
- fc = fluid.layers.fc(
- input=fc_layers_input[-1],
- size=fc_layers_size[i],
- act=fc_layers_act[i],
- param_attr=fluid.ParamAttr(learning_rate=lr_x * 0.5))
-
- fc_layers_input.append(fc)
- #w_res = fluid.layers.create_parameter(shape=[353, 16], dtype='float32', name="w_res")
- #high_path = fluid.layers.matmul(concated, w_res)
-
- #return fluid.layers.elementwise_add(high_path, fc_layers_input[-1])
- return fc_layers_input[-1]
\ No newline at end of file
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_process_test.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_process_test.py
deleted file mode 100644
index 44462a9910f781c20659b3bfd51d5e794e5bed58..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_process_test.py
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, sys, time, random, csv, datetime, json
-import pandas as pd
-import numpy as np
-import argparse
-import logging
-import time
-
-logging.basicConfig(
- format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("preprocess")
-logger.setLevel(logging.INFO)
-
-TEST_QUERIES_PATH = "./data_set_phase1/test_queries.csv"
-TEST_PLANS_PATH = "./data_set_phase1/test_plans.csv"
-TRAIN_CLICK_PATH = "./data_set_phase1/train_clicks.csv"
-PROFILES_PATH = "./data_set_phase1/profiles.csv"
-OUT_NORM_TEST_PATH = "./out/normed_test_session.txt"
-OUT_RAW_TEST_PATH = "./out/test_session.txt"
-
-O1_MIN = 115.47
-O1_MAX = 117.29
-
-O2_MIN = 39.46
-O2_MAX = 40.97
-
-D1_MIN = 115.44
-D1_MAX = 117.37
-
-D2_MIN = 39.46
-D2_MAX = 40.96
-SCALE_OD = 0.02
-
-DISTANCE_MIN = 1.0
-DISTANCE_MAX = 225864.0
-THRESHOLD_DIS = 40000.0
-SCALE_DIS = 500
-
-PRICE_MIN = 200.0
-PRICE_MAX = 92300.0
-THRESHOLD_PRICE = 20000
-SCALE_PRICE = 100
-
-ETA_MIN = 1.0
-ETA_MAX = 72992.0
-THRESHOLD_ETA = 10800.0
-SCALE_ETA = 120
-
-
-def build_norm_feature():
- with open(OUT_NORM_TEST_PATH, 'w') as nf:
- with open(OUT_RAW_TEST_PATH, 'r') as f:
- for line in f:
- cur_map = json.loads(line)
-
- if cur_map["plan"]["distance"] > THRESHOLD_DIS:
- cur_map["plan"]["distance"] = int(THRESHOLD_DIS)
- elif cur_map["plan"]["distance"] > 0:
- cur_map["plan"]["distance"] = int(cur_map["plan"]["distance"] / SCALE_DIS)
-
- if cur_map["plan"]["price"] and cur_map["plan"]["price"] > THRESHOLD_PRICE:
- cur_map["plan"]["price"] = int(THRESHOLD_PRICE)
- elif not cur_map["plan"]["price"] or cur_map["plan"]["price"] < 0:
- cur_map["plan"]["price"] = 0
- else:
- cur_map["plan"]["price"] = int(cur_map["plan"]["price"] / SCALE_PRICE)
-
- if cur_map["plan"]["eta"] > THRESHOLD_ETA:
- cur_map["plan"]["eta"] = int(THRESHOLD_ETA)
- elif cur_map["plan"]["eta"] > 0:
- cur_map["plan"]["eta"] = int(cur_map["plan"]["eta"] / SCALE_ETA)
-
- # o1
- if cur_map["query"]["o1"] > O1_MAX:
- cur_map["query"]["o1"] = int((O1_MAX - O1_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["o1"] < O1_MIN:
- cur_map["query"]["o1"] = 0
- else:
- cur_map["query"]["o1"] = int((cur_map["query"]["o1"] - O1_MIN) / 0.02)
-
- # o2
- if cur_map["query"]["o2"] > O2_MAX:
- cur_map["query"]["o2"] = int((O2_MAX - O2_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["o2"] < O2_MIN:
- cur_map["query"]["o2"] = 0
- else:
- cur_map["query"]["o2"] = int((cur_map["query"]["o2"] - O2_MIN) / 0.02)
-
- # d1
- if cur_map["query"]["d1"] > D1_MAX:
- cur_map["query"]["d1"] = int((D1_MAX - D1_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["d1"] < D1_MIN:
- cur_map["query"]["d1"] = 0
- else:
- cur_map["query"]["d1"] = int((cur_map["query"]["d1"] - D1_MIN) / SCALE_OD)
-
- # d2
- if cur_map["query"]["d2"] > D2_MAX:
- cur_map["query"]["d2"] = int((D2_MAX - D2_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["d2"] < D2_MIN:
- cur_map["query"]["d2"] = 0
- else:
- cur_map["query"]["d2"] = int((cur_map["query"]["d2"] - D2_MIN) / SCALE_OD)
-
- cur_json_instance = json.dumps(cur_map)
- nf.write(cur_json_instance + '\n')
-
-
-def preprocess():
- """
- Construct the train data indexed by session id and mode id jointly. Convert some of the raw features (user profile,
- od pair, req time, click time, eta, price, distance, transport mode) to one-hot ids used for
- embedding. We split the one-hot features into two categories: user feature and context feature for
- better understanding of FM algorithm.
- Note that the user profile is already provided by one-hot encoded form, we convert it back to the
- ids for unity with the context feature and easily using of PaddlePaddle embedding layer. Given the
- train clicks data, we label each train instance with 1 or 0 depend on if this instance is clicked or
- not.
- :return:
- """
-
- train_data_dict = {}
- with open("./weather.json", 'r') as f:
- weather_dict = json.load(f)
-
- with open(TEST_QUERIES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- train_index_list = []
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "": continue
- if line[1] == "":
- train_index_list.append(line[0] + "_0")
- else:
- train_index_list.append(line[0] + "_" + line[1])
-
- train_index = line[0]
- train_data_dict[train_index] = {}
- train_data_dict[train_index]["pid"] = line[1]
- train_data_dict[train_index]["query"] = {}
-
- reqweekday = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%w")
- reqhour = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%H")
-
- date_key = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%m-%d")
- train_data_dict[train_index]["weather"] = {}
- train_data_dict[train_index]["weather"].update({"max_temp": weather_dict[date_key]["max_temp"]})
- train_data_dict[train_index]["weather"].update({"min_temp": weather_dict[date_key]["min_temp"]})
- train_data_dict[train_index]["weather"].update({"wea": weather_dict[date_key]["weather"]})
- train_data_dict[train_index]["weather"].update({"wind": weather_dict[date_key]["wind"]})
-
- train_data_dict[train_index]["query"].update({"weekday":reqweekday})
- train_data_dict[train_index]["query"].update({"hour":reqhour})
-
- o = line[3].split(',')
- o_first = o[0]
- o_second = o[1]
- train_data_dict[train_index]["query"].update({"o1":float(o_first)})
- train_data_dict[train_index]["query"].update({"o2":float(o_second)})
-
- d = line[4].split(',')
- d_first = d[0]
- d_second = d[1]
- train_data_dict[train_index]["query"].update({"d1":float(d_first)})
- train_data_dict[train_index]["query"].update({"d2":float(d_second)})
-
- plan_map = {}
- plan_data = pd.read_csv(TEST_PLANS_PATH)
- for index, row in plan_data.iterrows():
- plans_str = row['plans']
- plans_list = json.loads(plans_str)
- session_id = str(row['sid'])
- # train_data_dict[session_id]["plans"] = []
- plan_map[session_id] = plans_list
-
- profile_map = {}
- with open(PROFILES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- profile_map[line[0]] = [i for i in range(len(line)) if line[i] == "1.0"]
-
- session_click_map = {}
- with open(TRAIN_CLICK_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "" or line[1] == "" or line[2] == "":
- continue
- session_click_map[line[0]] = line[2]
- #return train_data_dict, profile_map, session_click_map, plan_map
- generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map)
-
-
-def generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map):
- if not os.path.isdir("./out/"):
- os.mkdir("./out/")
- with open(os.path.join("./out/", "test_session.txt"), 'w') as f_train:
- for session_id, plan_list in plan_map.items():
- if session_id not in train_data_dict:
- continue
- cur_map = train_data_dict[session_id]
- cur_map["session_id"] = session_id
- if cur_map["pid"] != "":
- cur_map["profile"] = profile_map[cur_map["pid"]]
- else:
- cur_map["profile"] = [0]
- del cur_map["pid"]
- whole_rank = 0
- for plan in plan_list:
- whole_rank += 1
- cur_map["mode_rank" + str(whole_rank)] = plan["transport_mode"]
-
- if whole_rank < 5:
- for r in range(whole_rank + 1, 6):
- cur_map["mode_rank" + str(r)] = -1
-
- cur_map["whole_rank"] = whole_rank
- flag_click = False
- rank = 1
-
- price_list = []
- eta_list = []
- distance_list = []
- for plan in plan_list:
- if not plan["price"]:
- price_list.append(0)
- else:
- price_list.append(int(plan["price"]))
- eta_list.append(int(plan["eta"]))
- distance_list.append(int(plan["distance"]))
- price_list.sort(reverse=False)
- eta_list.sort(reverse=False)
- distance_list.sort(reverse=False)
-
- for plan in plan_list:
- if plan["price"] and int(plan["price"]) == price_list[0]:
- cur_map["mode_min_price"] = plan["transport_mode"]
- if plan["price"] and int(plan["price"]) == price_list[-1]:
- cur_map["mode_max_price"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[0]:
- cur_map["mode_min_eta"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[-1]:
- cur_map["mode_max_eta"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[0]:
- cur_map["mode_min_distance"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[-1]:
- cur_map["mode_max_distance"] = plan["transport_mode"]
- if "mode_min_price" not in cur_map:
- cur_map["mode_min_price"] = -1
- if "mode_max_price" not in cur_map:
- cur_map["mode_max_price"] = -1
-
-
- for plan in plan_list:
- cur_price = int(plan["price"]) if plan["price"] else 0
- cur_eta = int(plan["eta"])
- cur_distance = int(plan["distance"])
- cur_map["price_rank"] = price_list.index(cur_price) + 1
- cur_map["eta_rank"] = eta_list.index(cur_eta) + 1
- cur_map["distance_rank"] = distance_list.index(cur_distance) + 1
-
- if ("transport_mode" in plan) and (session_id in session_click_map) and (
- int(plan["transport_mode"]) == int(session_click_map[session_id])):
- cur_map["plan"] = plan
- cur_map["label"] = 1
- flag_click = True
- # print("label is 1")
- else:
- cur_map["plan"] = plan
- cur_map["label"] = 0
-
- cur_map["plan_rank"] = rank
- rank += 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["plan_rank"] = 0
- cur_map["price_rank"] = 0
- cur_map["eta_rank"] = 0
- cur_map["plan_rank"] = 0
- cur_map["label"] = 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
- build_norm_feature()
-
-
-if __name__ == "__main__":
- preprocess()
\ No newline at end of file
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_test_dense.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_test_dense.py
deleted file mode 100644
index 58fb483d6395ce3eac236112b648ad86db841e10..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/pre_test_dense.py
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import os, sys, time, random, csv, datetime, json
-import pandas as pd
-import numpy as np
-import argparse
-import logging
-import time
-
-logging.basicConfig(
- format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("preprocess")
-logger.setLevel(logging.INFO)
-
-TRAIN_QUERIES_PATH = "./data_set_phase1/test_queries.csv"
-TRAIN_PLANS_PATH = "./data_set_phase1/test_plans.csv"
-TRAIN_CLICK_PATH = "./data_set_phase1/train_clicks.csv"
-PROFILES_PATH = "./data_set_phase1/profiles.csv"
-
-O1_MIN = 115.47
-O1_MAX = 117.29
-
-O2_MIN = 39.46
-O2_MAX = 40.97
-
-D1_MIN = 115.44
-D1_MAX = 117.37
-
-D2_MIN = 39.46
-D2_MAX = 40.96
-
-DISTANCE_MIN = 1.0
-DISTANCE_MAX = 225864.0
-THRESHOLD_DIS = 200000.0
-
-PRICE_MIN = 200.0
-PRICE_MAX = 92300.0
-THRESHOLD_PRICE = 20000
-
-ETA_MIN = 1.0
-ETA_MAX = 72992.0
-THRESHOLD_ETA = 10800.0
-
-
-def build_norm_feature():
- with open("./out/normed_test_session.txt", 'w') as nf:
- with open("./out/test_session.txt", 'r') as f:
- for line in f:
- cur_map = json.loads(line)
-
- cur_map["plan"]["distance"] = (cur_map["plan"]["distance"] - DISTANCE_MIN) / (DISTANCE_MAX - DISTANCE_MIN)
-
- if cur_map["plan"]["price"]:
- cur_map["plan"]["price"] = (cur_map["plan"]["price"] - PRICE_MIN) / (PRICE_MAX - PRICE_MIN)
- else:
- cur_map["plan"]["price"] = 0.0
-
- cur_map["plan"]["eta"] = (cur_map["plan"]["eta"] - ETA_MIN) / (ETA_MAX - ETA_MIN)
-
- cur_json_instance = json.dumps(cur_map)
- nf.write(cur_json_instance + '\n')
-
-
-def preprocess():
- """
- Construct the train data indexed by session id and mode id jointly. Convert all the raw features (user profile,
- od pair, req time, click time, eta, price, distance, transport mode) to one-hot ids used for
- embedding. We split the one-hot features into two categories: user feature and context feature for
- better understanding of FFM algorithm.
- Note that the user profile is already provided by one-hot encoded form, we convert it back to the
- ids for unity with the context feature and easily using of PaddlePaddle embedding layer. Given the
- train clicks data, we label each train instance with 1 or 0 depend on if this instance is clicked or
- not.
- :return:
- """
- #args = parse_args()
-
- train_data_dict = {}
- with open("./weather.json", 'r') as f:
- weather_dict = json.load(f)
-
- with open(TRAIN_QUERIES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- train_index_list = []
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "": continue
- if line[1] == "":
- train_index_list.append(line[0] + "_0")
- else:
- train_index_list.append(line[0] + "_" + line[1])
-
- train_index = line[0]
- train_data_dict[train_index] = {}
- train_data_dict[train_index]["pid"] = line[1]
- train_data_dict[train_index]["query"] = {}
-
- reqweekday = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%w")
- reqhour = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%H")
-
- date_key = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%m-%d")
- train_data_dict[train_index]["weather"] = {}
- train_data_dict[train_index]["weather"].update({"max_temp": weather_dict[date_key]["max_temp"]})
- train_data_dict[train_index]["weather"].update({"min_temp": weather_dict[date_key]["min_temp"]})
- train_data_dict[train_index]["weather"].update({"wea": weather_dict[date_key]["weather"]})
- train_data_dict[train_index]["weather"].update({"wind": weather_dict[date_key]["wind"]})
-
- train_data_dict[train_index]["query"].update({"weekday":reqweekday})
- train_data_dict[train_index]["query"].update({"hour":reqhour})
-
- o = line[3].split(',')
- o_first = o[0]
- o_second = o[1]
- train_data_dict[train_index]["query"].update({"o1":float(o_first)})
- train_data_dict[train_index]["query"].update({"o2":float(o_second)})
-
- d = line[4].split(',')
- d_first = d[0]
- d_second = d[1]
- train_data_dict[train_index]["query"].update({"d1":float(d_first)})
- train_data_dict[train_index]["query"].update({"d2":float(d_second)})
-
- plan_map = {}
- plan_data = pd.read_csv(TRAIN_PLANS_PATH)
- for index, row in plan_data.iterrows():
- plans_str = row['plans']
- plans_list = json.loads(plans_str)
- session_id = str(row['sid'])
- # train_data_dict[session_id]["plans"] = []
- plan_map[session_id] = plans_list
-
- profile_map = {}
- with open(PROFILES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- profile_map[line[0]] = [i for i in range(len(line)) if line[i] == "1.0"]
-
- session_click_map = {}
- with open(TRAIN_CLICK_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "" or line[1] == "" or line[2] == "":
- continue
- session_click_map[line[0]] = line[2]
- #return train_data_dict, profile_map, session_click_map, plan_map
- generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map)
-
-
-def generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map):
- if not os.path.isdir("./out/"):
- os.mkdir("./out/")
- with open(os.path.join("./out/", "test_session.txt"), 'w') as f_train:
- for session_id, plan_list in plan_map.items():
- if session_id not in train_data_dict:
- continue
- cur_map = train_data_dict[session_id]
- cur_map["session_id"] = session_id
- if cur_map["pid"] != "":
- cur_map["profile"] = profile_map[cur_map["pid"]]
- else:
- cur_map["profile"] = [0]
- # del cur_map["pid"]
- whole_rank = 0
- for plan in plan_list:
- whole_rank += 1
- cur_map["mode_rank" + str(whole_rank)] = plan["transport_mode"]
-
- if whole_rank < 5:
- for r in range(whole_rank + 1, 6):
- cur_map["mode_rank" + str(r)] = -1
-
- cur_map["whole_rank"] = whole_rank
- rank = 1
-
- price_list = []
- eta_list = []
- distance_list = []
- for plan in plan_list:
- if not plan["price"]:
- price_list.append(0)
- else:
- price_list.append(int(plan["price"]))
- eta_list.append(int(plan["eta"]))
- distance_list.append(int(plan["distance"]))
- price_list.sort(reverse=False)
- eta_list.sort(reverse=False)
- distance_list.sort(reverse=False)
-
- for plan in plan_list:
- if plan["price"] and int(plan["price"]) == price_list[0]:
- cur_map["mode_min_price"] = plan["transport_mode"]
- if plan["price"] and int(plan["price"]) == price_list[-1]:
- cur_map["mode_max_price"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[0]:
- cur_map["mode_min_eta"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[-1]:
- cur_map["mode_max_eta"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[0]:
- cur_map["mode_min_distance"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[-1]:
- cur_map["mode_max_distance"] = plan["transport_mode"]
- if "mode_min_price" not in cur_map:
- cur_map["mode_min_price"] = -1
- if "mode_max_price" not in cur_map:
- cur_map["mode_max_price"] = -1
-
- for plan in plan_list:
- cur_price = int(plan["price"]) if plan["price"] else 0
- cur_eta = int(plan["eta"])
- cur_distance = int(plan["distance"])
- cur_map["price_rank"] = price_list.index(cur_price) + 1
- cur_map["eta_rank"] = eta_list.index(cur_eta) + 1
- cur_map["distance_rank"] = distance_list.index(cur_distance) + 1
-
- if ("transport_mode" in plan) and (session_id in session_click_map) and (
- int(plan["transport_mode"]) == int(session_click_map[session_id])):
- cur_map["plan"] = plan
- cur_map["label"] = 1
- else:
- cur_map["plan"] = plan
- cur_map["label"] = 0
-
- cur_map["plan_rank"] = rank
- rank += 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["plan_rank"] = 0
- cur_map["price_rank"] = 0
- cur_map["eta_rank"] = 0
- cur_map["plan_rank"] = 0
- cur_map["label"] = 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
-
- build_norm_feature()
-
-
-if __name__ == "__main__":
- preprocess()
\ No newline at end of file
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess.py
deleted file mode 100644
index 8d61ae55314b860e3d0b1091ed7616b6ee054962..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, sys, time, random, csv, datetime, json
-import pandas as pd
-import numpy as np
-import argparse
-import logging
-import time
-
-logging.basicConfig(
- format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("preprocess")
-logger.setLevel(logging.INFO)
-
-TRAIN_QUERIES_PATH = "./data_set_phase1/train_queries.csv"
-TRAIN_PLANS_PATH = "./data_set_phase1/train_plans.csv"
-TRAIN_CLICK_PATH = "./data_set_phase1/train_clicks.csv"
-PROFILES_PATH = "./data_set_phase1/profiles.csv"
-OUT_NORM_TRAIN_PATH = "./out/normed_train.txt"
-OUT_RAW_TRAIN_PATH = "./out/train.txt"
-
-OUT_DIR = "./out"
-
-
-O1_MIN = 115.47
-O1_MAX = 117.29
-
-O2_MIN = 39.46
-O2_MAX = 40.97
-
-D1_MIN = 115.44
-D1_MAX = 117.37
-
-D2_MIN = 39.46
-D2_MAX = 40.96
-SCALE_OD = 0.02
-
-DISTANCE_MIN = 1.0
-DISTANCE_MAX = 225864.0
-THRESHOLD_DIS = 40000.0
-SCALE_DIS = 500
-
-PRICE_MIN = 200.0
-PRICE_MAX = 92300.0
-THRESHOLD_PRICE = 20000
-SCALE_PRICE = 100
-
-ETA_MIN = 1.0
-ETA_MAX = 72992.0
-THRESHOLD_ETA = 10800.0
-SCALE_ETA = 120
-
-
-def build_norm_feature():
- with open(OUT_NORM_TRAIN_PATH, 'w') as nf:
- with open(OUT_RAW_TRAIN_PATH, 'r') as f:
- for line in f:
- cur_map = json.loads(line)
-
- if cur_map["plan"]["distance"] > THRESHOLD_DIS:
- cur_map["plan"]["distance"] = int(THRESHOLD_DIS)
- elif cur_map["plan"]["distance"] > 0:
- cur_map["plan"]["distance"] = int(cur_map["plan"]["distance"] / SCALE_DIS)
-
- if cur_map["plan"]["price"] and cur_map["plan"]["price"] > THRESHOLD_PRICE:
- cur_map["plan"]["price"] = int(THRESHOLD_PRICE)
- elif not cur_map["plan"]["price"] or cur_map["plan"]["price"] < 0:
- cur_map["plan"]["price"] = 0
- else:
- cur_map["plan"]["price"] = int(cur_map["plan"]["price"] / SCALE_PRICE)
-
- if cur_map["plan"]["eta"] > THRESHOLD_ETA:
- cur_map["plan"]["eta"] = int(THRESHOLD_ETA)
- elif cur_map["plan"]["eta"] > 0:
- cur_map["plan"]["eta"] = int(cur_map["plan"]["eta"] / SCALE_ETA)
-
- # o1
- if cur_map["query"]["o1"] > O1_MAX:
- cur_map["query"]["o1"] = int((O1_MAX - O1_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["o1"] < O1_MIN:
- cur_map["query"]["o1"] = 0
- else:
- cur_map["query"]["o1"] = int((cur_map["query"]["o1"] - O1_MIN) / 0.02)
-
- # o2
- if cur_map["query"]["o2"] > O2_MAX:
- cur_map["query"]["o2"] = int((O2_MAX - O2_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["o2"] < O2_MIN:
- cur_map["query"]["o2"] = 0
- else:
- cur_map["query"]["o2"] = int((cur_map["query"]["o2"] - O2_MIN) / 0.02)
-
- # d1
- if cur_map["query"]["d1"] > D1_MAX:
- cur_map["query"]["d1"] = int((D1_MAX - D1_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["d1"] < D1_MIN:
- cur_map["query"]["d1"] = 0
- else:
- cur_map["query"]["d1"] = int((cur_map["query"]["d1"] - D1_MIN) / SCALE_OD)
-
- # d2
- if cur_map["query"]["d2"] > D2_MAX:
- cur_map["query"]["d2"] = int((D2_MAX - D2_MIN) / SCALE_OD + 1)
- elif cur_map["query"]["d2"] < D2_MIN:
- cur_map["query"]["d2"] = 0
- else:
- cur_map["query"]["d2"] = int((cur_map["query"]["d2"] - D2_MIN) / SCALE_OD)
-
- cur_json_instance = json.dumps(cur_map)
- nf.write(cur_json_instance + '\n')
-
-
-def preprocess():
- """
- Construct the train data indexed by session id and mode id jointly. Convert all the raw features (user profile,
- od pair, req time, click time, eta, price, distance, transport mode) to one-hot ids used for
- embedding. We split the one-hot features into two categories: user feature and context feature for
- better understanding of FM algorithm.
- Note that the user profile is already provided by one-hot encoded form, we treat it as embedded vector
- for unity with the context feature and easily using of PaddlePaddle embedding layer. Given the
- train clicks data, we label each train instance with 1 or 0 depend on if this instance is clicked or
- not include non-click case.
- :return:
- """
-
- train_data_dict = {}
- with open(TRAIN_QUERIES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- train_index_list = []
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "": continue
- if line[1] == "":
- train_index_list.append(line[0] + "_0")
- else:
- train_index_list.append(line[0] + "_" + line[1])
-
- train_index = line[0]
- train_data_dict[train_index] = {}
- train_data_dict[train_index]["pid"] = line[1]
- train_data_dict[train_index]["query"] = {}
-
- reqweekday = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%w")
- reqhour = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%H")
-
- train_data_dict[train_index]["query"].update({"weekday":reqweekday})
- train_data_dict[train_index]["query"].update({"hour":reqhour})
-
- o = line[3].split(',')
- o_first = o[0]
- o_second = o[1]
- train_data_dict[train_index]["query"].update({"o1":float(o_first)})
- train_data_dict[train_index]["query"].update({"o2":float(o_second)})
-
- d = line[4].split(',')
- d_first = d[0]
- d_second = d[1]
- train_data_dict[train_index]["query"].update({"d1":float(d_first)})
- train_data_dict[train_index]["query"].update({"d2":float(d_second)})
-
- plan_map = {}
- plan_data = pd.read_csv(TRAIN_PLANS_PATH)
- for index, row in plan_data.iterrows():
- plans_str = row['plans']
- plans_list = json.loads(plans_str)
- session_id = str(row['sid'])
- # train_data_dict[session_id]["plans"] = []
- plan_map[session_id] = plans_list
-
- profile_map = {}
- with open(PROFILES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- profile_map[line[0]] = [i for i in range(len(line)) if line[i] == "1.0"]
-
- session_click_map = {}
- with open(TRAIN_CLICK_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "" or line[1] == "" or line[2] == "":
- continue
- session_click_map[line[0]] = line[2]
- #return train_data_dict, profile_map, session_click_map, plan_map
- generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map)
-
-
-def generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map):
- if not os.path.isdir(OUT_DIR):
- os.mkdir(OUT_DIR)
- with open(os.path.join("./out/", "train.txt"), 'w') as f_train:
- for session_id, plan_list in plan_map.items():
- if session_id not in train_data_dict:
- continue
- cur_map = train_data_dict[session_id]
- if cur_map["pid"] != "":
- cur_map["profile"] = profile_map[cur_map["pid"]]
- else:
- cur_map["profile"] = [0]
- del cur_map["pid"]
- whole_rank = 0
- for plan in plan_list:
- whole_rank += 1
- cur_map["whole_rank"] = whole_rank
- flag_click = False
- rank = 1
-
-
- for plan in plan_list:
-
- if ("transport_mode" in plan) and (session_id in session_click_map) and (
- int(plan["transport_mode"]) == int(session_click_map[session_id])):
- cur_map["plan"] = plan
- cur_map["label"] = 1
- flag_click = True
- # print("label is 1")
- else:
- cur_map["plan"] = plan
- cur_map["label"] = 0
-
- cur_map["rank"] = rank
- rank += 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
- if not flag_click:
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["rank"] = 0
- cur_map["label"] = 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
- else:
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["rank"] = 0
- cur_map["label"] = 0
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
-
- build_norm_feature()
-
-
-if __name__ == "__main__":
- preprocess()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess_dense.py b/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess_dense.py
deleted file mode 100644
index 10d674c94bb674abb92aa8f2b49c51551c4a976a..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/preprocess_dense.py
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, random, csv, datetime, json
-import pandas as pd
-import numpy as np
-import argparse
-import logging
-import time
-
-logging.basicConfig(
- format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("preprocess")
-logger.setLevel(logging.INFO)
-
-TRAIN_QUERIES_PATH = "./data_set_phase1/train_queries.csv"
-TRAIN_PLANS_PATH = "./data_set_phase1/train_plans.csv"
-TRAIN_CLICK_PATH = "./data_set_phase1/train_clicks.csv"
-PROFILES_PATH = "./data_set_phase1/profiles.csv"
-
-OUT_DIR = "./out"
-ORI_TRAIN_PATH = "train.txt"
-NORM_TRAIN_PATH = "normed_train.txt"
-#variable to control the ratio of positive and negative instance of transmode 0 which is original label of no click
-THRESHOLD_LABEL = 0.5
-
-
-
-O1_MIN = 115.47
-O1_MAX = 117.29
-
-O2_MIN = 39.46
-O2_MAX = 40.97
-
-D1_MIN = 115.44
-D1_MAX = 117.37
-
-D2_MIN = 39.46
-D2_MAX = 40.96
-
-DISTANCE_MIN = 1.0
-DISTANCE_MAX = 225864.0
-THRESHOLD_DIS = 200000.0
-
-PRICE_MIN = 200.0
-PRICE_MAX = 92300.0
-THRESHOLD_PRICE = 20000
-
-ETA_MIN = 1.0
-ETA_MAX = 72992.0
-THRESHOLD_ETA = 10800.0
-
-
-def build_norm_feature():
- with open(os.path.join(OUT_DIR, NORM_TRAIN_PATH), 'w') as nf:
- with open(os.path.join(OUT_DIR, ORI_TRAIN_PATH), 'r') as f:
- for line in f:
- cur_map = json.loads(line)
-
- cur_map["plan"]["distance"] = (cur_map["plan"]["distance"] - DISTANCE_MIN) / (DISTANCE_MAX - DISTANCE_MIN)
-
- if cur_map["plan"]["price"]:
- cur_map["plan"]["price"] = (cur_map["plan"]["price"] - PRICE_MIN) / (PRICE_MAX - PRICE_MIN)
- else:
- cur_map["plan"]["price"] = 0.0
-
- cur_map["plan"]["eta"] = (cur_map["plan"]["eta"] - ETA_MIN) / (ETA_MAX - ETA_MIN)
-
- cur_json_instance = json.dumps(cur_map)
- nf.write(cur_json_instance + '\n')
-
-
-def preprocess():
- """
- Construct the train data indexed by session id and mode id jointly. Convert all the raw features (user profile,
- od pair, req time, click time, eta, price, distance, transport mode) to one-hot ids used for
- embedding. We split the one-hot features into two categories: user feature and context feature for
- better understanding of FM algorithm.
- Note that the user profile is already provided by one-hot encoded form, we treat it as embedded vector
- for unity with the context feature and easily using of PaddlePaddle embedding layer. Given the
- train clicks data, we label each train instance with 1 or 0 depend on if this instance is clicked or
- not include non-click case. To Be Changed
- :return:
- """
-
- train_data_dict = {}
-
- with open("./weather.json", 'r') as f:
- weather_dict = json.load(f)
-
- with open(TRAIN_QUERIES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- train_index_list = []
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "": continue
- if line[1] == "":
- train_index_list.append(line[0] + "_0")
- else:
- train_index_list.append(line[0] + "_" + line[1])
-
- train_index = line[0]
- train_data_dict[train_index] = {}
- train_data_dict[train_index]["pid"] = line[1]
- train_data_dict[train_index]["query"] = {}
- train_data_dict[train_index]["weather"] = {}
-
- reqweekday = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%w")
- reqhour = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%H")
-
- # weather related features, no big use, maybe more detailed weather information is better
- date_key = datetime.datetime.strptime(line[2], '%Y-%m-%d %H:%M:%S').strftime("%m-%d")
- train_data_dict[train_index]["weather"] = {}
- train_data_dict[train_index]["weather"].update({"max_temp": weather_dict[date_key]["max_temp"]})
- train_data_dict[train_index]["weather"].update({"min_temp": weather_dict[date_key]["min_temp"]})
- train_data_dict[train_index]["weather"].update({"wea": weather_dict[date_key]["weather"]})
- train_data_dict[train_index]["weather"].update({"wind": weather_dict[date_key]["wind"]})
-
- train_data_dict[train_index]["query"].update({"weekday":reqweekday})
- train_data_dict[train_index]["query"].update({"hour":reqhour})
-
- o = line[3].split(',')
- o_first = o[0]
- o_second = o[1]
- train_data_dict[train_index]["query"].update({"o1":float(o_first)})
- train_data_dict[train_index]["query"].update({"o2":float(o_second)})
-
- d = line[4].split(',')
- d_first = d[0]
- d_second = d[1]
- train_data_dict[train_index]["query"].update({"d1":float(d_first)})
- train_data_dict[train_index]["query"].update({"d2":float(d_second)})
-
- plan_map = {}
- plan_data = pd.read_csv(TRAIN_PLANS_PATH)
- for index, row in plan_data.iterrows():
- plans_str = row['plans']
- plans_list = json.loads(plans_str)
- session_id = str(row['sid'])
- # train_data_dict[session_id]["plans"] = []
- plan_map[session_id] = plans_list
-
- profile_map = {}
- with open(PROFILES_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- profile_map[line[0]] = [i for i in range(len(line)) if line[i] == "1.0"]
-
- session_click_map = {}
- with open(TRAIN_CLICK_PATH, 'r') as f:
- csv_reader = csv.reader(f, delimiter=',')
- for k, line in enumerate(csv_reader):
- if k == 0: continue
- if line[0] == "" or line[1] == "" or line[2] == "":
- continue
- session_click_map[line[0]] = line[2]
- #return train_data_dict, profile_map, session_click_map, plan_map
- generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map)
-
-
-def generate_sparse_features(train_data_dict, profile_map, session_click_map, plan_map):
- if not os.path.isdir(OUT_DIR):
- os.mkdir(OUT_DIR)
- with open(os.path.join(OUT_DIR, ORI_TRAIN_PATH), 'w') as f_train:
- for session_id, plan_list in plan_map.items():
- if session_id not in train_data_dict:
- continue
- cur_map = train_data_dict[session_id]
- if cur_map["pid"] != "":
- cur_map["profile"] = profile_map[cur_map["pid"]]
- else:
- cur_map["profile"] = [0]
-
- #rank information related feature
- whole_rank = 0
- for plan in plan_list:
- whole_rank += 1
- cur_map["mode_rank" + str(whole_rank)] = plan["transport_mode"]
-
- if whole_rank < 5:
- for r in range(whole_rank + 1, 6):
- cur_map["mode_rank" + str(r)] = -1
-
- cur_map["whole_rank"] = whole_rank
- flag_click = False
- rank = 1
-
- price_list = []
- eta_list = []
- distance_list = []
- for plan in plan_list:
- if not plan["price"]:
- price_list.append(0)
- else:
- price_list.append(int(plan["price"]))
- eta_list.append(int(plan["eta"]))
- distance_list.append(int(plan["distance"]))
- price_list.sort(reverse=False)
- eta_list.sort(reverse=False)
- distance_list.sort(reverse=False)
-
- for plan in plan_list:
- if plan["price"] and int(plan["price"]) == price_list[0]:
- cur_map["mode_min_price"] = plan["transport_mode"]
- if plan["price"] and int(plan["price"]) == price_list[-1]:
- cur_map["mode_max_price"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[0]:
- cur_map["mode_min_eta"] = plan["transport_mode"]
- if int(plan["eta"]) == eta_list[-1]:
- cur_map["mode_max_eta"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[0]:
- cur_map["mode_min_distance"] = plan["transport_mode"]
- if int(plan["distance"]) == distance_list[-1]:
- cur_map["mode_max_distance"] = plan["transport_mode"]
- if "mode_min_price" not in cur_map:
- cur_map["mode_min_price"] = -1
- if "mode_max_price" not in cur_map:
- cur_map["mode_max_price"] = -1
-
- for plan in plan_list:
- if ("transport_mode" in plan) and (session_id in session_click_map) and (
- int(plan["transport_mode"]) == int(session_click_map[session_id])):
- flag_click = True
- if flag_click:
-
- for plan in plan_list:
- cur_price = int(plan["price"]) if plan["price"] else 0
- cur_eta = int(plan["eta"])
- cur_distance = int(plan["distance"])
- cur_map["price_rank"] = price_list.index(cur_price) + 1
- cur_map["eta_rank"] = eta_list.index(cur_eta) + 1
- cur_map["distance_rank"] = distance_list.index(cur_distance) + 1
-
- if ("transport_mode" in plan) and (session_id in session_click_map) and (
- int(plan["transport_mode"]) == int(session_click_map[session_id])):
- cur_map["plan"] = plan
- cur_map["label"] = 1
- else:
- cur_map["plan"] = plan
- cur_map["label"] = 0
-
- cur_map["plan_rank"] = rank
- rank += 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
- cur_map["plan"] = {}
- #since we define a new ctr task from original task, we use a basic way to generate instances of transport mode 0.
- #There should be a optimal strategy to generate instances of transport mode 0
- if not flag_click:
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["plan_rank"] = 0
- cur_map["price_rank"] = 0
- cur_map["eta_rank"] = 0
- cur_map["distance_rank"] = 0
- cur_map["label"] = 1
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
- else:
- if random.random() < THRESHOLD_LABEL:
- cur_map["plan"]["distance"] = -1
- cur_map["plan"]["price"] = -1
- cur_map["plan"]["eta"] = -1
- cur_map["plan"]["transport_mode"] = 0
- cur_map["plan_rank"] = 0
- cur_map["price_rank"] = 0
- cur_map["eta_rank"] = 0
- cur_map["distance_rank"] = 0
- cur_map["label"] = 0
- cur_json_instance = json.dumps(cur_map)
- f_train.write(cur_json_instance + '\n')
-
-
-
- build_norm_feature()
-
-
-if __name__ == "__main__":
- preprocess()
diff --git a/PaddleRec/ctr/Paddle_baseline_KDD2019/weather.json b/PaddleRec/ctr/Paddle_baseline_KDD2019/weather.json
deleted file mode 100644
index 0d0f17f93b637a4d6d79b987d119bdb4dbab933f..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/Paddle_baseline_KDD2019/weather.json
+++ /dev/null
@@ -1 +0,0 @@
-{"10-01": {"max_temp": "24", "min_temp": "12", "weather": "q", "wind": "45"}, "10-02": {"max_temp": "24", "min_temp": "11", "weather": "q", "wind": "12"}, "10-03": {"max_temp": "25", "min_temp": "10", "weather": "q", "wind": "12"}, "10-04": {"max_temp": "25", "min_temp": "12", "weather": "q", "wind": "12"}, "10-05": {"max_temp": "24", "min_temp": "14", "weather": "dy", "wind": "12"}, "10-06": {"max_temp": "20", "min_temp": "8", "weather": "q", "wind": "45"}, "10-07": {"max_temp": "21", "min_temp": "7", "weather": "q", "wind": "12"}, "10-08": {"max_temp": "21", "min_temp": "8", "weather": "dy", "wind": "12"}, "10-09": {"max_temp": "15", "min_temp": "4", "weather": "dyq", "wind": "45"}, "10-10": {"max_temp": "17", "min_temp": "4", "weather": "dyq", "wind": "12"}, "10-11": {"max_temp": "18", "min_temp": "5", "weather": "qdy", "wind": "12"}, "10-12": {"max_temp": "20", "min_temp": "5", "weather": "dyq", "wind": "12"}, "10-13": {"max_temp": "20", "min_temp": "8", "weather": "dy", "wind": "12"}, "10-14": {"max_temp": "21", "min_temp": "10", "weather": "dy", "wind": "12"}, "10-15": {"max_temp": "17", "min_temp": "11", "weather": "xq", "wind": "12"}, "10-16": {"max_temp": "17", "min_temp": "7", "weather": "dyq", "wind": "12"}, "10-17": {"max_temp": "17", "min_temp": "5", "weather": "q", "wind": "12"}, "10-18": {"max_temp": "18", "min_temp": "5", "weather": "q", "wind": "12"}, "10-19": {"max_temp": "19", "min_temp": "7", "weather": "dy", "wind": "12"}, "10-20": {"max_temp": "18", "min_temp": "7", "weather": "dy", "wind": "12"}, "10-21": {"max_temp": "18", "min_temp": "7", "weather": "dy", "wind": "12"}, "10-22": {"max_temp": "19", "min_temp": "5", "weather": "dyq", "wind": "12"}, "10-23": {"max_temp": "19", "min_temp": "4", "weather": "q", "wind": "34"}, "10-24": {"max_temp": "20", "min_temp": "6", "weather": "qdy", "wind": "12"}, "10-25": {"max_temp": "15", "min_temp": "8", "weather": "dy", "wind": "12"}, "10-26": {"max_temp": "14", "min_temp": "3", "weather": "q", "wind": "45"}, "10-27": {"max_temp": "17", "min_temp": "5", "weather": "dy", "wind": "12"}, "10-28": {"max_temp": "17", "min_temp": "4", "weather": "dyq", "wind": "45"}, "10-29": {"max_temp": "15", "min_temp": "3", "weather": "q", "wind": "34"}, "10-30": {"max_temp": "16", "min_temp": "1", "weather": "q", "wind": "12"}, "10-31": {"max_temp": "17", "min_temp": "3", "weather": "q", "wind": "12"}, "11-01": {"max_temp": "17", "min_temp": "3", "weather": "q", "wind": "12"}, "11-02": {"max_temp": "18", "min_temp": "4", "weather": "q", "wind": "12"}, "11-03": {"max_temp": "16", "min_temp": "6", "weather": "dy", "wind": "12"}, "11-04": {"max_temp": "10", "min_temp": "2", "weather": "xydy", "wind": "34"}, "11-05": {"max_temp": "10", "min_temp": "2", "weather": "dy", "wind": "12"}, "11-06": {"max_temp": "12", "min_temp": "0", "weather": "dy", "wind": "12"}, "11-07": {"max_temp": "13", "min_temp": "3", "weather": "dy", "wind": "12"}, "11-08": {"max_temp": "14", "min_temp": "2", "weather": "dy", "wind": "12"}, "11-09": {"max_temp": "15", "min_temp": "1", "weather": "qdy", "wind": "34"}, "11-10": {"max_temp": "11", "min_temp": "0", "weather": "dy", "wind": "12"}, "11-11": {"max_temp": "13", "min_temp": "1", "weather": "dyq", "wind": "12"}, "11-12": {"max_temp": "14", "min_temp": "2", "weather": "q", "wind": "12"}, "11-13": {"max_temp": "13", "min_temp": "5", "weather": "dy", "wind": "12"}, "11-14": {"max_temp": "13", "min_temp": "5", "weather": "dy", "wind": "12"}, "11-15": {"max_temp": "8", "min_temp": "1", "weather": "xydy", "wind": "34"}, "11-16": {"max_temp": "8", "min_temp": "-1", "weather": "q", "wind": "12"}, "11-17": {"max_temp": "9", "min_temp": "-2", "weather": "dyq", "wind": "12"}, "11-18": {"max_temp": "11", "min_temp": "-3", "weather": "q", "wind": "34"}, "11-19": {"max_temp": "10", "min_temp": "-2", "weather": "qdy", "wind": "12"}, "11-20": {"max_temp": "9", "min_temp": "-1", "weather": "dy", "wind": "12"}, "11-21": {"max_temp": "9", "min_temp": "-3", "weather": "q", "wind": "2"}, "11-22": {"max_temp": "8", "min_temp": "-3", "weather": "qdy", "wind": "1"}, "11-23": {"max_temp": "7", "min_temp": "0", "weather": "dy", "wind": "2"}, "11-24": {"max_temp": "9", "min_temp": "-3", "weather": "qdy", "wind": "2"}, "11-25": {"max_temp": "10", "min_temp": "-3", "weather": "q", "wind": "1"}, "11-26": {"max_temp": "10", "min_temp": "0", "weather": "dy", "wind": "1"}, "11-27": {"max_temp": "9", "min_temp": "-3", "weather": "qdy", "wind": "2"}, "11-28": {"max_temp": "8", "min_temp": "-3", "weather": "q", "wind": "1"}, "11-29": {"max_temp": "7", "min_temp": "-4", "weather": "q", "wind": "1"}, "11-30": {"max_temp": "8", "min_temp": "-3", "weather": "q", "wind": "1"}, "12-01": {"max_temp": "7", "min_temp": "0", "weather": "dy", "wind": "1"}, "12-02": {"max_temp": "9", "min_temp": "2", "weather": "dy", "wind": "1"}, "12-03": {"max_temp": "8", "min_temp": "-3", "weather": "dyq", "wind": "3"}, "12-04": {"max_temp": "4", "min_temp": "-6", "weather": "qdy", "wind": "2"}, "12-05": {"max_temp": "1", "min_temp": "-4", "weather": "dy", "wind": "1"}, "12-06": {"max_temp": "-2", "min_temp": "-9", "weather": "q", "wind": "3"}, "12-07": {"max_temp": "-4", "min_temp": "-10", "weather": "q", "wind": "3"}, "12-08": {"max_temp": "-2", "min_temp": "-10", "weather": "qdy", "wind": "2"}, "12-09": {"max_temp": "-1", "min_temp": "-10", "weather": "dyq", "wind": "1"}}
\ No newline at end of file
diff --git a/PaddleRec/ctr/dcn/cluster_train.py b/PaddleRec/ctr/dcn/cluster_train.py
deleted file mode 100644
index e791727b30db7e3ed6cefcd558e00b95b4e427fe..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/dcn/cluster_train.py
+++ /dev/null
@@ -1,205 +0,0 @@
-import argparse
-import os
-import sys
-import time
-from collections import OrderedDict
-
-import paddle.fluid as fluid
-
-from network import DCN
-import utils
-
-
-def boolean_string(s):
- if s.lower() not in {'false', 'true'}:
- raise ValueError('Not a valid boolean string')
- return s.lower() == 'true'
-
-
-def parse_args():
- parser = argparse.ArgumentParser("dcn cluster train.")
- parser.add_argument(
- '--train_data_dir',
- type=str,
- default='dist_data/dist_train_data',
- help='The path of train data')
- parser.add_argument(
- '--test_valid_data_dir',
- type=str,
- default='dist_data/dist_test_valid_data',
- help='The path of test and valid data')
- parser.add_argument(
- '--vocab_dir',
- type=str,
- default='dist_data/vocab',
- help='The path of generated vocabs')
- parser.add_argument(
- '--cat_feat_num',
- type=str,
- default='dist_data/cat_feature_num.txt',
- help='The path of generated cat_feature_num.txt')
- parser.add_argument(
- '--batch_size', type=int, default=512, help="Batch size")
- parser.add_argument('--num_epoch', type=int, default=10, help="train epoch")
- parser.add_argument(
- '--model_output_dir',
- type=str,
- default='models',
- help='The path for model to store')
- parser.add_argument(
- '--num_thread', type=int, default=1, help='The number of threads')
- parser.add_argument('--test_epoch', type=str, default='1')
- parser.add_argument(
- '--dnn_hidden_units',
- nargs='+',
- type=int,
- default=[1024, 1024],
- help='DNN layers and hidden units')
- parser.add_argument(
- '--cross_num',
- type=int,
- default=6,
- help='The number of Cross network layers')
- parser.add_argument('--lr', type=float, default=1e-4, help='Learning rate')
- parser.add_argument(
- '--l2_reg_cross',
- type=float,
- default=1e-5,
- help='Cross net l2 regularizer coefficient')
- parser.add_argument(
- '--use_bn',
- type=boolean_string,
- default=True,
- help='Whether use batch norm in dnn part')
- parser.add_argument(
- '--is_sparse',
- action='store_true',
- required=False,
- default=False,
- help='embedding will use sparse or not, (default: False)')
- parser.add_argument(
- '--clip_by_norm', type=float, default=100.0, help="gradient clip norm")
- parser.add_argument('--print_steps', type=int, default=5)
- parser.add_argument('--use_gpu', type=int, default=1)
-
- # dist params
- parser.add_argument('--is_local', type=int, default=1, help='whether local')
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-
-def train():
- """ do training """
- args = parse_args()
- print(args)
-
- if args.trainer_id == 0 and not os.path.isdir(args.model_output_dir):
- os.mkdir(args.model_output_dir)
-
- cat_feat_dims_dict = OrderedDict()
- for line in open(args.cat_feat_num):
- spls = line.strip().split()
- assert len(spls) == 2
- cat_feat_dims_dict[spls[0]] = int(spls[1])
-
- dcn_model = DCN(args.cross_num, args.dnn_hidden_units, args.l2_reg_cross,
- args.use_bn, args.clip_by_norm, cat_feat_dims_dict,
- args.is_sparse)
- dcn_model.build_network()
- optimizer = fluid.optimizer.Adam(learning_rate=args.lr)
- optimizer.minimize(dcn_model.loss)
-
- def train_loop(main_program):
- """ train network """
- start_time = time.time()
- dataset = fluid.DatasetFactory().create_dataset()
- dataset.set_use_var(dcn_model.data_list)
- pipe_command = 'python reader.py {}'.format(args.vocab_dir)
- dataset.set_pipe_command(pipe_command)
- dataset.set_batch_size(args.batch_size)
- dataset.set_thread(args.num_thread)
- train_filelist = [
- os.path.join(args.train_data_dir, fname)
- for fname in next(os.walk(args.train_data_dir))[2]
- ]
- dataset.set_filelist(train_filelist)
-
- if args.use_gpu == 1:
- exe = fluid.Executor(fluid.CUDAPlace(0))
- dataset.set_thread(1)
- else:
- exe = fluid.Executor(fluid.CPUPlace())
- dataset.set_thread(args.num_thread)
- exe.run(fluid.default_startup_program())
-
- for epoch_id in range(args.num_epoch):
- start = time.time()
- sys.stderr.write('\nepoch%d start ...\n' % (epoch_id + 1))
- exe.train_from_dataset(
- program=main_program,
- dataset=dataset,
- fetch_list=[
- dcn_model.loss, dcn_model.avg_logloss, dcn_model.auc_var
- ],
- fetch_info=['total_loss', 'avg_logloss', 'auc'],
- debug=False,
- print_period=args.print_steps)
- model_dir = os.path.join(args.model_output_dir,
- 'epoch_' + str(epoch_id + 1), "checkpoint")
- sys.stderr.write('epoch%d is finished and takes %f s\n' % (
- (epoch_id + 1), time.time() - start))
- if args.trainer_id == 0: # only trainer 0 save model
- print("save model in {}".format(model_dir))
- fluid.save(main_program, model_dir)
-
- print("train time cost {:.4f}".format(time.time() - start_time))
- print("finish training")
-
- if args.is_local:
- print("run local training")
- train_loop(fluid.default_main_program())
- else:
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog, pserver_startup = t.get_pserver_programs(
- args.current_endpoint)
-
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program())
-
-
-if __name__ == "__main__":
- utils.check_version()
- train()
diff --git a/PaddleRec/ctr/dcn/cluster_train.sh b/PaddleRec/ctr/dcn/cluster_train.sh
deleted file mode 100755
index 4088a8af906ec033168701a8b8805ad3846b634a..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/dcn/cluster_train.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
-
-echo "2 pservers and 2 trainers started."
\ No newline at end of file
diff --git a/PaddleRec/ctr/dcn/network.py b/PaddleRec/ctr/dcn/network.py
index ffa399edc61134146b3cca33d1e5f0adfc733659..8dd6503847fd46ccdebc3f75887173201fab15e1 100644
--- a/PaddleRec/ctr/dcn/network.py
+++ b/PaddleRec/ctr/dcn/network.py
@@ -76,11 +76,10 @@ class DCN(object):
def backward(self, lr):
p_g_clip = fluid.backward.append_backward(loss=self.loss)
- fluid.clip.set_gradient_clip(
- fluid.clip.GradientClipByGlobalNorm(clip_norm=self.clip_by_norm))
+ clip = fluid.clip.GradientClipByGlobalNorm(clip_norm=self.clip_by_norm)
p_g_clip = fluid.clip.append_gradient_clip_ops(p_g_clip)
- optimizer = fluid.optimizer.Adam(learning_rate=lr)
+ optimizer = fluid.optimizer.Adam(learning_rate=lr, grad_clip=clip)
# params_grads = optimizer.backward(self.loss)
optimizer.apply_gradients(p_g_clip)
diff --git a/PaddleRec/ctr/dcn/reader.py b/PaddleRec/ctr/dcn/reader.py
index 291fc988edb3683aec5ef529ec78fbd87897fc72..d121f9fd3c8104ba8c24f320f184ffd282488080 100644
--- a/PaddleRec/ctr/dcn/reader.py
+++ b/PaddleRec/ctr/dcn/reader.py
@@ -72,8 +72,8 @@ class CriteoDataset(dg.MultiSlotDataGenerator):
yield label_feat_list
import paddle
- batch_iter = paddle.batch(
- paddle.reader.buffered(
+ batch_iter = fluid.io.batch(
+ fluid.io.buffered(
local_iter, size=buf_size), batch_size=batch)
return batch_iter
diff --git a/PaddleRec/ctr/deepfm/cluster_train.py b/PaddleRec/ctr/deepfm/cluster_train.py
deleted file mode 100644
index da565172c16be7bd3aa0533d4bdd5053cf79f937..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/deepfm/cluster_train.py
+++ /dev/null
@@ -1,193 +0,0 @@
-import argparse
-import os
-import sys
-import time
-from network_conf import ctr_deepfm_model
-
-import paddle.fluid as fluid
-import utils
-
-
-def parse_args():
- parser = argparse.ArgumentParser("deepfm cluster train.")
-
- parser.add_argument(
- '--train_data_dir',
- type=str,
- default='dist_data/dist_train_data',
- help='The path of train data (default: data/train_data)')
- parser.add_argument(
- '--test_data_dir',
- type=str,
- default='dist_data/dist_test_data',
- help='The path of test data (default: models)')
- parser.add_argument(
- '--feat_dict',
- type=str,
- default='dist_data/aid_data/feat_dict_10.pkl2',
- help='The path of feat_dict')
- parser.add_argument(
- '--batch_size',
- type=int,
- default=100,
- help="The size of mini-batch (default:100)")
- parser.add_argument(
- '--embedding_size',
- type=int,
- default=10,
- help="The size for embedding layer (default:10)")
- parser.add_argument(
- '--num_epoch',
- type=int,
- default=10,
- help="The number of epochs to train (default: 50)")
- parser.add_argument(
- '--model_output_dir',
- type=str,
- required=True,
- help='The path for model to store (default: models)')
- parser.add_argument(
- '--num_thread',
- type=int,
- default=1,
- help='The number of threads (default: 1)')
- parser.add_argument('--test_epoch', type=str, default='1')
- parser.add_argument(
- '--layer_sizes',
- nargs='+',
- type=int,
- default=[400, 400, 400],
- help='The size of each layers (default: [10, 10, 10])')
- parser.add_argument(
- '--act',
- type=str,
- default='relu',
- help='The activation of each layers (default: relu)')
- parser.add_argument(
- '--is_sparse',
- action='store_true',
- required=False,
- default=False,
- help='embedding will use sparse or not, (default: False)')
- parser.add_argument(
- '--lr', type=float, default=1e-4, help='Learning rate (default: 1e-4)')
- parser.add_argument(
- '--reg', type=float, default=1e-4, help=' (default: 1e-4)')
- parser.add_argument('--num_field', type=int, default=39)
- parser.add_argument('--num_feat', type=int, default=141443)
- parser.add_argument('--use_gpu', type=int, default=1)
-
- # dist params
- parser.add_argument('--is_local', type=int, default=1, help='whether local')
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-
-def train():
- """ do training """
- args = parse_args()
- print(args)
-
- if args.trainer_id == 0 and not os.path.isdir(args.model_output_dir):
- os.mkdir(args.model_output_dir)
-
- loss, auc, data_list, auc_states = ctr_deepfm_model(
- args.embedding_size, args.num_field, args.num_feat, args.layer_sizes,
- args.act, args.reg, args.is_sparse)
- optimizer = fluid.optimizer.SGD(
- learning_rate=args.lr,
- regularization=fluid.regularizer.L2DecayRegularizer(args.reg))
- optimizer.minimize(loss)
-
- def train_loop(main_program):
- """ train network """
- start_time = time.time()
- dataset = fluid.DatasetFactory().create_dataset()
- dataset.set_use_var(data_list)
- pipe_command = 'python criteo_reader.py {}'.format(args.feat_dict)
- dataset.set_pipe_command(pipe_command)
- dataset.set_batch_size(args.batch_size)
- dataset.set_thread(args.num_thread)
- train_filelist = [
- os.path.join(args.train_data_dir, x)
- for x in os.listdir(args.train_data_dir)
- ]
-
- if args.use_gpu == 1:
- exe = fluid.Executor(fluid.CUDAPlace(0))
- dataset.set_thread(1)
- else:
- exe = fluid.Executor(fluid.CPUPlace())
- dataset.set_thread(args.num_thread)
- exe.run(fluid.default_startup_program())
-
- for epoch_id in range(args.num_epoch):
- start = time.time()
- sys.stderr.write('\nepoch%d start ...\n' % (epoch_id + 1))
- dataset.set_filelist(train_filelist)
- exe.train_from_dataset(
- program=main_program,
- dataset=dataset,
- fetch_list=[loss, auc],
- fetch_info=['epoch %d batch loss' % (epoch_id + 1), "auc"],
- print_period=5,
- debug=False)
- model_dir = os.path.join(args.model_output_dir,
- 'epoch_' + str(epoch_id + 1))
- sys.stderr.write('epoch%d is finished and takes %f s\n' % (
- (epoch_id + 1), time.time() - start))
- if args.trainer_id == 0: # only trainer 0 save model
- print("save model in {}".format(model_dir))
- fluid.save(main_program, model_dir)
-
- print("train time cost {:.4f}".format(time.time() - start_time))
- print("finish training")
-
- if args.is_local:
- print("run local training")
- train_loop(fluid.default_main_program())
- else:
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog, pserver_startup = t.get_pserver_programs(
- args.current_endpoint)
-
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program())
-
-
-if __name__ == "__main__":
- utils.check_version()
- train()
diff --git a/PaddleRec/ctr/deepfm/cluster_train.sh b/PaddleRec/ctr/deepfm/cluster_train.sh
deleted file mode 100755
index 4088a8af906ec033168701a8b8805ad3846b634a..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/deepfm/cluster_train.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir dist_data/dist_train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
-
-echo "2 pservers and 2 trainers started."
\ No newline at end of file
diff --git a/PaddleRec/ctr/deepfm/infer.py b/PaddleRec/ctr/deepfm/infer.py
index 9ff58af7dc80cec637d590638b62ca4d300939ea..22b9a95eeb2e79258c89ce9cb51078d550685c10 100644
--- a/PaddleRec/ctr/deepfm/infer.py
+++ b/PaddleRec/ctr/deepfm/infer.py
@@ -30,7 +30,7 @@ def infer():
]
criteo_dataset = CriteoDataset()
criteo_dataset.setup(args.feat_dict)
- test_reader = paddle.batch(
+ test_reader = fluid.io.batch(
criteo_dataset.test(test_files), batch_size=args.batch_size)
startup_program = fluid.framework.Program()
diff --git a/PaddleRec/ctr/deepfm_dygraph/data_reader.py b/PaddleRec/ctr/deepfm_dygraph/data_reader.py
index 7c9d9abcd8f1b64adf903703f5eec995e04016ae..0cd800cb7c9cf510c97f68d61263df949f53bf60 100644
--- a/PaddleRec/ctr/deepfm_dygraph/data_reader.py
+++ b/PaddleRec/ctr/deepfm_dygraph/data_reader.py
@@ -6,6 +6,7 @@ import pickle
import random
import paddle
+import paddle.fluid as fluid
class DataGenerator(object):
@@ -58,7 +59,7 @@ class DataGenerator(object):
if not cycle:
break
- return paddle.batch(_reader, batch_size=batch_size)
+ return fluid.io.batch(_reader, batch_size=batch_size)
def data_reader(batch_size,
diff --git a/PaddleRec/ctr/din/README.md b/PaddleRec/ctr/din/README.md
index 8644a75c8053769049031aab415f86f71f171138..ea8585c0c5bf459771c81ea90d6d5a4d5c8771d7 100644
--- a/PaddleRec/ctr/din/README.md
+++ b/PaddleRec/ctr/din/README.md
@@ -8,8 +8,6 @@
├── train.py # 训练脚本
├── infer.py # 预测脚本
├── network.py # 网络结构
-├── cluster_train.py # 多机训练
-├── cluster_train.sh # 多机训练脚本
├── reader.py # 和读取数据相关的函数
├── data/
├── build_dataset.py # 文本数据转化为paddle数据
@@ -129,12 +127,3 @@ CUDA_VISIBLE_DEVICES=3 python infer.py --model_path 'din_amazon/global_step_4000
```text
2019-02-22 11:22:58,804 - INFO - TEST --> loss: [0.47005194] auc:0.863794952818
```
-
-
-## 多机训练
-可参考cluster_train.py 配置多机环境
-
-运行命令本地模拟多机场景
-```
-sh cluster_train.sh
-```
diff --git a/PaddleRec/ctr/din/cluster_train.py b/PaddleRec/ctr/din/cluster_train.py
deleted file mode 100644
index 6b3272366fa674c2bfaa6454beb2c93de1545a4f..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/din/cluster_train.py
+++ /dev/null
@@ -1,172 +0,0 @@
-import sys
-import logging
-import time
-import numpy as np
-import argparse
-import paddle.fluid as fluid
-import paddle
-import time
-import network
-import reader
-import random
-
-logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger("fluid")
-logger.setLevel(logging.INFO)
-
-
-def parse_args():
- parser = argparse.ArgumentParser("din")
- parser.add_argument(
- '--config_path',
- type=str,
- default='data/config.txt',
- help='dir of config')
- parser.add_argument(
- '--train_dir',
- type=str,
- default='data/paddle_train.txt',
- help='dir of train file')
- parser.add_argument(
- '--model_dir',
- type=str,
- default='din_amazon/',
- help='dir of saved model')
- parser.add_argument(
- '--batch_size', type=int, default=16, help='number of batch size')
- parser.add_argument(
- '--epoch_num', type=int, default=200, help='number of epoch')
- parser.add_argument(
- '--use_cuda', type=int, default=0, help='whether to use gpu')
- parser.add_argument(
- '--parallel',
- type=int,
- default=0,
- help='whether to use parallel executor')
- parser.add_argument(
- '--base_lr', type=float, default=0.85, help='based learning rate')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-
-def train():
- args = parse_args()
-
- config_path = args.config_path
- train_path = args.train_dir
- epoch_num = args.epoch_num
- use_cuda = True if args.use_cuda else False
- use_parallel = True if args.parallel else False
-
- logger.info("reading data begins")
- user_count, item_count, cat_count = reader.config_read(config_path)
- #data_reader, max_len = reader.prepare_reader(train_path, args.batch_size)
- logger.info("reading data completes")
-
- avg_cost, pred = network.network(item_count, cat_count, 433)
- #fluid.clip.set_gradient_clip(clip=fluid.clip.GradientClipByGlobalNorm(clip_norm=5.0))
- base_lr = args.base_lr
- boundaries = [410000]
- values = [base_lr, 0.2]
- sgd_optimizer = fluid.optimizer.SGD(
- learning_rate=fluid.layers.piecewise_decay(
- boundaries=boundaries, values=values))
- sgd_optimizer.minimize(avg_cost)
-
- def train_loop(main_program):
- data_reader, max_len = reader.prepare_reader(train_path,
- args.batch_size)
- place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
- exe = fluid.Executor(place)
- exe.run(fluid.default_startup_program())
- feeder = fluid.DataFeeder(
- feed_list=[
- "hist_item_seq", "hist_cat_seq", "target_item", "target_cat",
- "label", "mask", "target_item_seq", "target_cat_seq"
- ],
- place=place)
- if use_parallel:
- train_exe = fluid.ParallelExecutor(
- use_cuda=use_cuda,
- loss_name=avg_cost.name,
- main_program=main_program)
- else:
- train_exe = exe
- logger.info("train begins")
- global_step = 0
- PRINT_STEP = 1000
-
- start_time = time.time()
- loss_sum = 0.0
- for id in range(epoch_num):
- epoch = id + 1
- for data in data_reader():
- global_step += 1
- results = train_exe.run(main_program,
- feed=feeder.feed(data),
- fetch_list=[avg_cost.name, pred.name],
- return_numpy=True)
- loss_sum += results[0].mean()
-
- if global_step % PRINT_STEP == 0:
- logger.info(
- "epoch: %d\tglobal_step: %d\ttrain_loss: %.4f\t\ttime: %.2f"
- % (epoch, global_step, loss_sum / PRINT_STEP,
- time.time() - start_time))
- start_time = time.time()
- loss_sum = 0.0
-
- if (global_step > 400000 and
- global_step % PRINT_STEP == 0) or (
- global_step < 400000 and
- global_step % 50000 == 0):
- save_dir = args.model_dir + "/global_step_" + str(
- global_step)
- feed_var_name = [
- "hist_item_seq", "hist_cat_seq", "target_item",
- "target_cat", "label", "mask", "target_item_seq",
- "target_cat_seq"
- ]
- fetch_vars = [avg_cost, pred]
- fluid.io.save_inference_model(save_dir, feed_var_name,
- fetch_vars, exe)
- train_exe.close()
-
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- logger.info("run psever")
- prog, startup = t.get_pserver_programs(args.current_endpoint)
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(startup)
- exe.run(prog)
- elif args.role == "trainer":
- logger.info("run trainer")
- train_loop(t.get_trainer_program())
-
-
-if __name__ == "__main__":
- train()
diff --git a/PaddleRec/ctr/din/cluster_train.sh b/PaddleRec/ctr/din/cluster_train.sh
deleted file mode 100644
index 76115c825423f5de4a1114be863cc7ec40bad0b4..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/din/cluster_train.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-python -u cluster_train.py \
---config_path 'data/config.txt' \
---train_dir 'data/paddle_train.txt' \
---batch_size 32 \
---epoch_num 100 \
---use_cuda 0 \
---parallel 0 \
---role pserver \
---endpoints 127.0.0.1:6000,127.0.0.1:6001 \
---current_endpoint 127.0.0.1:6000 \
---trainers 2 \
-> pserver0.log 2>&1 &
-
-python -u cluster_train.py \
---config_path 'data/config.txt' \
---train_dir 'data/paddle_train.txt' \
---batch_size 32 \
---epoch_num 100 \
---use_cuda 0 \
---parallel 0 \
---role pserver \
---endpoints 127.0.0.1:6000,127.0.0.1:6001 \
---current_endpoint 127.0.0.1:6001 \
---trainers 2 \
-> pserver1.log 2>&1 &
-
-python -u cluster_train.py \
---config_path 'data/config.txt' \
---train_dir 'data/paddle_train.txt' \
---batch_size 32 \
---epoch_num 100 \
---use_cuda 0 \
---parallel 0 \
---role trainer \
---endpoints 127.0.0.1:6000,127.0.0.1:6001 \
---trainers 2 \
---trainer_id 0 \
-> trainer0.log 2>&1 &
-
-python -u cluster_train.py \
---config_path 'data/config.txt' \
---train_dir 'data/paddle_train.txt' \
---batch_size 32 \
---epoch_num 100 \
---use_cuda 0 \
---parallel 0 \
---role trainer \
---endpoints 127.0.0.1:6000,127.0.0.1:6001 \
---trainers 2 \
---trainer_id 1 \
-> trainer1.log 2>&1 &
diff --git a/PaddleRec/ctr/din/train.py b/PaddleRec/ctr/din/train.py
index a519721101b14f4d6de717f8a1f061ece5e85e7f..4461eb6729fbb262d8265c9fc6ca1eff172ea3e2 100644
--- a/PaddleRec/ctr/din/train.py
+++ b/PaddleRec/ctr/din/train.py
@@ -92,14 +92,15 @@ def train():
logger.info("reading data completes")
avg_cost, pred, feed_list = network.network(item_count, cat_count)
- fluid.clip.set_gradient_clip(clip=fluid.clip.GradientClipByGlobalNorm(
- clip_norm=5.0))
+
+ clip = fluid.clip.GradientClipByGlobalNorm(clip_norm=5.0)
base_lr = args.base_lr
boundaries = [410000]
values = [base_lr, 0.2]
sgd_optimizer = fluid.optimizer.SGD(
learning_rate=fluid.layers.piecewise_decay(
- boundaries=boundaries, values=values))
+ boundaries=boundaries, values=values),
+ grad_clip=clip)
sgd_optimizer.minimize(avg_cost)
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
diff --git a/PaddleRec/ctr/dnn/README.md b/PaddleRec/ctr/dnn/README.md
index fdfdb1c4d0e1c2ba4f13d21aea6c94b461263d57..989de5a0f7064e046537836e1b3aec6150d9d98c 100644
--- a/PaddleRec/ctr/dnn/README.md
+++ b/PaddleRec/ctr/dnn/README.md
@@ -154,7 +154,7 @@ def embedding_layer(input):
return fluid.layers.embedding(
input=input,
is_sparse=True,
- size=[args.sparse_feature_dim,
+ size=[args.sparse_feature_dim,
args.embedding_size],
param_attr=fluid.ParamAttr(
name="SparseFeatFactors",
@@ -168,7 +168,7 @@ sparse_embed_seq = list(map(embedding_layer, inputs[1:-1])) # [C1~C26]
将离散数据通过embedding查表得到的值,与连续数据的输入进行`concat`操作,合为一个整体输入,作为全链接层的原始输入。我们共设计了3层FC,每层FC的输出维度都为400,每层FC都后接一个`relu`激活函数,每层FC的初始化方式为符合正态分布的随机初始化,标准差与上一层的输出维度的平方根成反比。
```python
concated = fluid.layers.concat(sparse_embed_seq + inputs[0:1], axis=1)
-
+
fc1 = fluid.layers.fc(
input=concated,
size=400,
@@ -271,9 +271,9 @@ continuous_range_ = range(1, 14)
categorical_range_ = range(14, 40)
class CriteoDataset(dg.MultiSlotDataGenerator):
-
+
def generate_sample(self, line):
-
+
def reader():
features = line.rstrip('\n').split('\t')
dense_feature = []
@@ -363,12 +363,12 @@ fleet.init(role) #必不可少的步骤,初始化节点!
> PaddleCloudRoleMaker()是怎样判断当前节点所扮演的角色的?
->
+>
> Paddle参数服务器模式中,使用各个节点机器的环境变量来确定当前节点的角色。为了能准确无误的分配角色,在每个节点上,我们都需要指定如下环境变量:
> #### 共有的环境变量
> - export PADDLE_TRAINERS_NUM=2 # 训练节点数
> - export PADDLE_PSERVERS_IP_PORT_LIST="127.0.0.1:36011,127.0.0.1:36012" # 各个pserver的ip:port 组合构成的字符串
->
+>
> #### Pserver特有的环境变量
> - export TRAINING_ROLE=PSERVER # 当前节点的角色是PSERVER
> - export PADDLE_PORT=36011 # 当前PSERVER的通信端口
@@ -376,7 +376,7 @@ fleet.init(role) #必不可少的步骤,初始化节点!
> #### Trainer特有的环境变量
> - export TRAINING_ROLE=TRAINER # 当前节点的角色是TRAINER
> - export PADDLE_TRAINER_ID=0 # 当前Trainer节点的编号,范围为[0,PADDLE_TRAINERS_NUM)
->
+>
> 完成上述环境变量指定后,`PaddleCloudRoleMaker()`便可以正常的运行,决定当前节点的角色。
@@ -388,7 +388,7 @@ Paddle的`参数服务器`模式分布式训练有很多种类型,根据通信
ctr_model = CTR()
inputs = ctr_model.input_data(args)
avg_cost, auc_var, batch_auc_var = ctr_model.net(inputs,args)
-
+
# 选择反向更新优化策略
optimizer = fluid.optimizer.Adam(args.learning_rate)
optimizer.minimize(avg_cost)
@@ -431,7 +431,7 @@ if fleet.is_server():
fleet.run_server()
```
- 启动Worker
-
+
启动训练节点,训练节点首先调用`init_worker()`来完成节点初始化,然后执行`fleet.startup_program`,从服务器端同步参数的初始化值。接着,和本地训练完全一致,通过执行`fleet.main_program`来完成整个训练过程,并保存模型。最后调用`fleet.stop_worker()`关闭训练节点。
```python
elif fleet.is_worker():
@@ -441,7 +441,7 @@ elif fleet.is_worker():
# 初始化含有分布式流程的fleet.startup_program
exe.run(fleet.startup_program))
-
+
# 引入数据读取dataset
dataset = get_dataset(inputs,params)
@@ -458,10 +458,10 @@ elif fleet.is_worker():
# 默认使用0号节点保存模型
if params.test and fleet.is_first_worker():
model_path = (str(params.model_path) + "/"+"epoch_" + str(epoch))
- fluid.io.save_persistables(executor=exe, dirname=model_path)
-
+ fleet.save_persistables(executor=exe, dirname=model_path)
+
# 训练结束,调用stop_worker()通知pserver
- fleet.stop_worker()
+ fleet.stop_worker()
logger.info("Distribute Train Success!")
return train_result
```
@@ -504,7 +504,7 @@ sh local_cluster.sh
便可以开启分布式模拟训练,默认启用2x2的训练模式。Trainer与Pserver的运行日志,存放于`./log/`文件夹,保存的模型位于`./models/`,使用默认配置运行后,理想输出为:
- pserver.0.log
```bash
-get_pserver_program() is deprecated, call get_pserver_programs() to get pserver main and startup in a single call.
+
I1126 07:37:49.952580 15056 grpc_server.cc:477] Server listening on 127.0.0.1:36011 successful, selected port: 36011
```
@@ -558,9 +558,9 @@ I1126 07:38:28.947571 14715 communicator.cc:363] Communicator stop done
2. 在很多应用场景中,分布式训练出的模型与实际上线的模型不一致,仅使用分布式训练出的参数值,参与其他网络的预测,在这样的场景中,就更无必要保存模型结构了。
> 什么是长期变量?
->
+>
> 在Paddle Fluid中,模型变量可以分为以下几种类型:
->
+>
> 1. 模型参数:是深度学习模型中被训练和学习的量。由`fluid.framwork.Parameter()`产生,是`fluid.framework.Variable()`的派生类。
> 2. 长期变量 :是在整个训练过程中持续存在,不会因为一个迭代结束而销毁的变量,所有的模型参数都是长期变量,但并非所有的长期变量都是模型参数。长期变量通过将`fluid.framework.Varibale()`中的`psersistable`属性设置为`True`来声明。长期变量是模型的核心参数。
> 3. 临时变量:不属于上述两种类别的所有变量都是临时变量,只在一个训练迭代中存在,在每一个迭代结束后,所有的临时变量都会被销毁,然后在下一个迭代开始时,创建新的临时变量。例如输入的训练数据,中间层layer的输出等等。
@@ -632,7 +632,7 @@ with fluid.framework.program_guard(test_program, startup_program):
```
这是容易理解的,因为在测试时,我们要从零开始,保证预测program的干净,没有其他的影响因素。
- 在创建预测网络时,我们加入了`with fluid.unique_name.guard():`,它的作用是让所有新建的参数的自动编号再次从零开始。Paddle的参数`Variable`以变量名作为区分手段,保证变量名相同,就可以从保存的模型中找到对应参数。
-
+
paddle创建的临时变量,编号会自动顺延,如果没有指定变量名,可以观察到这一现象,比如:`fc_1.w_0`->`fc_2.w_0`,想要共享相同的参数,必需要保证编号可以对应。
### 测试数据的读取
@@ -774,14 +774,14 @@ python -u train.py --is_cloud=1
运行该命令时,若pserver还未就绪,可在日志输出中看到如下信息:
> server not ready, wait 3 sec to retry...
->
+>
> not ready endpoints:['10.89.176.11:36000', '10.89.176.12:36000']
worker进程将持续等待,直到server开始监听,或等待超时。
当pserver都准备就绪后,可以在日志输出看到如下信息:
> I0317 11:38:48.099179 16719 communicator.cc:271] Communicator start
->
+>
> I0317 11:38:49.838711 16719 rpc_client.h:107] init rpc client with trainer_id 0
至此,分布式训练启动完毕,将开始训练,祝您好运。
diff --git a/PaddleRec/ctr/dnn/infer.py b/PaddleRec/ctr/dnn/infer.py
index 11bbdbaddb61b75d02e44639494692768ca29766..19a97e30fbe6196f33531c948ceb67dce9d46931 100644
--- a/PaddleRec/ctr/dnn/infer.py
+++ b/PaddleRec/ctr/dnn/infer.py
@@ -30,8 +30,7 @@ logger.setLevel(logging.INFO)
def parse_args():
- parser = argparse.ArgumentParser(
- description="PaddlePaddle CTR-DNN example")
+ parser = argparse.ArgumentParser(description="PaddlePaddle CTR-DNN example")
# -------------Data & Model Path-------------
parser.add_argument(
'--test_files_path',
@@ -54,8 +53,7 @@ def parse_args():
'--infer_epoch',
type=int,
default=0,
- help='Specify which epoch to run infer'
- )
+ help='Specify which epoch to run infer')
# -------------Network parameter-------------
parser.add_argument(
'--embedding_size',
@@ -68,10 +66,7 @@ def parse_args():
default=1000001,
help='sparse feature hashing space for index processing')
parser.add_argument(
- '--dense_feature_dim',
- type=int,
- default=13,
- help='dense feature shape')
+ '--dense_feature_dim', type=int, default=13, help='dense feature shape')
# -------------device parameter-------------
parser.add_argument(
@@ -102,10 +97,11 @@ def run_infer(args, model_path):
place = fluid.CPUPlace()
train_generator = generator.CriteoDataset(args.sparse_feature_dim)
file_list = [
- os.path.join(args.test_files_path, x) for x in os.listdir(args.test_files_path)
+ os.path.join(args.test_files_path, x)
+ for x in os.listdir(args.test_files_path)
]
- test_reader = paddle.batch(train_generator.test(file_list),
- batch_size=args.batch_size)
+ test_reader = fluid.io.batch(
+ train_generator.test(file_list), batch_size=args.batch_size)
startup_program = fluid.framework.Program()
test_program = fluid.framework.Program()
ctr_model = CTR()
@@ -171,13 +167,15 @@ if __name__ == "__main__":
model_list = []
for _, dir, _ in os.walk(args.model_path):
for model in dir:
- if "epoch" in model and args.infer_epoch == int(model.split('_')[-1]):
+ if "epoch" in model and args.infer_epoch == int(
+ model.split('_')[-1]):
path = os.path.join(args.model_path, model)
model_list.append(path)
if len(model_list) == 0:
- logger.info("There is no satisfactory model {} at path {}, please check your start command & env. ".format(
- str("epoch_")+str(args.infer_epoch), args.model_path))
+ logger.info(
+ "There is no satisfactory model {} at path {}, please check your start command & env. ".
+ format(str("epoch_") + str(args.infer_epoch), args.model_path))
for model in model_list:
logger.info("Test model {}".format(model))
diff --git a/PaddleRec/ctr/xdeepfm/cluster_train.py b/PaddleRec/ctr/xdeepfm/cluster_train.py
deleted file mode 100644
index 77e1e1526d3bf09f201ce494523274e0a92b4cfc..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/xdeepfm/cluster_train.py
+++ /dev/null
@@ -1,198 +0,0 @@
-import argparse
-import os
-import sys
-import time
-import network_conf
-
-import paddle.fluid as fluid
-import utils
-
-
-def parse_args():
- parser = argparse.ArgumentParser("xdeepfm cluster train.")
-
- parser.add_argument(
- '--train_data_dir',
- type=str,
- default='data/train_data',
- help='The path of train data (default: data/train_data)')
- parser.add_argument(
- '--test_data_dir',
- type=str,
- default='data/test_data',
- help='The path of test data (default: models)')
- parser.add_argument(
- '--batch_size',
- type=int,
- default=100,
- help="The size of mini-batch (default:100)")
- parser.add_argument(
- '--embedding_size',
- type=int,
- default=10,
- help="The size for embedding layer (default:10)")
- parser.add_argument(
- '--num_epoch',
- type=int,
- default=10,
- help="The number of epochs to train (default: 10)")
- parser.add_argument(
- '--model_output_dir',
- type=str,
- required=True,
- help='The path for model to store (default: models)')
- parser.add_argument(
- '--num_thread',
- type=int,
- default=1,
- help='The number of threads (default: 1)')
- parser.add_argument('--test_epoch', type=str, default='1')
- parser.add_argument(
- '--layer_sizes_dnn',
- nargs='+',
- type=int,
- default=[10, 10, 10],
- help='The size of each layers')
- parser.add_argument(
- '--layer_sizes_cin',
- nargs='+',
- type=int,
- default=[10, 10],
- help='The size of each layers')
- parser.add_argument(
- '--act',
- type=str,
- default='relu',
- help='The activation of each layers (default: relu)')
- parser.add_argument(
- '--lr', type=float, default=1e-1, help='Learning rate (default: 1e-4)')
- parser.add_argument(
- '--reg', type=float, default=1e-4, help=' (default: 1e-4)')
- parser.add_argument('--num_field', type=int, default=39)
- parser.add_argument('--num_feat', type=int, default=28651)
- parser.add_argument(
- '--model_name',
- type=str,
- default='ctr_xdeepfm_model',
- help='The name of model (default: ctr_xdeepfm_model)')
- parser.add_argument('--use_gpu', type=int, default=1)
- parser.add_argument('--print_steps', type=int, default=50)
- parser.add_argument('--is_local', type=int, default=1, help='whether local')
- parser.add_argument(
- '--is_sparse',
- action='store_true',
- required=False,
- default=False,
- help='embedding will use sparse or not, (default: False)')
-
- # dist params
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-
-def train():
- """ do training """
- args = parse_args()
- print(args)
-
- if not os.path.isdir(args.model_output_dir):
- os.mkdir(args.model_output_dir)
-
- loss, auc, data_list, auc_states = eval('network_conf.' + args.model_name)(
- args.embedding_size, args.num_field, args.num_feat,
- args.layer_sizes_dnn, args.act, args.reg, args.layer_sizes_cin,
- args.is_sparse)
- optimizer = fluid.optimizer.SGD(
- learning_rate=args.lr,
- regularization=fluid.regularizer.L2DecayRegularizer(args.reg))
- optimizer.minimize(loss)
-
- def train_loop(main_program):
- """ train network """
- start_time = time.time()
- dataset = fluid.DatasetFactory().create_dataset()
- dataset.set_use_var(data_list)
- dataset.set_pipe_command('python criteo_reader.py')
- dataset.set_batch_size(args.batch_size)
- dataset.set_filelist([
- os.path.join(args.train_data_dir, x)
- for x in os.listdir(args.train_data_dir)
- ])
-
- if args.use_gpu == 1:
- exe = fluid.Executor(fluid.CUDAPlace(0))
- dataset.set_thread(1)
- else:
- exe = fluid.Executor(fluid.CPUPlace())
- dataset.set_thread(args.num_thread)
- exe.run(fluid.default_startup_program())
-
- for epoch_id in range(args.num_epoch):
- start = time.time()
- sys.stderr.write('\nepoch%d start ...\n' % (epoch_id + 1))
- exe.train_from_dataset(
- program=main_program,
- dataset=dataset,
- fetch_list=[loss, auc],
- fetch_info=['loss', 'auc'],
- debug=False,
- print_period=args.print_steps)
- model_dir = os.path.join(args.model_output_dir,
- 'epoch_' + str(epoch_id + 1), "checkpoint")
- sys.stderr.write('epoch%d is finished and takes %f s\n' % (
- (epoch_id + 1), time.time() - start))
- if args.trainer_id == 0: # only trainer 0 save model
- print("save model in {}".format(model_dir))
- fluid.save(main_program, model_dir)
-
- print("train time cost {:.4f}".format(time.time() - start_time))
- print("finish training")
-
- if args.is_local:
- print("run local training")
- train_loop(fluid.default_main_program())
- else:
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog, pserver_startup = t.get_pserver_programs(
- args.current_endpoint)
-
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program())
-
-
-if __name__ == "__main__":
- utils.check_version()
- train()
diff --git a/PaddleRec/ctr/xdeepfm/cluster_train.sh b/PaddleRec/ctr/xdeepfm/cluster_train.sh
deleted file mode 100755
index c818a01e44fac09aa18d6e25241895666f73e09e..0000000000000000000000000000000000000000
--- a/PaddleRec/ctr/xdeepfm/cluster_train.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python -u cluster_train.py \
- --train_data_dir data/train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python -u cluster_train.py \
- --train_data_dir data/train_data \
- --model_output_dir cluster_model \
- --is_local 0 \
- --is_sparse \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir data/train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python -u cluster_train.py \
- --train_data_dir data/train_data \
- --model_output_dir cluster_model \
- --use_gpu 0 \
- --is_local 0 \
- --is_sparse \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
-
-echo "2 pservers and 2 trainers started."
\ No newline at end of file
diff --git a/PaddleRec/ctr/xdeepfm/infer.py b/PaddleRec/ctr/xdeepfm/infer.py
index 2b0ac13191ae60b96d12de902dbffa5287723387..cd809fb81fb00c88566c4a8a450ebe0f931e4cb5 100644
--- a/PaddleRec/ctr/xdeepfm/infer.py
+++ b/PaddleRec/ctr/xdeepfm/infer.py
@@ -30,7 +30,7 @@ def infer():
for x in os.listdir(args.test_data_dir)
]
criteo_dataset = CriteoDataset()
- test_reader = paddle.batch(
+ test_reader = fluid.io.batch(
criteo_dataset.test(test_files), batch_size=args.batch_size)
startup_program = fluid.framework.Program()
diff --git a/PaddleRec/gnn/infer.py b/PaddleRec/gnn/infer.py
index f8d1f1116283a5d21d6081155f062b466bda908c..787ee6f584a5664898e4deff79708dbaecc52610 100644
--- a/PaddleRec/gnn/infer.py
+++ b/PaddleRec/gnn/infer.py
@@ -62,10 +62,9 @@ def infer(args):
for epoch_num in range(args.start_index, args.last_index + 1):
model_path = os.path.join(args.model_path, "epoch_" + str(epoch_num))
try:
- if not os.path.exists(model_path):
+ if not os.path.exists(model_path + ".pdmodel"):
raise ValueError()
- fluid.io.load_persistables(executor=exe, dirname=model_path,
- main_program=infer_program)
+ fluid.io.load(infer_program, model_path+".pdmodel", exe)
loss_sum = 0.0
acc_sum = 0.0
diff --git a/PaddleRec/gnn/train.py b/PaddleRec/gnn/train.py
index a4a1898ed1c019bccc0ed076d349b76983f0d920..f96b66de3a1a258388aec6b210085c504e576051 100644
--- a/PaddleRec/gnn/train.py
+++ b/PaddleRec/gnn/train.py
@@ -140,7 +140,7 @@ def train():
logger.info("epoch loss: %.4lf" % (np.mean(epoch_sum)))
save_dir = os.path.join(args.model_path, "epoch_" + str(i))
fetch_vars = [loss, acc]
- fluid.io.save_inference_model(save_dir, feed_list, fetch_vars, exe)
+ fluid.save(fluid.default_main_program(), model_path=save_dir)
logger.info("model saved in " + save_dir)
# only for ce
diff --git a/PaddleRec/gru4rec/README.md b/PaddleRec/gru4rec/README.md
index b070cd766bec40128b8c3157fe9a5de918324018..40ffb90cb00b1294ddee62106082ad0ca402ff0e 100644
--- a/PaddleRec/gru4rec/README.md
+++ b/PaddleRec/gru4rec/README.md
@@ -11,8 +11,6 @@
├── infer_sample_neg.py # 预测脚本 sample负例
├── net.py # 网络结构
├── text2paddle.py # 文本数据转paddle数据
-├── cluster_train.py # 多机训练
-├── cluster_train.sh # 多机训练脚本
├── utils # 通用函数
├── convert_format.py # 转换数据格式
├── vocab.txt # 小样本字典
@@ -168,7 +166,7 @@ CUDA_VISIBLE_DEVICES=0 python train_sample_neg.py --loss ce --use_cuda 1
可在[net.py](./net.py) `network` 函数中调整网络结构,当前的网络结构如下:
```python
-emb = fluid.layers.embedding(
+emb = fluid.embedding(
input=src,
size=[vocab_size, hid_size],
param_attr=fluid.ParamAttr(
@@ -278,12 +276,3 @@ model:model_r@20/epoch_10 recall@20:0.681 time_cost(s):12.2
## 多机训练
厂内用户可以参考[wiki](http://wiki.baidu.com/pages/viewpage.action?pageId=628300529)利用paddlecloud 配置多机环境
-
-可参考cluster_train.py 配置其他多机环境
-
-运行命令本地模拟多机场景, 暂不支持windows
-```
-sh cluster_train.sh
-```
-
-注意本地模拟需要关闭代理
diff --git a/PaddleRec/gru4rec/cluster_train.py b/PaddleRec/gru4rec/cluster_train.py
deleted file mode 100644
index f50542bf011d0caacddb3831368493df106463f5..0000000000000000000000000000000000000000
--- a/PaddleRec/gru4rec/cluster_train.py
+++ /dev/null
@@ -1,164 +0,0 @@
-import os
-import sys
-import time
-import six
-import numpy as np
-import math
-import argparse
-import paddle.fluid as fluid
-import paddle
-import time
-import utils
-import net
-
-SEED = 102
-
-
-def parse_args():
- parser = argparse.ArgumentParser("gru4rec benchmark.")
- parser.add_argument(
- '--train_dir',
- type=str,
- default='train_data',
- help='train file address')
- parser.add_argument(
- '--vocab_path',
- type=str,
- default='vocab.txt',
- help='vocab file address')
- parser.add_argument('--is_local', type=int, default=1, help='whether local')
- parser.add_argument('--hid_size', type=int, default=100, help='hid size')
- parser.add_argument(
- '--model_dir', type=str, default='model_recall20', help='model dir')
- parser.add_argument(
- '--batch_size', type=int, default=5, help='num of batch size')
- parser.add_argument('--pass_num', type=int, default=10, help='num of epoch')
- parser.add_argument(
- '--print_batch', type=int, default=10, help='num of print batch')
- parser.add_argument(
- '--use_cuda', type=int, default=0, help='whether use gpu')
- parser.add_argument(
- '--base_lr', type=float, default=0.01, help='learning rate')
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-
-def get_cards(args):
- return args.num_devices
-
-
-def train():
- """ do training """
- args = parse_args()
- hid_size = args.hid_size
- train_dir = args.train_dir
- vocab_path = args.vocab_path
- use_cuda = True if args.use_cuda else False
- print("use_cuda:", use_cuda)
- batch_size = args.batch_size
- vocab_size, train_reader = utils.prepare_data(
- train_dir, vocab_path, batch_size=batch_size * get_cards(args),\
- buffer_size=1000, word_freq_threshold=0, is_train=True)
-
- # Train program
- src_wordseq, dst_wordseq, avg_cost, acc = net.all_vocab_network(
- vocab_size=vocab_size, hid_size=hid_size)
-
- # Optimization to minimize lost
- sgd_optimizer = fluid.optimizer.SGD(learning_rate=args.base_lr)
- sgd_optimizer.minimize(avg_cost)
-
- def train_loop(main_program):
- """ train network """
- pass_num = args.pass_num
- model_dir = args.model_dir
- fetch_list = [avg_cost.name]
-
- place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
- exe = fluid.Executor(place)
- exe.run(fluid.default_startup_program())
- total_time = 0.0
- for pass_idx in six.moves.xrange(pass_num):
- epoch_idx = pass_idx + 1
- print("epoch_%d start" % epoch_idx)
-
- t0 = time.time()
- i = 0
- newest_ppl = 0
- for data in train_reader():
- i += 1
- lod_src_wordseq = utils.to_lodtensor([dat[0] for dat in data],
- place)
- lod_dst_wordseq = utils.to_lodtensor([dat[1] for dat in data],
- place)
- ret_avg_cost = exe.run(main_program,
- feed={
- "src_wordseq": lod_src_wordseq,
- "dst_wordseq": lod_dst_wordseq
- },
- fetch_list=fetch_list)
- avg_ppl = np.exp(ret_avg_cost[0])
- newest_ppl = np.mean(avg_ppl)
- if i % args.print_batch == 0:
- print("step:%d ppl:%.3f" % (i, newest_ppl))
-
- t1 = time.time()
- total_time += t1 - t0
- print("epoch:%d num_steps:%d time_cost(s):%f" %
- (epoch_idx, i, total_time / epoch_idx))
- save_dir = "%s/epoch_%d" % (model_dir, epoch_idx)
- feed_var_names = ["src_wordseq", "dst_wordseq"]
- fetch_vars = [avg_cost, acc]
- if args.trainer_id == 0:
- fluid.io.save_inference_model(save_dir, feed_var_names,
- fetch_vars, exe)
- print("model saved in %s" % save_dir)
- print("finish training")
-
- if args.is_local:
- print("run local training")
- train_loop(fluid.default_main_program())
- else:
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog = t.get_pserver_program(args.current_endpoint)
- pserver_startup = t.get_startup_program(args.current_endpoint,
- pserver_prog)
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program())
-
-
-if __name__ == "__main__":
- train()
diff --git a/PaddleRec/gru4rec/cluster_train.sh b/PaddleRec/gru4rec/cluster_train.sh
deleted file mode 100644
index 2711ffaddcb89ea7e53ba676261d9dfe392eda33..0000000000000000000000000000000000000000
--- a/PaddleRec/gru4rec/cluster_train.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --is_local 0 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --is_local 0 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --is_local 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --is_local 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
diff --git a/PaddleRec/gru4rec/utils.py b/PaddleRec/gru4rec/utils.py
index 424ebf78490a7b5220ec1a3c2a1b045f28638f35..d853770b76342f8b3d87fe7b3f9d54cf666675a4 100644
--- a/PaddleRec/gru4rec/utils.py
+++ b/PaddleRec/gru4rec/utils.py
@@ -103,7 +103,7 @@ def prepare_data(file_dir,
if is_train and 'ce_mode' not in os.environ:
vocab_size = get_vocab_size(vocab_path)
reader = sort_batch(
- paddle.reader.shuffle(
+ fluid.io.shuffle(
train(
file_dir, buffer_size, data_type=DataType.SEQ),
buf_size=buffer_size),
diff --git a/PaddleRec/multiview_simnet/infer.py b/PaddleRec/multiview_simnet/infer.py
index e9136588add2815c65e5b9e7e707de1f6fce8707..89ceb8cba1ade8f6a84aa6555f3bbeeaf3ff37e1 100644
--- a/PaddleRec/multiview_simnet/infer.py
+++ b/PaddleRec/multiview_simnet/infer.py
@@ -102,8 +102,8 @@ def parse_args():
def start_infer(args, model_path):
dataset = reader.SyntheticDataset(args.sparse_feature_dim, args.query_slots,
args.title_slots)
- test_reader = paddle.batch(
- paddle.reader.shuffle(
+ test_reader = fluid.io.batch(
+ fluid.io.shuffle(
dataset.valid(), buf_size=args.batch_size * 100),
batch_size=args.batch_size)
place = fluid.CPUPlace()
diff --git a/PaddleRec/multiview_simnet/nets.py b/PaddleRec/multiview_simnet/nets.py
index 104101e2b8f6548f4ddce289b97794d569eefc41..6a22820317a8f4073d7f79ffa644cbd0f07150fd 100644
--- a/PaddleRec/multiview_simnet/nets.py
+++ b/PaddleRec/multiview_simnet/nets.py
@@ -190,9 +190,8 @@ class MultiviewSimnet(object):
# pairwise hinge_loss
loss_part1 = fluid.layers.elementwise_sub(
- tensor.fill_constant_batch_size_like(
- input=cos_pos,
- shape=[-1, 1],
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(cos_pos)[0], 1],
value=self.margin,
dtype='float32'),
cos_pos)
@@ -200,8 +199,10 @@ class MultiviewSimnet(object):
loss_part2 = fluid.layers.elementwise_add(loss_part1, cos_neg)
loss_part3 = fluid.layers.elementwise_max(
- tensor.fill_constant_batch_size_like(
- input=loss_part2, shape=[-1, 1], value=0.0, dtype='float32'),
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(loss_part2)[0], 1],
+ value=0.0,
+ dtype='float32'),
loss_part2)
avg_cost = fluid.layers.mean(loss_part3)
diff --git a/PaddleRec/multiview_simnet/train.py b/PaddleRec/multiview_simnet/train.py
index fd8de5068b052a2dc12766395f804460d0936a41..95c9b24f4ed36e4696b44f55d6a56cb714183f5a 100644
--- a/PaddleRec/multiview_simnet/train.py
+++ b/PaddleRec/multiview_simnet/train.py
@@ -112,8 +112,8 @@ def start_train(args):
dataset = reader.SyntheticDataset(args.sparse_feature_dim, args.query_slots,
args.title_slots)
- train_reader = paddle.batch(
- paddle.reader.shuffle(
+ train_reader = fluid.io.batch(
+ fluid.io.shuffle(
dataset.train(), buf_size=args.batch_size * 100),
batch_size=args.batch_size)
place = fluid.CPUPlace()
diff --git a/PaddleRec/ncf/evaluate.py b/PaddleRec/ncf/evaluate.py
index a8becd1b5019a057ea0cecabbec19138320cbc20..1a655e4548cd317734bc9228eb2405da6dca4a14 100644
--- a/PaddleRec/ncf/evaluate.py
+++ b/PaddleRec/ncf/evaluate.py
@@ -1,5 +1,5 @@
import math
-import heapq # for retrieval topK
+import heapq # for retrieval topK
import multiprocessing
import numpy as np
from time import time
@@ -23,30 +23,36 @@ _K = None
_args = None
_model_path = None
+
def run_infer(args, model_path, test_data_path):
test_data_generator = utils.CriteoDataset()
-
+
with fluid.scope_guard(fluid.Scope()):
- test_reader = paddle.batch(test_data_generator.test(test_data_path, False), batch_size=args.test_batch_size)
-
+ test_reader = fluid.io.batch(
+ test_data_generator.test(test_data_path, False),
+ batch_size=args.test_batch_size)
+
place = fluid.CUDAPlace(0) if args.use_gpu else fluid.CPUPlace()
exe = fluid.Executor(place)
exe.run(fluid.default_startup_program())
- infer_program, feed_target_names, fetch_vars = fluid.io.load_inference_model(model_path, exe)
+ infer_program, feed_target_names, fetch_vars = fluid.io.load_inference_model(
+ model_path, exe)
for data in test_reader():
user_input = np.array([dat[0] for dat in data])
item_input = np.array([dat[1] for dat in data])
- pred_val = exe.run(infer_program,
- feed={"user_input": user_input,
- "item_input": item_input},
- fetch_list=fetch_vars,
- return_numpy=True)
-
+ pred_val = exe.run(
+ infer_program,
+ feed={"user_input": user_input,
+ "item_input": item_input},
+ fetch_list=fetch_vars,
+ return_numpy=True)
+
return pred_val[0].reshape(1, -1).tolist()[0]
+
def evaluate_model(args, testRatings, testNegatives, K, model_path):
"""
Evaluate the performance (Hit_Ratio, NDCG) of top-K recommendation
@@ -56,22 +62,23 @@ def evaluate_model(args, testRatings, testNegatives, K, model_path):
global _testRatings
global _testNegatives
global _K
- global _model_path
+ global _model_path
global _args
-
+
_args = args
- _model_path= model_path
+ _model_path = model_path
_testRatings = testRatings
_testNegatives = testNegatives
_K = K
-
- hits, ndcgs = [],[]
+
+ hits, ndcgs = [], []
for idx in range(len(_testRatings)):
- (hr,ndcg) = eval_one_rating(idx)
+ (hr, ndcg) = eval_one_rating(idx)
hits.append(hr)
- ndcgs.append(ndcg)
+ ndcgs.append(ndcg)
return (hits, ndcgs)
+
def eval_one_rating(idx):
rating = _testRatings[idx]
items = _testNegatives[idx]
@@ -80,9 +87,9 @@ def eval_one_rating(idx):
items.append(gtItem)
# Get prediction scores
map_item_score = {}
- users = np.full(len(items), u, dtype = 'int32')
- users = users.reshape(-1,1)
- items_array = np.array(items).reshape(-1,1)
+ users = np.full(len(items), u, dtype='int32')
+ users = users.reshape(-1, 1)
+ items_array = np.array(items).reshape(-1, 1)
temp = np.hstack((users, items_array))
np.savetxt("Data/test.txt", temp, fmt='%d', delimiter=',')
predictions = run_infer(_args, _model_path, _args.test_data_path)
@@ -91,7 +98,7 @@ def eval_one_rating(idx):
item = items[i]
map_item_score[item] = predictions[i]
items.pop()
-
+
# Evaluate top rank list
ranklist = heapq.nlargest(_K, map_item_score, key=map_item_score.get)
hr = getHitRatio(ranklist, gtItem)
@@ -99,15 +106,17 @@ def eval_one_rating(idx):
return (hr, ndcg)
+
def getHitRatio(ranklist, gtItem):
for item in ranklist:
if item == gtItem:
return 1
return 0
+
def getNDCG(ranklist, gtItem):
for i in range(len(ranklist)):
item = ranklist[i]
if item == gtItem:
- return math.log(2) / math.log(i+2)
+ return math.log(2) / math.log(i + 2)
return 0
diff --git a/PaddleRec/ssr/README.md b/PaddleRec/ssr/README.md
index 6abc52405a3bf6a288bae2b3675d84fe33bd00ac..57b3503bc54d610d2e03894ba418faf404b18afe 100644
--- a/PaddleRec/ssr/README.md
+++ b/PaddleRec/ssr/README.md
@@ -43,9 +43,6 @@ cpu 单机多卡训练
CPU_NUM=10 python train.py --train_dir train_data --use_cuda 0 --parallel 1 --batch_size 50 --model_dir model_output --num_devices 10
```
-本地模拟多机训练, 不支持windows.
-``` bash
-sh cluster_train.sh
```
## Inference
diff --git a/PaddleRec/ssr/cluster_train.py b/PaddleRec/ssr/cluster_train.py
deleted file mode 100644
index 7cbe7ab429993b9a1523ddff2cf9fa435710c9fb..0000000000000000000000000000000000000000
--- a/PaddleRec/ssr/cluster_train.py
+++ /dev/null
@@ -1,205 +0,0 @@
-#Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-import sys
-import time
-import argparse
-import logging
-import paddle.fluid as fluid
-import paddle
-import utils
-import numpy as np
-from nets import SequenceSemanticRetrieval
-
-logging.basicConfig(format="%(asctime)s - %(levelname)s - %(message)s")
-logger = logging.getLogger("fluid")
-logger.setLevel(logging.INFO)
-
-
-def parse_args():
- parser = argparse.ArgumentParser("sequence semantic retrieval")
- parser.add_argument(
- "--train_dir", type=str, default='train_data', help="Training file")
- parser.add_argument(
- "--base_lr", type=float, default=0.01, help="learning rate")
- parser.add_argument(
- '--vocab_path', type=str, default='vocab.txt', help='vocab file')
- parser.add_argument(
- "--epochs", type=int, default=10, help="Number of epochs")
- parser.add_argument(
- '--parallel', type=int, default=0, help='whether parallel')
- parser.add_argument(
- '--use_cuda', type=int, default=0, help='whether use gpu')
- parser.add_argument(
- '--print_batch', type=int, default=10, help='num of print batch')
- parser.add_argument(
- '--model_dir', type=str, default='model_output', help='model dir')
- parser.add_argument(
- "--hidden_size", type=int, default=128, help="hidden size")
- parser.add_argument(
- "--batch_size", type=int, default=50, help="number of batch")
- parser.add_argument(
- "--embedding_dim", type=int, default=128, help="embedding dim")
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--step_num', type=int, default=1000, help='Number of steps')
- parser.add_argument(
- '--enable_ce',
- action='store_true',
- help='If set, run the task with continuous evaluation logs.')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints',
- type=str,
- default='127.0.0.1:6000',
- help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint',
- type=str,
- default='127.0.0.1:6000',
- help='The current_endpoint')
- parser.add_argument(
- '--trainer_id',
- type=int,
- default=0,
- help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers',
- type=int,
- default=1,
- help='The num of trianers, (default: 1)')
- return parser.parse_args()
-
-
-def get_cards(args):
- return args.num_devices
-
-
-def train_loop(main_program, avg_cost, acc, train_input_data, place, args,
- train_reader):
- data_list = [var.name for var in train_input_data]
- feeder = fluid.DataFeeder(feed_list=data_list, place=place)
- exe = fluid.Executor(place)
- exe.run(fluid.default_startup_program())
- train_exe = exe
-
- total_time = 0.0
- ce_info = []
- for pass_id in range(args.epochs):
- epoch_idx = pass_id + 1
- print("epoch_%d start" % epoch_idx)
- t0 = time.time()
- i = 0
- for batch_id, data in enumerate(train_reader()):
- i += 1
- loss_val, correct_val = train_exe.run(
- feed=feeder.feed(data), fetch_list=[avg_cost.name, acc.name])
- ce_info.append(float(np.mean(correct_val)) / args.batch_size)
- if i % args.print_batch == 0:
- logger.info(
- "Train --> pass: {} batch_id: {} avg_cost: {}, acc: {}".
- format(pass_id, batch_id,
- np.mean(loss_val),
- float(np.mean(correct_val)) / args.batch_size))
- if args.enable_ce and i > args.step_num:
- break
- t1 = time.time()
- total_time += t1 - t0
- print("epoch:%d num_steps:%d time_cost(s):%f" %
- (epoch_idx, i, total_time / epoch_idx))
- save_dir = "%s/epoch_%d" % (args.model_dir, epoch_idx)
- fluid.save(fluid.default_main_program(), save_dir)
- print("model saved in %s" % save_dir)
-
- # only for ce
- if args.enable_ce:
- ce_acc = 0
- try:
- ce_acc = ce_info[-2]
- except:
- print("ce info error")
- epoch_idx = args.epochs
- device = get_device(args)
- if args.use_cuda:
- gpu_num = device[1]
- print("kpis\teach_pass_duration_gpu%s\t%s" %
- (gpu_num, total_time / epoch_idx))
- print("kpis\ttrain_acc_gpu%s\t%s" % (gpu_num, ce_acc))
- else:
- cpu_num = device[1]
- threads_num = device[2]
- print("kpis\teach_pass_duration_cpu%s_thread%s\t%s" %
- (cpu_num, threads_num, total_time / epoch_idx))
- print("kpis\ttrain_acc_cpu%s_thread%s\t%s" %
- (cpu_num, threads_num, ce_acc))
-
-
-def train(args):
- if args.enable_ce:
- SEED = 102
- fluid.default_startup_program().random_seed = SEED
- fluid.default_main_program().random_seed = SEED
- use_cuda = True if args.use_cuda else False
- parallel = True if args.parallel else False
- print("use_cuda:", use_cuda, "parallel:", parallel)
- train_reader, vocab_size = utils.construct_train_data(
- args.train_dir, args.vocab_path, args.batch_size * get_cards(args))
- place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
- ssr = SequenceSemanticRetrieval(vocab_size, args.embedding_dim,
- args.hidden_size)
- # Train program
- train_input_data, cos_pos, avg_cost, acc = ssr.train()
-
- # Optimization to minimize lost
- optimizer = fluid.optimizer.Adagrad(learning_rate=args.base_lr)
- optimizer.minimize(avg_cost)
-
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(
- args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog = t.get_pserver_program(args.current_endpoint)
- pserver_startup = t.get_startup_program(args.current_endpoint,
- pserver_prog)
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program(), avg_cost, acc, train_input_data,
- place, args, train_reader)
-
-
-def get_device(args):
- if args.use_cuda:
- gpus = os.environ.get("CUDA_VISIBLE_DEVICES", 1)
- gpu_num = len(gpus.split(','))
- return "gpu", gpu_num
- else:
- threads_num = os.environ.get('NUM_THREADS', 1)
- cpu_num = os.environ.get('CPU_NUM', 1)
- return "cpu", int(cpu_num), int(threads_num)
-
-
-def main():
- args = parse_args()
- train(args)
-
-
-if __name__ == "__main__":
- main()
diff --git a/PaddleRec/ssr/cluster_train.sh b/PaddleRec/ssr/cluster_train.sh
deleted file mode 100644
index aeb1d9c5cb102a511b0bc3485e6906f9d7985628..0000000000000000000000000000000000000000
--- a/PaddleRec/ssr/cluster_train.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --vocab_path vocab.txt \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
diff --git a/PaddleRec/ssr/infer.py b/PaddleRec/ssr/infer.py
index c1bc8a7143768311cff03ae9ddf813bb495ecdd5..42a26f14f6cbf8f52479ee7c414a1f03d58170e0 100644
--- a/PaddleRec/ssr/infer.py
+++ b/PaddleRec/ssr/infer.py
@@ -37,14 +37,14 @@ def parse_args():
def model(vocab_size, emb_size, hidden_size):
- user_data = fluid.layers.data(
- name="user", shape=[1], dtype="int64", lod_level=1)
- all_item_data = fluid.layers.data(
- name="all_item", shape=[vocab_size, 1], dtype="int64")
+ user_data = fluid.data(
+ name="user", shape=[None, 1], dtype="int64", lod_level=1)
+ all_item_data = fluid.data(
+ name="all_item", shape=[None, vocab_size], dtype="int64")
- user_emb = fluid.layers.embedding(
+ user_emb = fluid.embedding(
input=user_data, size=[vocab_size, emb_size], param_attr="emb.item")
- all_item_emb = fluid.layers.embedding(
+ all_item_emb = fluid.embedding(
input=all_item_data, size=[vocab_size, emb_size], param_attr="emb.item")
all_item_emb_re = fluid.layers.reshape(x=all_item_emb, shape=[-1, emb_size])
@@ -63,7 +63,7 @@ def model(vocab_size, emb_size, hidden_size):
bias_attr="item.b")
cos_item = fluid.layers.cos_sim(X=all_item_hid, Y=user_re)
all_pre_ = fluid.layers.reshape(x=cos_item, shape=[-1, vocab_size])
- pos_label = fluid.layers.data(name="pos_label", shape=[1], dtype="int64")
+ pos_label = fluid.data(name="pos_label", shape=[None, 1], dtype="int64")
acc = fluid.layers.accuracy(input=all_pre_, label=pos_label, k=20)
return acc
@@ -94,7 +94,7 @@ def infer(args, vocab_size, test_reader):
user_data, pos_label = utils.infer_data(data, place)
all_item_numpy = np.tile(
np.arange(vocab_size), len(pos_label)).reshape(
- len(pos_label), vocab_size, 1).astype("int64")
+ len(pos_label), vocab_size).astype("int64")
para = exe.run(copy_program,
feed={
"user": user_data,
diff --git a/PaddleRec/ssr/nets.py b/PaddleRec/ssr/nets.py
index 7b78adae3b45626f10f99b57654501b5f09f19a1..3026562d820effcbc4bf416a8e56d5e8b75c5924 100644
--- a/PaddleRec/ssr/nets.py
+++ b/PaddleRec/ssr/nets.py
@@ -57,13 +57,17 @@ class PairwiseHingeLoss(object):
def forward(self, pos, neg):
loss_part1 = fluid.layers.elementwise_sub(
- tensor.fill_constant_batch_size_like(
- input=pos, shape=[-1, 1], value=self.margin, dtype='float32'),
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(pos)[0], 1],
+ value=self.margin,
+ dtype='float32'),
pos)
loss_part2 = fluid.layers.elementwise_add(loss_part1, neg)
loss_part3 = fluid.layers.elementwise_max(
- tensor.fill_constant_batch_size_like(
- input=loss_part2, shape=[-1, 1], value=0.0, dtype='float32'),
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(loss_part2)[0], 1],
+ value=0.0,
+ dtype='float32'),
loss_part2)
return loss_part3
diff --git a/PaddleRec/ssr/utils.py b/PaddleRec/ssr/utils.py
index 65571cb08a930d520c82c881bf5c68ca7c53b152..a5b6decf6dac7ff2af713d17262430ca8da9af1f 100644
--- a/PaddleRec/ssr/utils.py
+++ b/PaddleRec/ssr/utils.py
@@ -18,7 +18,7 @@ def construct_train_data(file_dir, vocab_path, batch_size):
files = [file_dir + '/' + f for f in os.listdir(file_dir)]
y_data = reader.YoochooseDataset(vocab_size)
train_reader = fluid.io.batch(
- paddle.reader.shuffle(
+ fluid.io.shuffle(
y_data.train(files), buf_size=batch_size * 100),
batch_size=batch_size)
return train_reader, vocab_size
diff --git a/PaddleRec/tagspace/README.md b/PaddleRec/tagspace/README.md
index 1980b06dfd531da3db5691a204a3a0c088785e2d..2261e64f843431eb7eebd7eb4905e3d59396a7d2 100644
--- a/PaddleRec/tagspace/README.md
+++ b/PaddleRec/tagspace/README.md
@@ -9,8 +9,6 @@
├── infer.py # 预测脚本
├── net.py # 网络结构
├── text2paddle.py # 文本数据转paddle数据
-├── cluster_train.py # 多机训练
-├── cluster_train.sh # 多机训练脚本
├── utils # 通用函数
├── vocab_text.txt # 小样本文本字典
├── vocab_tag.txt # 小样本类别字典
@@ -89,9 +87,3 @@ python infer.py
```
python infer.py --model_dir big_model --vocab_tag_path big_vocab_tag.txt --test_dir test_big_data/
```
-
-## 本地模拟多机
-运行命令
-```
-sh cluster_train.py
-```
diff --git a/PaddleRec/tagspace/cluster_train.py b/PaddleRec/tagspace/cluster_train.py
deleted file mode 100644
index 96cdf615ed9e6673159db5163f33f431d5c6e9bc..0000000000000000000000000000000000000000
--- a/PaddleRec/tagspace/cluster_train.py
+++ /dev/null
@@ -1,137 +0,0 @@
-import os
-import sys
-import time
-import six
-import numpy as np
-import math
-import argparse
-import paddle
-import paddle.fluid as fluid
-import time
-import utils
-import net
-
-SEED = 102
-
-def parse_args():
- parser = argparse.ArgumentParser("TagSpace benchmark.")
- parser.add_argument(
- '--neg_size', type=int, default=3, help='neg/pos ratio')
- parser.add_argument(
- '--train_dir', type=str, default='train_data', help='train file address')
- parser.add_argument(
- '--vocab_text_path', type=str, default='vocab_text.txt', help='vocab_text file address')
- parser.add_argument(
- '--vocab_tag_path', type=str, default='vocab_tag.txt', help='vocab_text file address')
- parser.add_argument(
- '--is_local', type=int, default=1, help='whether local')
- parser.add_argument(
- '--model_dir', type=str, default='model_', help='model dir')
- parser.add_argument(
- '--batch_size', type=int, default=5, help='num of batch size')
- parser.add_argument(
- '--print_batch', type=int, default=10, help='num of print batch')
- parser.add_argument(
- '--pass_num', type=int, default=10, help='num of epoch')
- parser.add_argument(
- '--use_cuda', type=int, default=0, help='whether use gpu')
- parser.add_argument(
- '--base_lr', type=float, default=0.01, help='learning rate')
- parser.add_argument(
- '--num_devices', type=int, default=1, help='Number of GPU devices')
- parser.add_argument(
- '--role', type=str, default='pserver', help='trainer or pserver')
- parser.add_argument(
- '--endpoints', type=str, default='127.0.0.1:6000', help='The pserver endpoints, like: 127.0.0.1:6000, 127.0.0.1:6001')
- parser.add_argument(
- '--current_endpoint', type=str, default='127.0.0.1:6000', help='The current_endpoint')
- parser.add_argument(
- '--trainer_id', type=int, default=0, help='trainer id ,only trainer_id=0 save model')
- parser.add_argument(
- '--trainers', type=int, default=1, help='The num of trianers, (default: 1)')
- args = parser.parse_args()
- return args
-
-def get_cards(args):
- return args.num_devices
-
-def train():
- """ do training """
- args = parse_args()
- train_dir = args.train_dir
- vocab_text_path = args.vocab_text_path
- vocab_tag_path = args.vocab_tag_path
- use_cuda = True if args.use_cuda else False
- batch_size = args.batch_size
- neg_size = args.neg_size
- vocab_text_size, vocab_tag_size, train_reader = utils.prepare_data(
- file_dir=train_dir, vocab_text_path=vocab_text_path,
- vocab_tag_path=vocab_tag_path, neg_size=neg_size,
- batch_size=batch_size * get_cards(args),
- buffer_size=batch_size*100, is_train=True)
- """ train network """
- # Train program
- avg_cost, correct, cos_pos = net.network(vocab_text_size, vocab_tag_size, neg_size=neg_size)
-
- # Optimization to minimize lost
- sgd_optimizer = fluid.optimizer.SGD(learning_rate=args.base_lr)
- sgd_optimizer.minimize(avg_cost)
-
- def train_loop(main_program):
- # Initialize executor
- place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
- exe = fluid.Executor(place)
- pass_num = args.pass_num
- model_dir = args.model_dir
- fetch_list = [avg_cost.name]
- exe.run(fluid.default_startup_program())
- total_time = 0.0
- for pass_idx in range(pass_num):
- epoch_idx = pass_idx + 1
- print("epoch_%d start" % epoch_idx)
- t0 = time.time()
- for batch_id, data in enumerate(train_reader()):
- lod_text_seq = utils.to_lodtensor([dat[0] for dat in data], place)
- lod_pos_tag = utils.to_lodtensor([dat[1] for dat in data], place)
- lod_neg_tag = utils.to_lodtensor([dat[2] for dat in data], place)
- loss_val, correct_val = exe.run(
- feed={
- "text": lod_text_seq,
- "pos_tag": lod_pos_tag,
- "neg_tag": lod_neg_tag},
- fetch_list=[avg_cost.name, correct.name])
- if batch_id % args.print_batch == 0:
- print("TRAIN --> pass: {} batch_num: {} avg_cost: {}, acc: {}"
- .format(pass_idx, (batch_id+10) * batch_size, np.mean(loss_val),
- float(np.sum(correct_val)) / batch_size))
- t1 = time.time()
- total_time += t1 - t0
- print("epoch:%d num_steps:%d time_cost(s):%f" %
- (epoch_idx, batch_id, total_time / epoch_idx))
- save_dir = "%s/epoch_%d" % (model_dir, epoch_idx)
- feed_var_names = ["text", "pos_tag"]
- fetch_vars = [cos_pos]
- fluid.io.save_inference_model(save_dir, feed_var_names, fetch_vars, exe)
- print("finish training")
-
- if args.is_local:
- print("run local training")
- train_loop(fluid.default_main_program())
- else:
- print("run distribute training")
- t = fluid.DistributeTranspiler()
- t.transpile(args.trainer_id, pservers=args.endpoints, trainers=args.trainers)
- if args.role == "pserver":
- print("run psever")
- pserver_prog = t.get_pserver_program(args.current_endpoint)
- pserver_startup = t.get_startup_program(args.current_endpoint,
- pserver_prog)
- exe = fluid.Executor(fluid.CPUPlace())
- exe.run(pserver_startup)
- exe.run(pserver_prog)
- elif args.role == "trainer":
- print("run trainer")
- train_loop(t.get_trainer_program())
-
-if __name__ == "__main__":
- train()
diff --git a/PaddleRec/tagspace/cluster_train.sh b/PaddleRec/tagspace/cluster_train.sh
deleted file mode 100644
index 16698e1d4acf06bd5bb06f9aceb7b3b135b5f234..0000000000000000000000000000000000000000
--- a/PaddleRec/tagspace/cluster_train.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#export GLOG_v=30
-#export GLOG_logtostderr=1
-
-# start pserver0
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --batch_size 5 \
- --is_local 0 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6000 \
- --trainers 2 \
- > pserver0.log 2>&1 &
-
-# start pserver1
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --batch_size 5 \
- --is_local 0 \
- --role pserver \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --current_endpoint 127.0.0.1:6001 \
- --trainers 2 \
- > pserver1.log 2>&1 &
-
-# start trainer0
-#CUDA_VISIBLE_DEVICES=1 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --is_local 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 0 \
- > trainer0.log 2>&1 &
-
-# start trainer1
-#CUDA_VISIBLE_DEVICES=2 python cluster_train.py \
-python cluster_train.py \
- --train_dir train_data \
- --model_dir cluster_model \
- --batch_size 5 \
- --print_batch 10 \
- --use_cuda 0 \
- --is_local 0 \
- --role trainer \
- --endpoints 127.0.0.1:6000,127.0.0.1:6001 \
- --trainers 2 \
- --trainer_id 1 \
- > trainer1.log 2>&1 &
diff --git a/PaddleRec/tagspace/net.py b/PaddleRec/tagspace/net.py
index 479d6620aaf1ddf3b6ca5decf56f85e604bd0878..3a8287e723fe3316c963173cab61d92ff832054c 100644
--- a/PaddleRec/tagspace/net.py
+++ b/PaddleRec/tagspace/net.py
@@ -46,13 +46,17 @@ def network(vocab_text_size,
cos_neg = nn.reduce_max(cos_neg_all, dim=1, keep_dim=True)
#calculate hinge loss
loss_part1 = nn.elementwise_sub(
- tensor.fill_constant_batch_size_like(
- input=cos_pos, shape=[-1, 1], value=margin, dtype='float32'),
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(cos_pos)[0], 1],
+ value=margin,
+ dtype='float32'),
cos_pos)
loss_part2 = nn.elementwise_add(loss_part1, cos_neg)
loss_part3 = nn.elementwise_max(
- tensor.fill_constant_batch_size_like(
- input=loss_part2, shape=[-1, 1], value=0.0, dtype='float32'),
+ fluid.layers.fill_constant(
+ shape=[fluid.layers.shape(loss_part2)[0], 1],
+ value=0.0,
+ dtype='float32'),
loss_part2)
avg_cost = nn.mean(loss_part3)
less = tensor.cast(cf.less_than(cos_neg, cos_pos), dtype='float32')
diff --git a/PaddleRec/tagspace/utils.py b/PaddleRec/tagspace/utils.py
index 7ae71249e41ec2d6f42be07f3a5a472a1d3ba8a2..5730efeaa41c3dfaca641f700e45b2fe212e3c5e 100644
--- a/PaddleRec/tagspace/utils.py
+++ b/PaddleRec/tagspace/utils.py
@@ -65,7 +65,7 @@ def prepare_data(file_dir,
vocab_text_size = get_vocab_size(vocab_text_path)
vocab_tag_size = get_vocab_size(vocab_tag_path)
reader = sort_batch(
- paddle.reader.shuffle(
+ fluid.io.shuffle(
train(
file_dir,
vocab_tag_size,
diff --git a/PaddleRec/tdm/tdm_demo/README.md b/PaddleRec/tdm/tdm_demo/README.md
index 8e9b7f4cbf8223fa550a5405b78d5ca96d0799ce..42b360830dc8457b4c9d4dcd351799dd0ee289a6 100644
--- a/PaddleRec/tdm/tdm_demo/README.md
+++ b/PaddleRec/tdm/tdm_demo/README.md
@@ -51,7 +51,7 @@
- **Node-Embedding**:注意,此处的Embedding,并非我们已有的item-embedding,而是构建完成的树的节点对应的Embedding,由item-embedding通过规则生成,是我们的网络主要训练的目标。ID范围为所有0->节点数-1。我们同时也需准备一个映射表,来告诉模型,item_id到node_id的映射关系。
- **Travel**:是指叶子节点从root开始直到其自身的遍历路径,如上图,14号节点的Travel:0->1->3->7->14
- **Layer**:指树的层,如上图,共有4层。
-
+
> Paddle-TDM在训练时,不会改动树的结构,只会改动Node-Embedding。
@@ -156,7 +156,7 @@ TDM的组网,宏观上,可以概括为三个部分
**demo模型,假设输入为两个元素:**
> 一、user/query的emb表示,该emb应该来源于特征的组合在某个空间的映射(比如若干特征取emb后concat到一起),或其他预训练模型的处理结果(比如将明文query通过nlp预处理得到emb表示)
-
+
> 二、item的正样本,是发生了实际点击/购买/浏览等行为的item_id,与输入的user/query emb强相关,是我们之后通过预测想得到的结果。
在paddle组网中,我们这样定义上面两个变量:
@@ -233,9 +233,9 @@ tdm_sampler的运行逻辑如下:
- 在item遍历路径上的node视为正样本,`positive_node_id`由`travel_list[item_id][i]`给出,其他同层的兄弟节点视为负样本,该层节点列表由`layer_list[i]`给出,如果`positive_node_id`不在`layer_list[i]`中,会提示错误。
- 在兄弟节点中进行随机采样,采样N个node,N由`neg_sampling_list[i]`的值决定,如果该值大于兄弟节点的数量,会提示错误。 采样结果不会重复,且不会采样到正样本。
-
+
- 如果`output_positive=True`,则会同时输出正负样本,否则只输出负采样的结果
-
+
- 生成该层`label`,shape与采样结果一致,正样本对应的label=1,负样本的label=0
- 生成该层`mask`,如果树是不平衡的,则有些item不会位于树的最后一层,所以遍历路径的实际长度会比其他item少,为了tensor维度一致,travel_list中padding了0。当遇到了padding的0时,tdm_sampler也会输出正常维度的采样结果,采样结果与label都为0。为了区分这部分虚拟的采样结果与真实采样结果,会给虚拟采样结果额外设置mask=0,如果是真实采样结果mask=1
@@ -403,23 +403,23 @@ acc = fluid.layers.accuracy(input=softmax_prob, label=labels_reshape)
在demo网络中,我们设置为从某一层的所有节点开始进行检索。paddle组网对输入定义的实现如下:
```python
def input_data(self):
- input_emb = fluid.layers.data(
+ input_emb = fluid.data(
name="input_emb",
- shape=[self.input_embed_size],
+ shape=[None, self.input_embed_size],
dtype="float32",
)
# first_layer 与 first_layer_mask 对应着infer起始的节点
- first_layer = fluid.layers.data(
+ first_layer = fluid.data(
name="first_layer_node",
- shape=[1],
+ shape=[None, 1],
dtype="int64",
lod_level=1, #支持变长
)
- first_layer_mask = fluid.layers.data(
+ first_layer_mask = fluid.data(
name="first_layer_node_mask",
- shape=[1],
+ shape=[None, 1],
dtype="int64",
lod_level=1,
)
@@ -447,7 +447,7 @@ def create_first_layer(self, args):
tdm的检索逻辑类似beamsearch,简单来说:在每一层计算打分,得到topK的节点,将这些节点的孩子节点作为下一层的输入,如此循环,得到最终的topK。但仍然有一些需要注意的细节,下面将详细介绍。
- 问题一:怎么处理`input_emb`?
-
+
- input_emb过`input_fc`,检索中,只需过一次即可:
```python
nput_trans_emb = self.input_trans_net.input_fc_infer(input_emb)
@@ -663,7 +663,7 @@ if args.save_init_model or not args.load_model:
```
> 为什么每次加载模型手动Set `learning rate`?
->
+>
> 学习率在paddle的组网中,是以一个`persistable=Ture`的长期变量储存在模型的Variable scope里的。每次使用load_persistables加载模型时,也会使用加载的模型的学习率覆盖本地模型的默认学习率,换言之,加载init_model以后,学习率也是保存init_model时的学习率。对模型的调试会产生不必要的影响,为了保证网络训练如预期,需要这样的手动set步骤。
### demo的训练运行方法
@@ -706,4 +706,4 @@ Demo代码中给出了基于paddle预测库加载tdm模型,输入emb产出item
```
- 首先需要运行`run_infer.sh`,打开`save_init_model`开关,使用`save_inference_model`产出paddle的推理模型,`predict.py`会加载`infer_model`,进行高速推理。
- 欲想进一步高速推理,需使用含预测库的paddle预测库,可以使用`mkl`及`mkl_dnn`等计算库加速op的计算。相关文档可以参考:[服务器端部署](https://www.paddlepaddle.org.cn/documentation/docs/zh/advanced_guide/inference_deployment/inference/index_cn.html)
-- tdm相关op目前仅支持在cpu设备上运行,后续会支持GPU,欢迎关注。
\ No newline at end of file
+- tdm相关op目前仅支持在cpu设备上运行,后续会支持GPU,欢迎关注。
diff --git a/PaddleRec/tdm/tdm_demo/dataset_generator.py b/PaddleRec/tdm/tdm_demo/dataset_generator.py
index a600ed9221e37ccfb3aea1e5ed8f6f35556298f8..b186a1ae28b5e4cd34da6e2faeaf58c1572be300 100644
--- a/PaddleRec/tdm/tdm_demo/dataset_generator.py
+++ b/PaddleRec/tdm/tdm_demo/dataset_generator.py
@@ -35,6 +35,7 @@ class TDMDataset(dg.MultiSlotStringDataGenerator):
"""
Read test_data line by line & yield batch
"""
+
def local_iter():
"""Read file line by line"""
for fname in infer_file_list:
@@ -46,13 +47,14 @@ class TDMDataset(dg.MultiSlotStringDataGenerator):
yield [input_emb]
import paddle
- batch_iter = paddle.batch(local_iter, batch)
+ batch_iter = fluid.io.batch(local_iter, batch)
return batch_iter
def generate_sample(self, line):
"""
Read the data line by line and process it as a dictionary
"""
+
def iterator():
"""
This function needs to be implemented by the user, based on data format
diff --git a/PaddleRec/tdm/tdm_demo/infer_network.py b/PaddleRec/tdm/tdm_demo/infer_network.py
index 8c7a41b853fcf69b94efbbc6ddb8e8723b11faec..a78364d0cdf1ba12f5219bbb941cde9ada297c73 100644
--- a/PaddleRec/tdm/tdm_demo/infer_network.py
+++ b/PaddleRec/tdm/tdm_demo/infer_network.py
@@ -41,26 +41,23 @@ class TdmInferNet(object):
self.input_trans_net = InputTransNet(args)
def input_data(self):
- input_emb = fluid.layers.data(
+ input_emb = fluid.data(
name="input_emb",
- shape=[self.input_embed_size],
- dtype="float32",
- )
+ shape=[None, self.input_embed_size],
+ dtype="float32", )
# first_layer 与 first_layer_mask 对应着infer起始层的节点
- first_layer = fluid.layers.data(
+ first_layer = fluid.data(
name="first_layer_node",
- shape=[1],
+ shape=[None, 1],
dtype="int64",
- lod_level=1,
- )
+ lod_level=1, )
- first_layer_mask = fluid.layers.data(
+ first_layer_mask = fluid.data(
name="first_layer_node_mask",
- shape=[1],
+ shape=[None, 1],
dtype="int64",
- lod_level=1,
- )
+ lod_level=1, )
inputs = [input_emb] + [first_layer] + [first_layer_mask]
return inputs
@@ -125,28 +122,27 @@ class TdmInferNet(object):
size=[self.node_nums, self.node_embed_size],
param_attr=fluid.ParamAttr(name="TDM_Tree_Emb"))
- input_fc_out = self.input_trans_net.layer_fc_infer(
- input_trans_emb, layer_idx)
+ input_fc_out = self.input_trans_net.layer_fc_infer(input_trans_emb,
+ layer_idx)
# 过每一层的分类器
- layer_classifier_res = self.layer_classifier.classifier_layer_infer(input_fc_out,
- node_emb,
- layer_idx)
+ layer_classifier_res = self.layer_classifier.classifier_layer_infer(
+ input_fc_out, node_emb, layer_idx)
# 过最终的判别分类器
- tdm_fc = fluid.layers.fc(input=layer_classifier_res,
- size=self.label_nums,
- act=None,
- num_flatten_dims=2,
- param_attr=fluid.ParamAttr(
- name="tdm.cls_fc.weight"),
- bias_attr=fluid.ParamAttr(name="tdm.cls_fc.bias"))
+ tdm_fc = fluid.layers.fc(
+ input=layer_classifier_res,
+ size=self.label_nums,
+ act=None,
+ num_flatten_dims=2,
+ param_attr=fluid.ParamAttr(name="tdm.cls_fc.weight"),
+ bias_attr=fluid.ParamAttr(name="tdm.cls_fc.bias"))
prob = fluid.layers.softmax(tdm_fc)
positive_prob = fluid.layers.slice(
prob, axes=[2], starts=[1], ends=[2])
- prob_re = fluid.layers.reshape(
- positive_prob, [-1, current_layer_node_num])
+ prob_re = fluid.layers.reshape(positive_prob,
+ [-1, current_layer_node_num])
# 过滤掉padding产生的无效节点(node_id=0)
node_zero_mask = fluid.layers.cast(current_layer_node, 'bool')
@@ -161,11 +157,10 @@ class TdmInferNet(object):
# index_sample op根据下标索引tensor对应位置的值
# 若paddle版本>2.0,调用方式为paddle.index_sample
- top_node = fluid.contrib.layers.index_sample(
- current_layer_node, topk_i)
+ top_node = fluid.contrib.layers.index_sample(current_layer_node,
+ topk_i)
prob_re_mask = prob_re * current_layer_child_mask # 过滤掉非叶子节点
- topk_value = fluid.contrib.layers.index_sample(
- prob_re_mask, topk_i)
+ topk_value = fluid.contrib.layers.index_sample(prob_re_mask, topk_i)
node_score.append(topk_value)
node_list.append(top_node)
@@ -190,7 +185,8 @@ class TdmInferNet(object):
res_node = fluid.layers.reshape(res_layer_node, [-1, self.topK, 1])
# 利用Tree_info信息,将node_id转换为item_id
- tree_info = fluid.default_main_program().global_block().var("TDM_Tree_Info")
+ tree_info = fluid.default_main_program().global_block().var(
+ "TDM_Tree_Info")
res_node_emb = fluid.layers.gather_nd(tree_info, res_node)
res_item = fluid.layers.slice(
diff --git a/PaddleRec/text_matching_on_quora/.run_ce.sh b/PaddleRec/text_matching_on_quora/.run_ce.sh
deleted file mode 100755
index f1bb7febd3f2c572544612baf24be14c711108e3..0000000000000000000000000000000000000000
--- a/PaddleRec/text_matching_on_quora/.run_ce.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-export MKL_NUM_THREADS=1
-export OMP_NUM_THREADS=1
-
-cudaid=${text_matching_on_quora:=0} # use 0-th card as default
-export CUDA_VISIBLE_DEVICES=$cudaid
-
-FLAGS_benchmark=true python train_and_evaluate.py --model_name=cdssmNet --config=cdssm_base --enable_ce --epoch_num=5 | python _ce.py
-
-cudaid=${text_matching_on_quora_m:=0,1,2,3} # use 0,1,2,3 card as default
-export CUDA_VISIBLE_DEVICES=$cudaid
-
-FLAGS_benchmark=true python train_and_evaluate.py --model_name=cdssmNet --config=cdssm_base --enable_ce --epoch_num=5 | python _ce.py
diff --git a/PaddleRec/text_matching_on_quora/README.md b/PaddleRec/text_matching_on_quora/README.md
deleted file mode 100644
index eb1346b671e7873918d171cfb2c4993367c9d781..0000000000000000000000000000000000000000
--- a/PaddleRec/text_matching_on_quora/README.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# Text matching on Quora qestion-answer pair dataset
-
-## contents
-
-* [Introduction](#introduction)
- * [a brief review of the Quora Question Pair (QQP) Task](#a-brief-review-of-the-quora-question-pair-qqp-task)
- * [Our Work](#our-work)
-* [Environment Preparation](#environment-preparation)
- * [Install Fluid release 1.0](#install-fluid-release-10)
- * [cpu version](#cpu-version)
- * [gpu version](#gpu-version)
- * [Have I installed Fluid successfully?](#have-i-installed-fluid-successfully)
-* [Prepare Data](#prepare-data)
-* [Train and evaluate](#train-and-evaluate)
-* [Models](#models)
-* [Results](#results)
-
-
-## Introduction
-
-### a brief review of the Quora Question Pair (QQP) Task
-
-The [Quora Question Pair](https://data.quora.com/First-Quora-Dataset-Release-Question-Pairs) dataset contains 400,000 question pairs from [Quora](https://www.quora.com/), where people ask and answer questions related to specific areas. Each sample in the dataset consists of two questions (both English) and a label that represents whether the questions are duplicate. The dataset is well annotated by human.
-
-Below are two samples from the dataset. The last column indicates whether the two questions are duplicate (1) or not (0).
-
-|id | qid1 | qid2| question1| question2| is_duplicate
-|:---:|:---:|:---:|:---:|:---:|:---:|
-|0 |1 |2 |What is the step by step guide to invest in share market in india? |What is the step by step guide to invest in share market? |0|
-|1 |3 |4 |What is the story of Kohinoor (Koh-i-Noor) Diamond? | What would happen if the Indian government stole the Kohinoor (Koh-i-Noor) diamond back? |0|
-
- A [kaggle competition](https://www.kaggle.com/c/quora-question-pairs#description) was held based on this dataset in 2017. The kagglers were given a training dataset (with labels), and requested to make predictions on a test dataset (without labels). The predictions were evaluated by the log-likelihood loss on the test data.
-
-The kaggle competition has inspired much effective work. However, most of these models are rule-based and difficult to be transferred to new tasks. Researchers are seeking for more general models that work well on this task and other natual language processing (NLP) tasks.
-
-[Wang _et al._](https://arxiv.org/abs/1702.03814) proposed a bilateral multi-perspective matching (BIMPM) model based on the Quora Question Pair dataset. They splitted the original dataset to [3 parts](https://drive.google.com/file/d/0B0PlTAo--BnaQWlsZl9FZ3l1c28/view?usp=sharing): _train.tsv_ (384,348 samples), _dev.tsv_ (10,000 samples) and _test.tsv_ (10,000 samples). The class distribution of _train.tsv_ is unbalanced (37% positive and 63% negative), while those of _dev.tsv_ and _test.tsv_ are balanced(50% positive and 50% negetive). We used the same splitting method in our experiments.
-
-### Our Work
-
-Based on the Quora Question Pair Dataset, we implemented some classic models in the area of neural language understanding (NLU). The accuracy of prediction results are evaluated on the _test.tsv_ from [Wang _et al._](https://arxiv.org/abs/1702.03814).
-
-## Environment Preparation
-
-### Install Fluid release 1.0
-
-Please follow the [official document in English](http://www.paddlepaddle.org/documentation/docs/en/1.0/build_and_install/pip_install_en.html) or [official document in Chinese](http://www.paddlepaddle.org/documentation/docs/zh/1.0/beginners_guide/install/Start.html) to install the Fluid deep learning framework.
-
-#### Have I installed Fluid successfully?
-
-Run the following script from your command line:
-
-```shell
-python -c "import paddle"
-```
-
-If Fluid is installed successfully you should see no error message. Feel free to open issues under the [PaddlePaddle repository](https://github.com/PaddlePaddle/Paddle/issues) for support.
-
-## Prepare Data
-
-Please download the Quora dataset from [Google drive](https://drive.google.com/file/d/0B0PlTAo--BnaQWlsZl9FZ3l1c28/view?usp=sharing) and unzip to $HOME/.cache/paddle/dataset.
-
-Then run _data/prepare_quora_data.sh_ to download the pre-trained _word2vec_ embedding file -- _glove.840B.300d.zip_:
-
-```shell
-sh data/prepare_quora_data.sh
-```
-
-At this point the dataset directory ($HOME/.cache/paddle/dataset) structure should be:
-
-```shell
-
-$HOME/.cache/paddle/dataset
- |- Quora_question_pair_partition
- |- train.tsv
- |- test.tsv
- |- dev.tsv
- |- readme.txt
- |- wordvec.txt
- |- glove.840B.300d.txt
-```
-
-## Train and evaluate
-
-We provide multiple models and configurations. Details are shown in `models` and `configs` directories. For a quick start, please run the _cdssmNet_ model with the corresponding configuration:
-
-```shell
-python train_and_evaluate.py \
- --model_name=cdssmNet \
- --config=cdssm_base
-```
-
-Logs will be output to the console. If everything works well, the logging information will have the same formats as the content in _cdssm_base.log_.
-
-All configurations used in our experiments are as follows:
-
-|Model|Config|command
-|:----:|:----:|:----:|
-|cdssmNet|cdssm_base|python train_and_evaluate.py --model_name=cdssmNet --config=cdssm_base
-|DecAttNet|decatt_glove|python train_and_evaluate.py --model_name=DecAttNet --config=decatt_glove
-|InferSentNet|infer_sent_v1|python train_and_evaluate.py --model_name=InferSentNet --config=infer_sent_v1
-|InferSentNet|infer_sent_v2|python train_and_evaluate.py --model_name=InferSentNet --config=infer_sent_v2
-|SSENet|sse_base|python train_and_evaluate.py --model_name=SSENet --config=sse_base
-
-## Models
-
-We implemeted 4 models for now: the convolutional deep-structured semantic model (CDSSM, CNN-based), the InferSent model (RNN-based), the shortcut-stacked encoder (SSE, RNN-based), and the decomposed attention model (DecAtt, attention-based).
-
-|Model|features|Context Encoder|Match Layer|Classification Layer
-|:----:|:----:|:----:|:----:|:----:|
-|CDSSM|word|1 layer conv1d|concatenation|MLP
-|DecAtt|word|Attention|concatenation|MLP
-|InferSent|word|1 layer Bi-LSTM|concatenation/element-wise product/
absolute element-wise difference|MLP
-|SSE|word|3 layer Bi-LSTM|concatenation/element-wise product/
absolute element-wise difference|MLP
-
-### CDSSM
-
-```
-@inproceedings{shen2014learning,
- title={Learning semantic representations using convolutional neural networks for web search},
- author={Shen, Yelong and He, Xiaodong and Gao, Jianfeng and Deng, Li and Mesnil, Gr{\'e}goire},
- booktitle={Proceedings of the 23rd International Conference on World Wide Web},
- pages={373--374},
- year={2014},
- organization={ACM}
-}
-```
-
-### InferSent
-
-```
-@article{conneau2017supervised,
- title={Supervised learning of universal sentence representations from natural language inference data},
- author={Conneau, Alexis and Kiela, Douwe and Schwenk, Holger and Barrault, Loic and Bordes, Antoine},
- journal={arXiv preprint arXiv:1705.02364},
- year={2017}
-}
-```
-
-### SSE
-
-```
-@article{nie2017shortcut,
- title={Shortcut-stacked sentence encoders for multi-domain inference},
- author={Nie, Yixin and Bansal, Mohit},
- journal={arXiv preprint arXiv:1708.02312},
- year={2017}
-}
-```
-
-### DecAtt
-
-```
-@article{tomar2017neural,
- title={Neural paraphrase identification of questions with noisy pretraining},
- author={Tomar, Gaurav Singh and Duque, Thyago and T{\"a}ckstr{\"o}m, Oscar and Uszkoreit, Jakob and Das, Dipanjan},
- journal={arXiv preprint arXiv:1704.04565},
- year={2017}
-}
-```
-
-## Results
-
-|Model|Config|dev accuracy| test accuracy
-|:----:|:----:|:----:|:----:|
-|cdssmNet|cdssm_base|83.56%|82.83%|
-|DecAttNet|decatt_glove|86.31%|86.22%|
-|InferSentNet|infer_sent_v1|87.15%|86.62%|
-|InferSentNet|infer_sent_v2|88.55%|88.43%|
-|SSENet|sse_base|88.35%|88.25%|
-
-In our experiment, we found that LSTM-based models outperformed convolution-based models. The DecAtt model has fewer parameters than LSTM-based models, but is sensitive to hyper-parameters.
-
-
-
-
-
-
-
+
BMN Overview