Make import paddle.fluid possible now

Author: velconia

paddle/scripts/paddle_build.sh

@@ -79,7 +79,7 @@ function cmake_gen() {
         -DPYTHON_INCLUDE_DIR:PATH=/opt/python/cp27-cp27mu/include/python2.7
         -DPYTHON_LIBRARIES:FILEPATH=/opt/_internal/cpython-2.7.11-ucs4/lib/libpython2.7.so"
         elif [ "$1" == "cp35-cp35m" ]; then
-            export LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/
+            export LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH}
             export PATH=/opt/_internal/cpython-3.5.1/bin/:${PATH}
             export PYTHON_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.5.1/bin/python3
             -DPYTHON_INCLUDE_DIR:PATH=/opt/_internal/cpython-3.5.1/include/python3.5m

python/paddle/reader/decorator.py

@@ -20,7 +20,7 @@
 from threading import Thread
 import subprocess
 
-from Queue import Queue
+from six.moves import queue
 import itertools
 import random
 import zlib
@@ -190,7 +190,7 @@ def read_worker(r, q):
 
     def data_reader():
         r = reader()
-        q = Queue(maxsize=size)
+        q = queue(maxsize=size)
         t = Thread(
             target=read_worker, args=(
                 r,
@@ -293,8 +293,8 @@ def order_handle_worker(in_queue, out_queue, mapper, out_order):
         out_queue.put(end)
 
     def xreader():
-        in_queue = Queue(buffer_size)
-        out_queue = Queue(buffer_size)
+        in_queue = queue(buffer_size)
+        out_queue = queue(buffer_size)
         out_order = [0]
         # start a read worker in a thread
         target = order_read_worker if order else read_worker

python/requirements.txt

@@ -8,3 +8,4 @@ scipy>=0.19.0
 Pillow
 nltk>=3.2.2
 graphviz
+six

python/setup.py.in

@@ -17,6 +17,7 @@ def git_commit():
         git_commit = subprocess.Popen(cmd, stdout = subprocess.PIPE).communicate()[0].strip()
     except:
         git_commit = 'Unknown'
+    git_commit = git_commit.decode()
     return str(git_commit)
 
 def _get_version_detail(idx):
@@ -44,6 +45,7 @@ def is_taged():
     try:
         cmd = ['git', 'describe', '--exact-match', '--tags']
         git_tag = subprocess.Popen(cmd, stdout = subprocess.PIPE).communicate()[0].strip()
+        git_tag = git_tag.decode()
     except:
         return False