Clean code

examples/ocr/data.py

@@ -97,7 +97,7 @@ class PadTarget(object):
         return samples
 
 
-class MyBatchSampler(fluid.io.BatchSampler):
+class BatchSampler(fluid.io.BatchSampler):
     def __init__(self,
                  dataset,
                  batch_size,
@@ -178,8 +178,6 @@ class OCRDataset(paddle.io.Dataset):
                 h, w = int(h), int(w)
                 labels = [int(c) for c in labels.split(',')]
                 self._sample_infos.append(SampleInfo(i, h, w, im_name, labels))
-        #self._sample_infos = sorted(self._sample_infos,
-        #    key=lambda x: x.w)
 
     def __getitem__(self, idx):
         info = self._sample_infos[idx]

examples/ocr/eval.py

-# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ def main(FLAGS):
     test_dataset = data.test()
     test_collate_fn = BatchCompose(
         [data.Resize(), data.Normalize(), data.PadTarget()])
-    test_sampler = data.MyBatchSampler(
+    test_sampler = data.BatchSampler(
         test_dataset,
         batch_size=FLAGS.batch_size,
         drop_last=False,
@@ -125,7 +125,7 @@ def beam_search(FLAGS):
     test_dataset = data.test()
     test_collate_fn = BatchCompose(
         [data.Resize(), data.Normalize(), data.PadTarget()])
-    test_sampler = data.MyBatchSampler(
+    test_sampler = data.BatchSampler(
         test_dataset,
         batch_size=FLAGS.batch_size,
         drop_last=False,

examples/ocr/predict.py

-# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

examples/ocr/seq2seq_attn.py

-# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

examples/ocr/train.py

-# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ def main(FLAGS):
     train_dataset = data.train()
     train_collate_fn = BatchCompose(
         [data.Resize(), data.Normalize(), data.PadTarget()])
-    train_sampler = data.MyBatchSampler(
+    train_sampler = data.BatchSampler(
         train_dataset, batch_size=FLAGS.batch_size, shuffle=True)
     train_loader = fluid.io.DataLoader(
         train_dataset,
@@ -112,7 +112,7 @@ def main(FLAGS):
     test_dataset = data.test()
     test_collate_fn = BatchCompose(
         [data.Resize(), data.Normalize(), data.PadTarget()])
-    test_sampler = data.MyBatchSampler(
+    test_sampler = data.BatchSampler(
         test_dataset,
         batch_size=FLAGS.batch_size,
         drop_last=False,

examples/ocr/utility.py

 """Contains common utility functions."""
-#  Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
+#  Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve.
 #
 #Licensed under the Apache License, Version 2.0 (the "License");
 #you may not use this file except in compliance with the License.