Skip to content

Commit 1add720

Browse files
james-d-mitchelljames-d-mitchell
committed
hpcombi: fix issues when HPCombi is disabled
1 parent 33eedc2 commit 1add720

File tree

3 files changed

+47
-48
lines changed

3 files changed

+47
-48
lines changed

‎src/libsemigroups_pybind11/froidure_pin.py‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
from .detail.decorators import copydoc as _copydoc
9797

9898
if _LIBSEMIGROUPS_HPCOMBI_ENABLED:
99+
# Disable pylint which complains if HPCOMBI is not enabled
100+
# pylint: disable=no-name-in-module
99101
from _libsemigroups_pybind11 import (
100102
FroidurePinHPCombiPerm16 as _FroidurePinHPCombiPerm16,
101103
FroidurePinHPCombiPPerm16 as _FroidurePinHPCombiPPerm16,
@@ -118,34 +120,33 @@ class FroidurePin(_CxxWrapper):
118120

119121
__doc__ = _FroidurePinPBR.__doc__
120122

121-
_py_template_params_to_cxx_type = (
123+
_py_template_params_to_cxx_type = {
124+
(_BMat,): _FroidurePinBMat,
125+
(_BMat8,): _FroidurePinBMat8,
126+
(_Bipartition,): _FroidurePinBipartition,
127+
(_IntMat,): _FroidurePinIntMat,
128+
(_MaxPlusMat,): _FroidurePinMaxPlusMat,
129+
(_MaxPlusTruncMat,): _FroidurePinMaxPlusTruncMat,
130+
(_MinPlusMat,): _FroidurePinMinPlusMat,
131+
(_MinPlusTruncMat,): _FroidurePinMinPlusTruncMat,
132+
(_NTPMat,): _FroidurePinNTPMat,
133+
(_PBR,): _FroidurePinPBR,
134+
(_PPerm1,): _FroidurePinPPerm1,
135+
(_PPerm2,): _FroidurePinPPerm2,
136+
(_PPerm4,): _FroidurePinPPerm4,
137+
(_Perm1,): _FroidurePinPerm1,
138+
(_Perm2,): _FroidurePinPerm2,
139+
(_Perm4,): _FroidurePinPerm4,
140+
(_ProjMaxPlusMat,): _FroidurePinProjMaxPlusMat,
141+
(_Transf1,): _FroidurePinTransf1,
142+
(_Transf2,): _FroidurePinTransf2,
143+
(_Transf4,): _FroidurePinTransf4,
144+
(_KBEStringTrie,): _FroidurePinKBEStringRewriteTrie,
145+
(_KBEStringFromLeft,): _FroidurePinKBEStringRewriteFromLeft,
146+
(_KBEWordTrie,): _FroidurePinKBEWordRewriteTrie,
147+
(_KBEWordFromLeft,): _FroidurePinKBEWordRewriteFromLeft,
148+
} | (
122149
{
123-
(_BMat,): _FroidurePinBMat,
124-
(_BMat8,): _FroidurePinBMat8,
125-
(_Bipartition,): _FroidurePinBipartition,
126-
(_IntMat,): _FroidurePinIntMat,
127-
(_MaxPlusMat,): _FroidurePinMaxPlusMat,
128-
(_MaxPlusTruncMat,): _FroidurePinMaxPlusTruncMat,
129-
(_MinPlusMat,): _FroidurePinMinPlusMat,
130-
(_MinPlusTruncMat,): _FroidurePinMinPlusTruncMat,
131-
(_NTPMat,): _FroidurePinNTPMat,
132-
(_PBR,): _FroidurePinPBR,
133-
(_PPerm1,): _FroidurePinPPerm1,
134-
(_PPerm2,): _FroidurePinPPerm2,
135-
(_PPerm4,): _FroidurePinPPerm4,
136-
(_Perm1,): _FroidurePinPerm1,
137-
(_Perm2,): _FroidurePinPerm2,
138-
(_Perm4,): _FroidurePinPerm4,
139-
(_ProjMaxPlusMat,): _FroidurePinProjMaxPlusMat,
140-
(_Transf1,): _FroidurePinTransf1,
141-
(_Transf2,): _FroidurePinTransf2,
142-
(_Transf4,): _FroidurePinTransf4,
143-
(_KBEStringTrie,): _FroidurePinKBEStringRewriteTrie,
144-
(_KBEStringFromLeft,): _FroidurePinKBEStringRewriteFromLeft,
145-
(_KBEWordTrie,): _FroidurePinKBEWordRewriteTrie,
146-
(_KBEWordFromLeft,): _FroidurePinKBEWordRewriteFromLeft,
147-
}
148-
| {
149150
(_HPCombiPTransf16,): _FroidurePinHPCombiPTransf16,
150151
(_HPCombiTransf16,): _FroidurePinHPCombiTransf16,
151152
(_HPCombiPerm16,): _FroidurePinHPCombiPerm16,

‎src/libsemigroups_pybind11/konieczny.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
from .detail.decorators import copydoc as _copydoc
5252

5353
if _LIBSEMIGROUPS_HPCOMBI_ENABLED:
54+
# Disable pylint which complains if HPCOMBI is not enabled
55+
# pylint: disable=no-name-in-module
5456
from _libsemigroups_pybind11 import (
5557
KoniecznyHPCombiPPerm16 as _KoniecznyHPCombiPPerm16,
5658
KoniecznyHPCombiPPerm16DClass as _KoniecznyHPCombiPPerm16DClass,
@@ -72,18 +74,17 @@ class Konieczny(_CxxWrapper):
7274
Element = _TypeVar("Element")
7375
__doc__ = _KoniecznyBMat.__doc__
7476

75-
_py_template_params_to_cxx_type = (
77+
_py_template_params_to_cxx_type = {
78+
(_BMat,): _KoniecznyBMat,
79+
(_BMat8,): _KoniecznyBMat8,
80+
(_PPerm1,): _KoniecznyPPerm1,
81+
(_PPerm2,): _KoniecznyPPerm2,
82+
(_PPerm4,): _KoniecznyPPerm4,
83+
(_Transf1,): _KoniecznyTransf1,
84+
(_Transf2,): _KoniecznyTransf2,
85+
(_Transf4,): _KoniecznyTransf4,
86+
} | (
7687
{
77-
(_BMat,): _KoniecznyBMat,
78-
(_BMat8,): _KoniecznyBMat8,
79-
(_PPerm1,): _KoniecznyPPerm1,
80-
(_PPerm2,): _KoniecznyPPerm2,
81-
(_PPerm4,): _KoniecznyPPerm4,
82-
(_Transf1,): _KoniecznyTransf1,
83-
(_Transf2,): _KoniecznyTransf2,
84-
(_Transf4,): _KoniecznyTransf4,
85-
}
86-
| {
8788
(_HPCombiPPerm16,): _KoniecznyHPCombiPPerm16,
8889
(_HPCombiPTransf16,): _KoniecznyHPCombiPTransf16,
8990
(_HPCombiTransf16,): _KoniecznyHPCombiTransf16,

‎src/libsemigroups_pybind11/schreier_sims.py‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
from .detail.decorators import copydoc as _copydoc
3333

3434
if _LIBSEMIGROUPS_HPCOMBI_ENABLED:
35+
# Disable pylint which complains if HPCOMBI is not enabled
36+
# pylint: disable=no-name-in-module
3537
from _libsemigroups_pybind11 import (
3638
SchreierSimsHPCombiPerm16 as _SchreierSimsHPCombiPerm16,
3739
hpcombi_Perm16 as _HPCombiPerm16,
@@ -47,16 +49,11 @@
4749
class SchreierSims(_CxxWrapper):
4850
__doc__ = _SchreierSimsPerm1.__doc__
4951

50-
_py_template_params_to_cxx_type = (
51-
{
52-
(_Perm1,): _SchreierSimsPerm1,
53-
(_Perm2,): _SchreierSimsPerm2,
54-
# (_Perm4,): _SchreierSims,
55-
}
56-
| {(_HPCombiPerm16,): _SchreierSimsHPCombiPerm16}
57-
if _LIBSEMIGROUPS_HPCOMBI_ENABLED
58-
else {}
59-
)
52+
_py_template_params_to_cxx_type = {
53+
(_Perm1,): _SchreierSimsPerm1,
54+
(_Perm2,): _SchreierSimsPerm2,
55+
# (_Perm4,): _SchreierSims,
56+
} | ({(_HPCombiPerm16,): _SchreierSimsHPCombiPerm16} if _LIBSEMIGROUPS_HPCOMBI_ENABLED else {})
6057

6158
_cxx_type_to_py_template_params = dict(
6259
zip(

0 commit comments

Comments
 (0)