diff --git a/spacy/syntax/_parser_model.pyx b/spacy/syntax/_parser_model.pyx index 60d22a1ab..7a4eccfc4 100644 --- a/spacy/syntax/_parser_model.pyx +++ b/spacy/syntax/_parser_model.pyx @@ -16,7 +16,7 @@ from thinc.api import Linear, Model, CupyOps, NumpyOps, use_ops, noop from ..typedefs cimport weight_t, class_t, hash_t from ..tokens.doc cimport Doc -from ..gold cimport GoldParse +from .gold_parse cimport GoldParse from .stateclass cimport StateClass from .transition_system cimport Transition diff --git a/spacy/syntax/gold_parse.pyx b/spacy/syntax/gold_parse.pyx index 59e8f4bbb..df4059a21 100644 --- a/spacy/syntax/gold_parse.pyx +++ b/spacy/syntax/gold_parse.pyx @@ -10,11 +10,12 @@ import srsly import warnings from .. import util -from ..syntax import nonproj +from . import nonproj from ..tokens import Doc, Span from ..errors import Errors, AlignmentError, Warnings -from .iob_utils import offsets_from_biluo_tags -from .align import align +from ..gold.annotation import TokenAnnotation +from ..gold.iob_utils import offsets_from_biluo_tags, biluo_tags_from_offsets +from ..gold.align import align punct_re = re.compile(r"\W")