Merge pull request baidu#7 from naturali/py3_compatible

lkliukai · web-flow · commit 3e6a99344c5f · 2018-03-15T09:52:01.000+08:00
python3 compatible (only test tensorflow side)
diff --git a/tensorflow/rc_model.py b/tensorflow/rc_model.py
@@ -329,7 +329,7 @@ def evaluate(self, eval_batches, result_dir=None, result_prefix=None, save_full_
             result_file = os.path.join(result_dir, result_prefix + '.json')
             with open(result_file, 'w') as fout:
                 for pred_answer in pred_answers:
-                    fout.write(json.dumps(pred_answer, encoding='utf8', ensure_ascii=False) + '\n')
+                    fout.write(json.dumps(pred_answer, ensure_ascii=False) + '\n')
 
             self.logger.info('Saving {} results to {}'.format(result_prefix, result_file))
 
diff --git a/tensorflow/run.py b/tensorflow/run.py
@@ -17,10 +17,10 @@
 """
 This module prepares and runs the whole system.
 """
-
 import sys
-reload(sys)
-sys.setdefaultencoding('utf8')
+if sys.version[0] == '2':
+    reload(sys)
+    sys.setdefaultencoding("utf-8")
 sys.path.append('..')
 import os
 os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
diff --git a/utils/download_thirdparty.sh b/utils/download_thirdparty.sh
@@ -42,3 +42,7 @@ download "rouge_metric" ${rouge_base_url} ${rouge_files[@]}
 
 # prepare bleu
 download "bleu_metric" ${bleu_base_url} ${bleu_files[@]}
+
+# convert python 2.x source code to python 3.x
+2to3 -w "../utils/bleu_metric/bleu_scorer.py"
+2to3 -w "../utils/bleu_metric/bleu.py"
diff --git a/utils/dureader_eval.py b/utils/dureader_eval.py
@@ -25,8 +25,8 @@
 import zipfile
 
 from collections import Counter
-from bleu_metric.bleu import Bleu
-from rouge_metric.rouge import Rouge
+from .bleu_metric.bleu import Bleu
+from .rouge_metric.rouge import Rouge
 
 EMPTY = ''
 YESNO_LABELS = set(['Yes', 'No', 'Depends'])
@@ -529,9 +529,9 @@ def main(args):
     except AssertionError as ae:
         err = ae
 
-    print json.dumps(
+    print(json.dumps(
             format_metrics(metrics, args.task, err),
-            ensure_ascii=False).encode('utf8')
+            ensure_ascii=False).encode('utf8'))
 
 
 if __name__ == '__main__':
diff --git a/utils/preprocess.py b/utils/preprocess.py
@@ -19,8 +19,9 @@
 """
 
 import sys
-reload(sys)
-sys.setdefaultencoding('utf8')
+if sys.version[0] == '2':
+    reload(sys)
+    sys.setdefaultencoding("utf-8")
 import json
 from collections import Counter
 
