support DP 2.x inference (#162)

* support DP 2.x inference

which has a breaking change in the inference interface

* update another place where deepmd is imported

Author: njzjz

dpdata/system.py

@@ -964,7 +964,12 @@ def predict(self, dp):
         labeled_sys LabeledSystem
             The labeled system.
         """
-        import deepmd.DeepPot as DeepPot
+        try:
+            # DP 1.x
+            import deepmd.DeepPot as DeepPot
+        except ModuleNotFoundError:
+            # DP 2.x
+            from deepmd.infer import DeepPot
         if not isinstance(dp, DeepPot):
             dp = DeepPot(dp)
         type_map = dp.get_type_map()
@@ -1800,7 +1805,12 @@ def from_deepmd_npy(self, folder):
         return self
 
     def predict(self, dp):
-        import deepmd.DeepPot as DeepPot
+        try:
+            # DP 1.x
+            import deepmd.DeepPot as DeepPot
+        except ModuleNotFoundError:
+            # DP 2.x
+            from deepmd.infer import DeepPot
         if not isinstance(dp, DeepPot):
             dp = DeepPot(dp)
         new_multisystems = dpdata.MultiSystems()