From 2511be1c7914c79edaeaa4eccc2e97cca4c95011 Mon Sep 17 00:00:00 2001
From: guru4elephant <guru4elephant@gmail.com>
Date: Mon, 13 Jan 2020 13:14:50 +0800
Subject: [PATCH] clean demo-client folder

---
 demo-client/CMakeLists.txt        |  9 ----
 demo-client/setup.py              | 69 -------------------------------
 demo-client/src/general_model.cpp |  1 -
 demo-client/src/general_model.h   |  1 +
 4 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 demo-client/setup.py

diff --git a/demo-client/CMakeLists.txt b/demo-client/CMakeLists.txt
index 4f24237f..a4b126a6 100644
--- a/demo-client/CMakeLists.txt
+++ b/demo-client/CMakeLists.txt
@@ -30,15 +30,6 @@ target_link_libraries(load_general_model -Wl,--whole-archive sdk-cpp -Wl,--no-wh
         -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 
-add_library(paddle_serving_client SHARED src/general_model.cpp src/pybind_general_model.cpp)
-target_link_libraries(paddle_serving_client brpc configure protobuf leveldb pybind python -lcrypto
-        -lssl -lz -lrt)
-
-add_executable(general_model_main ${CMAKE_CURRENT_LIST_DIR}/src/general_model_main.cpp)
-target_link_libraries(general_model_main -Wl,--whole-archive sdk-cpp paddle_serving_client -Wl,--no-whole-archive
-        -lpthread -lcrypto -lm -lrt -lssl -ldl
-	-lz)
-
 add_executable(echo ${CMAKE_CURRENT_LIST_DIR}/src/echo.cpp)
 target_link_libraries(echo -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive
         -lpthread -lcrypto -lm -lrt -lssl -ldl
diff --git a/demo-client/setup.py b/demo-client/setup.py
deleted file mode 100644
index 983ac4b5..00000000
--- a/demo-client/setup.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import os
-import re
-import sys
-import platform
-import subprocess
-
-from setuptools import setup, Extension
-from setuptools.command.build_ext import build_ext
-from distutils.version import LooseVersion
-
-
-class CMakeExtension(Extension):
-    def __init__(self, name, sourcedir=''):
-        Extension.__init__(self, name, sources=[])
-        self.sourcedir = os.path.abspath(sourcedir)
-
-
-class CMakeBuild(build_ext):
-    def run(self):
-        try:
-            out = subprocess.check_output(['cmake', '--version'])
-        except OSError:
-            raise RuntimeError("CMake must be installed to build the following extensions: " +
-                               ", ".join(e.name for e in self.extensions))
-
-        if platform.system() == "Windows":
-            cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
-            if cmake_version < '3.1.0':
-                raise RuntimeError("CMake >= 3.1.0 is required on Windows")
-
-        for ext in self.extensions:
-            self.build_extension(ext)
-
-    def build_extension(self, ext):
-        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
-        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
-                      '-DPYTHON_EXECUTABLE=' + sys.executable]
-
-        cfg = 'Debug' if self.debug else 'Release'
-        build_args = ['--config', cfg]
-
-        if platform.system() == "Windows":
-            cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
-            if sys.maxsize > 2**32:
-                cmake_args += ['-A', 'x64']
-            build_args += ['--', '/m']
-        else:
-            cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
-            build_args += ['--', '-j2']
-
-        env = os.environ.copy()
-        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
-                                                              self.distribution.get_version())
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
-        subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
-
-setup(
-    name='paddle_serving_client',
-    version='0.0.1',
-    author='PaddlePaddle Authors',
-    author_email='guru4elephant@gmail.com',
-    description='Paddle Serving Python Client API',
-    long_description='',
-    ext_modules=[CMakeExtension('paddle_serving_client')],
-    cmdclass=dict(build_ext=CMakeBuild),
-    zip_safe=False,
-)
diff --git a/demo-client/src/general_model.cpp b/demo-client/src/general_model.cpp
index 6ce7e6c0..c281c54f 100644
--- a/demo-client/src/general_model.cpp
+++ b/demo-client/src/general_model.cpp
@@ -15,7 +15,6 @@
 #include <fstream>
 #include "general_model.h"
 #include "sdk-cpp/builtin_format.pb.h"
-#include "sdk-cpp/load_general_model_service.pb.h"
 #include "sdk-cpp/include/common.h"
 #include "sdk-cpp/include/predictor_sdk.h"
 
diff --git a/demo-client/src/general_model.h b/demo-client/src/general_model.h
index 267e10da..91084a61 100644
--- a/demo-client/src/general_model.h
+++ b/demo-client/src/general_model.h
@@ -37,6 +37,7 @@ namespace general_model {
 
 typedef std::map<std::string, std::vector<float>> FetchedMap;
 
+
 class PredictorClient {
  public:
   PredictorClient() {}
-- 
GitLab