fix conflic in program

ea019601 · andyjpaddle · ea52f47a · ea019601
Commit ea019601 authored Aug 31, 2021 by andyjpaddle
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

tools/program.py tools/program.py +1 -5

No files found.
--- a/tools/program.py
+++ b/tools/program.py
@@ -402,11 +402,7 @@ def preprocess(is_train=False):
    alg = config['Architecture']['algorithm']
    assert alg in [
        'EAST', 'DB', 'SAST', 'Rosetta', 'CRNN', 'STARNet', 'RARE', 'SRN',
-<<<<<<< HEAD
-        'CLS', 'PGNet', 'Distillation', 'TableAttn', 'SAR'
-=======
-        'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn'
->>>>>>> 63ed5fcab30801626ecf55a89f5dc9faf79a16d2
+        'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn', 'SAR'
    ]

    device = 'gpu:{}'.format(dist.ParallelEnv().dev_id) if use_gpu else 'cpu'