Merge pull request #16 from explosion/register-entropypoint-without-torch

Do not fail to register entry points when Torch is not installed

Author: polm

spacy_experimental/biaffine_parser/bilinear.py

@@ -7,7 +7,13 @@
 from thinc.shims.pytorch_grad_scaler import PyTorchGradScaler
 from thinc.types import ArgsKwargs, Floats2d, Ints1d
 
-from .pytorch_bilinear import BilinearModel as PyTorchBilinearModel
+
+# Ensure that the spacy-experimental package can register entry points without
+# Torch installed.
+try:
+    from .pytorch_bilinear import BilinearModel as PyTorchBilinearModel
+except ImportError:
+    PyTorchBilinearModel = None
 
 
 def build_bilinear(
@@ -19,6 +25,9 @@ def build_bilinear(
     mixed_precision: bool = False,
     grad_scaler: Optional[PyTorchGradScaler] = None
 ) -> Model[Tuple[List[Doc], Ints1d], Floats2d]:
+    if PyTorchBilinearModel is None:
+        raise ImportError("BiLinear layer requires PyTorch: pip install thinc[torch]")
+
     nI = None
     if tok2vec.has_dim("nO") is True:
         nI = tok2vec.get_dim("nO")

spacy_experimental/biaffine_parser/pairwise_bilinear.py

@@ -7,9 +7,14 @@
 from thinc.shims.pytorch_grad_scaler import PyTorchGradScaler
 from thinc.types import ArgsKwargs, Floats2d, Floats3d, Floats4d, Ints1d
 
-from .pytorch_pairwise_bilinear import (
-    PairwiseBilinearModel as PyTorchPairwiseBilinearModel,
-)
+# Ensure that the spacy-experimental package can register entry points without
+# Torch installed.
+try:
+    from .pytorch_pairwise_bilinear import (
+        PairwiseBilinearModel as PyTorchPairwiseBilinearModel,
+    )
+except ImportError:
+    PyTorchPairwiseBilinearModel = None
 
 
 def build_pairwise_bilinear(
@@ -21,6 +26,11 @@ def build_pairwise_bilinear(
     mixed_precision: bool = False,
     grad_scaler: Optional[PyTorchGradScaler] = None
 ) -> Model[Tuple[List[Doc], Ints1d], Floats2d]:
+    if PyTorchPairwiseBilinearModel is None:
+        raise ImportError(
+            "PairwiseBiLinear layer requires PyTorch: pip install thinc[torch]"
+        )
+
     nI = None
     if tok2vec.has_dim("nO") is True:
         nI = tok2vec.get_dim("nO")