Merge pull request #39 from qjing666/master

fix bug in submitter_demo:

paddle_fl/examples/submitter_demo/scheduler_client.py

@@ -18,8 +18,8 @@ print(random_port)
 current_ip = socket.gethostbyname(socket.gethostname())
 endpoints = "{}:{}".format(current_ip, random_port)
 #start a web server for remote endpoints to download their config 
-#os.system("python -m SimpleHTTPServer 8080 &")
-os.system("python -m http.server 8080 &")
+os.system("python -m SimpleHTTPServer 8080 &")
+#os.system("python -m http.server 8080 &")
 if os.path.exists("job_config"):
     os.system("rm -rf job_config")
 if os.path.exists("package"):

paddle_fl/examples/submitter_demo/train_program.py

@@ -91,12 +91,12 @@ else:
     output_folder = "fl_model"
     epoch_id = 0
     while not trainer.stop():
-        print("batch %d start train" % (step_i))
+        print("epoch %d start train" % (epoch_id))
         step_i = 0
         for data in reader():
             trainer.run(feed=data, fetch=[])
             step_i += 1
-            if train_step == trainer._step:
+            if step_i  == trainer._step:
                 break
         epoch_id += 1
         if epoch_id % 5 == 0:

paddle_fl/version.py

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ PaddleFL version string """
-fl_version = "0.1.7"
-module_proto_version = "0.1.7"
+fl_version = "0.1.10"
+module_proto_version = "0.1.10"
 

setup.py

@@ -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 >= 1.6', 'zmq' 
+    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle >= 1.6', 'zmq', 'paddlepaddle-gpu >= 1.6' 
 ]
 
 if max_version < 3: