From 3dbd64ef61c78a4267fb73f7acc924a7ffd3d7e1 Mon Sep 17 00:00:00 2001
From: guru4elephant <guru4elephant@gmail.com>
Date: Fri, 28 Feb 2020 16:29:09 +0800
Subject: [PATCH] reorg setup files

---
 python/examples/criteo_ctr/test_server.py | 2 --
 python/paddle_serving_server/__init__.py  | 3 ++-
 python/setup.py.client.in                 | 2 +-
 python/setup.py.server.in                 | 2 +-
 python/setup.py.server_gpu.in             | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/python/examples/criteo_ctr/test_server.py b/python/examples/criteo_ctr/test_server.py
index 583382c9..98400108 100644
--- a/python/examples/criteo_ctr/test_server.py
+++ b/python/examples/criteo_ctr/test_server.py
@@ -6,13 +6,11 @@ from paddle_serving_server import Server
 
 op_maker = OpMaker()
 read_op = op_maker.create('general_reader')
-dist_op = op_maker.create('general_dist_kv')
 general_infer_op = op_maker.create('general_infer')
 response_op = op_maker.create('general_response')
 
 op_seq_maker = OpSeqMaker()
 op_seq_maker.add_op(read_op)
-op_seq_maker.add_op(dist_op)
 op_seq_maker.add_op(general_infer_op)
 op_seq_maker.add_op(response_op)
 
diff --git a/python/paddle_serving_server/__init__.py b/python/paddle_serving_server/__init__.py
index 6f85bdc5..7c5c8996 100644
--- a/python/paddle_serving_server/__init__.py
+++ b/python/paddle_serving_server/__init__.py
@@ -32,7 +32,8 @@ class OpMaker(object):
             "general_text_reader": "GeneralTextReaderOp",
             "general_text_response": "GeneralTextResponseOp",
             "general_single_kv": "GeneralSingleKVOp",
-            "general_dist_kv": "GeneralDistKVOp"
+            "general_dist_kv": "GeneralDistKVOp",
+            "general_copy": "GeneralCopyOp"
         }
 
     # currently, inputs and outputs are not used
diff --git a/python/setup.py.client.in b/python/setup.py.client.in
index ce4d6554..53501a54 100644
--- a/python/setup.py.client.in
+++ b/python/setup.py.client.in
@@ -35,7 +35,7 @@ def copy_lib():
         os.popen('cp {} ./paddle_serving_client/lib'.format(text.strip().split(' ')[1]))
 
 max_version, mid_version, min_version = python_version()
-copy_lib()
+#copy_lib()
 
 REQUIRED_PACKAGES = [
     'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle'
diff --git a/python/setup.py.server.in b/python/setup.py.server.in
index 340bd787..2b2ba315 100644
--- a/python/setup.py.server.in
+++ b/python/setup.py.server.in
@@ -29,7 +29,7 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle'
+    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle',
 ]
 
 packages=['paddle_serving_server',
diff --git a/python/setup.py.server_gpu.in b/python/setup.py.server_gpu.in
index efe167e6..68b0f76b 100644
--- a/python/setup.py.server_gpu.in
+++ b/python/setup.py.server_gpu.in
@@ -29,7 +29,7 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle'
+    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle',
 ]
 
 packages=['paddle_serving_server_gpu',
-- 
GitLab