compatible with Akagi riichi library

latorc · Mar 31, 2024 · f1b02ce · f1b02ce
1 parent 5b4c553
commit f1b02ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/game_state.py b/game_state.py
@@ -2,8 +2,10 @@
 from liqi import MsgType
 from liqi import LiqiProto, LiqiMethod, LiqiAction
 
-
-import libriichi
+try:
+    import libriichi
+except:
+    import riichi as libriichi
 import mj_helper
 from mj_helper import MJAI_TYPE, GameInfo
 from mjai.engine import MortalEngine

diff --git a/libriichi/__init__.py b/libriichi/__init__.py
@@ -1,15 +1,9 @@
-try:
-    from .libriichi import *
+from .libriichi import *
 
-    __doc__ = libriichi.__doc__
-    if hasattr(libriichi, "__all__"):
-        __all__ = libriichi.__all__
-except Exception as e:
-    from .riichi import *
+__doc__ = libriichi.__doc__
+if hasattr(libriichi, "__all__"):
+    __all__ = libriichi.__all__
 
-    __doc__ = riichi.__doc__
-    if hasattr(riichi, "__all__"):
-        __all__ = riichi.__all__
 """
 Submodule: arena
 Module: libriichi.libriichi.arena

diff --git a/libriichi/riichi.pyd b/libriichi/riichi.pyd
diff --git a/mjai/model.py b/mjai/model.py
@@ -7,7 +7,10 @@
 from torch.distributions import Normal, Categorical
 from typing import *
 from functools import partial
-import libriichi
+try:
+    import libriichi
+except:
+    import riichi as libriichi
 
 
 class ChannelAttention(nn.Module):