From faffc25c19cdc9504214a4c0c85aa131a44079de Mon Sep 17 00:00:00 2001
From: heqiaozhi <heqiaozhi@baidu.com>
Date: Wed, 12 Dec 2018 15:28:27 +0800
Subject: [PATCH] fix hadoop home bug & refine setup.py

---
 python/paddle/fluid/async_executor.py | 5 +----
 python/setup.py.in                    | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/python/paddle/fluid/async_executor.py b/python/paddle/fluid/async_executor.py
index 2a6a11805e4..b077e1be7e4 100644
--- a/python/paddle/fluid/async_executor.py
+++ b/python/paddle/fluid/async_executor.py
@@ -153,13 +153,10 @@ class AsyncExecutor(object):
                                      data_feed.desc(), filelist, thread_num,
                                      fetch_var_names, mode, debug)
 
-    def download_data(self, afs_path, local_path, fs_default_name, ugi, process_num=12):
-        #hadoop_home = "$HADOOP_HOME"
+    def download_data(self, afs_path, local_path, fs_default_name, ugi, hadoop_home="$HADOOP_HOME", process_num=12):
         if self.instance is None:
             raise ValueError('instance is None, please run config_distributed_nodes init instance')
             
-        hadoop_home = "~/tools/hadoop-xingtian/hadoop/"
-
         configs = {
             "fs.default.name": fs_default_name,
             "hadoop.job.ugi": ugi
diff --git a/python/setup.py.in b/python/setup.py.in
index 200b96ec54e..9418804be20 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -103,8 +103,10 @@ packages=['paddle',
           'paddle.fluid',
           'paddle.fluid.proto',
           'paddle.fluid.proto.profiler',
+          'paddle.fluid.distributed',
           'paddle.fluid.layers',
           'paddle.fluid.contrib',
+          'paddle.fluid.contrib.utils',
           'paddle.fluid.contrib.decoder',
           'paddle.fluid.contrib.quantize',
           'paddle.fluid.transpiler',
-- 
GitLab