From 5408abe411c3f73cba471068692419f048235aa5 Mon Sep 17 00:00:00 2001
From: yangyaming <mxscmxsc@gmail.com>
Date: Fri, 2 Feb 2018 16:30:22 +0800
Subject: [PATCH] Enhance compatibility for python version and change data_read
 to data_reader.

---
 fluid/DeepASR/data_utils/augmentor/tests/test_data_trans.py | 3 ++-
 fluid/DeepASR/data_utils/augmentor/trans_add_delta.py       | 4 ++++
 .../data_utils/augmentor/trans_mean_variance_norm.py        | 4 ++++
 fluid/DeepASR/data_utils/augmentor/trans_splice.py          | 4 ++++
 fluid/DeepASR/data_utils/{data_read.py => data_reader.py}   | 6 ++++--
 fluid/DeepASR/data_utils/util.py                            | 5 +++++
 fluid/DeepASR/stacked_dynamic_lstm.py                       | 2 +-
 7 files changed, 24 insertions(+), 4 deletions(-)
 rename fluid/DeepASR/data_utils/{data_read.py => data_reader.py} (98%)

diff --git a/fluid/DeepASR/data_utils/augmentor/tests/test_data_trans.py b/fluid/DeepASR/data_utils/augmentor/tests/test_data_trans.py
index b1d45a39..157ab02e 100644
--- a/fluid/DeepASR/data_utils/augmentor/tests/test_data_trans.py
+++ b/fluid/DeepASR/data_utils/augmentor/tests/test_data_trans.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-#by zhxfl 2018.01.31
 import sys
 import unittest
 import numpy as np
diff --git a/fluid/DeepASR/data_utils/augmentor/trans_add_delta.py b/fluid/DeepASR/data_utils/augmentor/trans_add_delta.py
index 9cb62ce8..dc1a4fa4 100644
--- a/fluid/DeepASR/data_utils/augmentor/trans_add_delta.py
+++ b/fluid/DeepASR/data_utils/augmentor/trans_add_delta.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import math
 import copy
diff --git a/fluid/DeepASR/data_utils/augmentor/trans_mean_variance_norm.py b/fluid/DeepASR/data_utils/augmentor/trans_mean_variance_norm.py
index e3336531..5b541d42 100644
--- a/fluid/DeepASR/data_utils/augmentor/trans_mean_variance_norm.py
+++ b/fluid/DeepASR/data_utils/augmentor/trans_mean_variance_norm.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import math
 
diff --git a/fluid/DeepASR/data_utils/augmentor/trans_splice.py b/fluid/DeepASR/data_utils/augmentor/trans_splice.py
index 4cebe2c1..94f5258d 100644
--- a/fluid/DeepASR/data_utils/augmentor/trans_splice.py
+++ b/fluid/DeepASR/data_utils/augmentor/trans_splice.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import math
 
diff --git a/fluid/DeepASR/data_utils/data_read.py b/fluid/DeepASR/data_utils/data_reader.py
similarity index 98%
rename from fluid/DeepASR/data_utils/data_read.py
rename to fluid/DeepASR/data_utils/data_reader.py
index 51fec070..69620629 100644
--- a/fluid/DeepASR/data_utils/data_read.py
+++ b/fluid/DeepASR/data_utils/data_reader.py
@@ -4,6 +4,10 @@
    Todos:
         1. multiprocess read block from disk
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import random
 import Queue
 import numpy as np
@@ -214,7 +218,6 @@ class DataRead(object):
         for (nidx, sample) in enumerate(lsample):
             for trans in self._ltrans:
                 sample = trans.perform_trans(sample)
-            #print nidx
             lsample[nidx] = sample
 
         return lsample
@@ -234,7 +237,6 @@ class DataRead(object):
         for (nidx, sample) in enumerate(lsample):
             for trans in self._ltrans:
                 sample = trans.perform_trans(sample)
-            #print nidx
             lsample[nidx] = sample
 
         return lsample
diff --git a/fluid/DeepASR/data_utils/util.py b/fluid/DeepASR/data_utils/util.py
index a09a7dea..84de41c8 100644
--- a/fluid/DeepASR/data_utils/util.py
+++ b/fluid/DeepASR/data_utils/util.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+
 def to_lodtensor(data, place):
     """convert tensor to lodtensor
     """
diff --git a/fluid/DeepASR/stacked_dynamic_lstm.py b/fluid/DeepASR/stacked_dynamic_lstm.py
index 4218f045..51ba7a6b 100644
--- a/fluid/DeepASR/stacked_dynamic_lstm.py
+++ b/fluid/DeepASR/stacked_dynamic_lstm.py
@@ -12,7 +12,7 @@ import paddle.v2.fluid.profiler as profiler
 import data_utils.trans_mean_variance_norm as trans_mean_variance_norm
 import data_utils.trans_add_delta as trans_add_delta
 import data_utils.trans_splice as trans_splice
-import data_utils.data_read as reader
+import data_utils.data_reader as reader
 
 
 def parse_args():
-- 
GitLab