Fix imports

Author: danielhers

scheme/constraint/amr.py

@@ -1,4 +1,4 @@
-from util.amr import *
+from scheme.util.amr import *
 
 
 class Constraints(constraints.Constraints):

scheme/conversion/amr.py

@@ -1,9 +1,8 @@
-from collections import defaultdict, namedtuple, OrderedDict
-
 import penman
+from collections import defaultdict, namedtuple, OrderedDict
 from ucca import layer0, layer1, convert
 
-from util.amr import *
+from scheme.util.amr import *
 
 DELETE_PATTERN = re.compile("\\\\|(?<=(?<!<)<)[^<>]+(?=>(?!>))")  # Delete text inside single angle brackets
 

scheme/convert.py

@@ -2,14 +2,15 @@
 
 import argparse
 import glob
-import os
-import re
 import sys
 
-from conversion.amr import CONVERTERS
+import os
+import re
 from ucca.convert import split2sentences
 from ucca.ioutil import passage2file, file2passage
 
+from scheme.conversion.amr import CONVERTERS
+
 desc = """Parses files in the specified format, and writes as the specified format.
 Each passage is written to the file: <outdir>/<prefix><passage_id>.<extension> """
 

scheme/convert_and_evaluate.py

@@ -2,14 +2,15 @@
 
 import argparse
 import glob
-import os
 import sys
 
-from conversion.amr import from_amr, to_amr
-from evaluation.amr import evaluate, Scores
-from tupa.config import VAction
+import os
 from ucca.ioutil import passage2file
 
+from scheme.conversion.amr import from_amr, to_amr
+from scheme.evaluation.amr import evaluate, Scores
+from tupa.config import VAction
+
 desc = """Parses files in AMR format, converts to UCCA standard format,
 converts back to the original format and evaluates using smatch.
 """

scheme/evaluate.py

@@ -2,7 +2,7 @@
 
 import argparse
 
-from evaluation.amr import evaluate
+from scheme.evaluation.amr import evaluate
 from tupa.config import VAction
 
 desc = """Parses files in AMR format, and evaluates using smatch.

scheme/evaluation/amr.py

@@ -1,6 +1,6 @@
 import sys
 
-from util.amr import *
+from scheme.util.amr import *
 
 sys.path.insert(0, os.path.dirname(importlib.util.find_spec("smatch.smatch").origin))  # to find amr.py from smatch
 from smatch import smatch

scheme/split.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 import argparse
-import sys
-
 import glob
+import sys
 
-from util.amr import *
+from scheme.util.amr import *
 
 desc = """Split AMRs to separate files (important for shuffling before training the parser)"""
 

setup.py

@@ -87,6 +87,6 @@ def run(self):
           "src": os.path.join("scheme", "amr", "src"),
           "smatch": os.path.join("scheme", "smatch"),
       },
-      package_data={"src": ["amr.peg"], "util": ["resources/*.txt"]},
+      package_data={"src": ["amr.peg"], "scheme.util": ["resources/*.txt"]},
       cmdclass={"install": install},
       )

tests/test_amr.py

@@ -2,10 +2,11 @@
 
 import unittest
 
-from conversion.amr import from_amr, to_amr
-from evaluation.amr import evaluate
 from ucca.convert import split2sentences
 
+from scheme.conversion.amr import from_amr, to_amr
+from scheme.evaluation.amr import evaluate
+
 
 class ConversionTests(unittest.TestCase):
     """Tests conversion module correctness and API."""

tests/test_parser.py

@@ -2,12 +2,13 @@
 
 import unittest
 
-from states.state import State
+from ucca import convert, evaluation, ioutil
+
 from tupa.action import Actions
 from tupa.config import Config, SPARSE, MLP_NN, BILSTM_NN, NOOP
 from tupa.oracle import Oracle
 from tupa.parse import Parser
-from ucca import convert, evaluation, ioutil
+from tupa.states.state import State
 
 NUM_PASSAGES = 2