Skip to content

Commit f968a89

Browse files
mlouboutmloubout
committed
compiler: cleanup operator class names
1 parent 4899f11 commit f968a89

6 files changed

Lines changed: 38 additions & 39 deletions

File tree

‎devito/core/__init__.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
from devito.core.cpu import (Cpu64NoopCOperator, Cpu64NoopOmpOperator,
33
Cpu64AdvCOperator, Cpu64AdvOmpOperator,
44
Cpu64FsgCOperator, Cpu64FsgOmpOperator,
5-
Cpu64CustomOperator, Cpu64CXXCustomOperator,
5+
Cpu64CustomOperator, Cpu64CustomCXXOperator,
66
Cpu64CXXNoopCOperator, Cpu64CXXNoopOmpOperator,
7-
Cpu64AdvCXXOperator, Cpu64CXXAdvOmpOperator,
8-
Cpu64CXXFsgCOperator, Cpu64CXXFsgOmpOperator)
7+
Cpu64AdvCXXOperator, Cpu64AdvCXXOmpOperator,
8+
Cpu64FsgCXXOperator, Cpu64FsgCXXOmpOperator)
99

1010
from devito.core.intel import (Intel64AdvCOperator, Intel64AdvOmpOperator,
1111
Intel64FsgCOperator, Intel64FsgOmpOperator,
12-
Intel64CXXAdvCOperator, Intel64CXXAdvOmpOperator,
13-
Intel64CXXFsgCOperator, Intel64CXXFsgOmpOperator)
12+
Intel64CXXAdvCOperator, Intel64AdvCXXOmpOperator,
13+
Intel64FsgCXXOperator, Intel64FsgCXXOmpOperator)
1414
from devito.core.arm import (ArmAdvCOperator, ArmAdvOmpOperator,
15-
ArmCXXAdvCOperator, ArmCXXAdvOmpOperator)
15+
ArmAdvCXXOperator, ArmAdvCXXOmpOperator)
1616
from devito.core.power import (PowerAdvCOperator, PowerAdvOmpOperator,
17-
PowerCXXAdvCOperator, PowerCXXAdvOmpOperator)
17+
PowerCXXAdvCOperator, PowerAdvCXXOmpOperator)
1818
from devito.core.gpu import (DeviceNoopOmpOperator, DeviceNoopAccOperator,
1919
DeviceAdvOmpOperator, DeviceAdvAccOperator,
2020
DeviceFsgOmpOperator, DeviceFsgAccOperator,
@@ -24,8 +24,8 @@
2424
# Register CPU Operators
2525
operator_registry.add(Cpu64CustomOperator, Cpu64, 'custom', 'C')
2626
operator_registry.add(Cpu64CustomOperator, Cpu64, 'custom', 'openmp')
27-
operator_registry.add(Cpu64CXXCustomOperator, Cpu64, 'custom', 'CXX')
28-
operator_registry.add(Cpu64CXXCustomOperator, Cpu64, 'custom', 'CXXopenmp')
27+
operator_registry.add(Cpu64CustomCXXOperator, Cpu64, 'custom', 'CXX')
28+
operator_registry.add(Cpu64CustomCXXOperator, Cpu64, 'custom', 'CXXopenmp')
2929

3030
operator_registry.add(Cpu64NoopCOperator, Cpu64, 'noop', 'C')
3131
operator_registry.add(Cpu64NoopOmpOperator, Cpu64, 'noop', 'openmp')
@@ -35,32 +35,32 @@
3535
operator_registry.add(Cpu64AdvCOperator, Cpu64, 'advanced', 'C')
3636
operator_registry.add(Cpu64AdvOmpOperator, Cpu64, 'advanced', 'openmp')
3737
operator_registry.add(Cpu64AdvCXXOperator, Cpu64, 'advanced', 'CXX')
38-
operator_registry.add(Cpu64CXXAdvOmpOperator, Cpu64, 'advanced', 'CXXopenmp')
38+
operator_registry.add(Cpu64AdvCXXOmpOperator, Cpu64, 'advanced', 'CXXopenmp')
3939

4040
operator_registry.add(Cpu64FsgCOperator, Cpu64, 'advanced-fsg', 'C')
4141
operator_registry.add(Cpu64FsgOmpOperator, Cpu64, 'advanced-fsg', 'openmp')
42-
operator_registry.add(Cpu64CXXFsgCOperator, Cpu64, 'advanced-fsg', 'CXX')
43-
operator_registry.add(Cpu64CXXFsgOmpOperator, Cpu64, 'advanced-fsg', 'CXXopenmp')
42+
operator_registry.add(Cpu64FsgCXXOperator, Cpu64, 'advanced-fsg', 'CXX')
43+
operator_registry.add(Cpu64FsgCXXOmpOperator, Cpu64, 'advanced-fsg', 'CXXopenmp')
4444

4545
operator_registry.add(Intel64AdvCOperator, Intel64, 'advanced', 'C')
4646
operator_registry.add(Intel64AdvOmpOperator, Intel64, 'advanced', 'openmp')
4747
operator_registry.add(Intel64CXXAdvCOperator, Intel64, 'advanced', 'CXX')
48-
operator_registry.add(Intel64CXXAdvOmpOperator, Intel64, 'advanced', 'CXXopenmp')
48+
operator_registry.add(Intel64AdvCXXOmpOperator, Intel64, 'advanced', 'CXXopenmp')
4949

5050
operator_registry.add(Intel64FsgCOperator, Intel64, 'advanced-fsg', 'C')
5151
operator_registry.add(Intel64FsgOmpOperator, Intel64, 'advanced-fsg', 'openmp')
52-
operator_registry.add(Intel64CXXFsgCOperator, Intel64, 'advanced-fsg', 'CXX')
53-
operator_registry.add(Intel64CXXFsgOmpOperator, Intel64, 'advanced-fsg', 'CXXopenmp')
52+
operator_registry.add(Intel64FsgCXXOperator, Intel64, 'advanced-fsg', 'CXX')
53+
operator_registry.add(Intel64FsgCXXOmpOperator, Intel64, 'advanced-fsg', 'CXXopenmp')
5454

5555
operator_registry.add(ArmAdvCOperator, Arm, 'advanced', 'C')
5656
operator_registry.add(ArmAdvOmpOperator, Arm, 'advanced', 'openmp')
57-
operator_registry.add(ArmCXXAdvCOperator, Arm, 'advanced', 'CXX')
58-
operator_registry.add(ArmCXXAdvOmpOperator, Arm, 'advanced', 'CXXopenmp')
57+
operator_registry.add(ArmAdvCXXOperator, Arm, 'advanced', 'CXX')
58+
operator_registry.add(ArmAdvCXXOmpOperator, Arm, 'advanced', 'CXXopenmp')
5959

6060
operator_registry.add(PowerAdvCOperator, Power, 'advanced', 'C')
6161
operator_registry.add(PowerAdvOmpOperator, Power, 'advanced', 'openmp')
6262
operator_registry.add(PowerCXXAdvCOperator, Power, 'advanced', 'CXX')
63-
operator_registry.add(PowerCXXAdvOmpOperator, Power, 'advanced', 'CXXopenmp')
63+
operator_registry.add(PowerAdvCXXOmpOperator, Power, 'advanced', 'CXXopenmp')
6464

6565
# Register Device Operators
6666
operator_registry.add(DeviceCustomOmpOperator, Device, 'custom', 'C')

‎devito/core/arm.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
Cpu64AdvCOperator)
33
from devito.passes.iet import OmpTarget, CXXOmpTarget
44

5-
__all__ = ['ArmAdvCOperator', 'ArmAdvOmpOperator', 'ArmCXXAdvCOperator',
6-
'ArmCXXAdvOmpOperator']
5+
__all__ = ['ArmAdvCOperator', 'ArmAdvOmpOperator', 'ArmAdvCXXOperator',
6+
'ArmAdvCXXOmpOperator']
77

88

99
ArmAdvOperator = Cpu64AdvOperator
1010
ArmAdvCOperator = Cpu64AdvCOperator
11-
ArmCXXAdvOperator = Cpu64AdvCXXOperator
12-
ArmCXXAdvCOperator = Cpu64AdvCXXOperator
11+
ArmAdvCXXOperator = Cpu64AdvCXXOperator
1312

1413

1514
class ArmAdvOmpOperator(ArmAdvCOperator):
@@ -19,6 +18,6 @@ class ArmAdvOmpOperator(ArmAdvCOperator):
1918
PAR_NESTED = 4
2019

2120

22-
class ArmCXXAdvOmpOperator(ArmAdvOmpOperator):
21+
class ArmAdvCXXOmpOperator(ArmAdvOmpOperator):
2322
_Target = CXXOmpTarget
2423
LINEARIZE = True

‎devito/core/cpu.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
__all__ = ['Cpu64NoopCOperator', 'Cpu64NoopOmpOperator', 'Cpu64AdvCOperator',
1818
'Cpu64AdvOmpOperator', 'Cpu64FsgCOperator', 'Cpu64FsgOmpOperator',
19-
'Cpu64CustomOperator']
19+
'Cpu64CustomOperator', 'Cpu64CustomCXXOperator', 'Cpu64AdvCXXOperator',
20+
'Cpu64AdvCXXOmpOperator', 'Cpu64FsgCXXOperator', 'Cpu64FsgCXXOmpOperator']
2021

2122

2223
class Cpu64OperatorMixin:
@@ -318,7 +319,7 @@ def _make_iet_passes_mapper(cls, **kwargs):
318319
assert not (set(_known_passes) & set(_known_passes_disabled))
319320

320321

321-
class Cpu64CXXCustomOperator(Cpu64CustomOperator):
322+
class Cpu64CustomCXXOperator(Cpu64CustomOperator):
322323

323324
_Target = CXXTarget
324325
LINEARIZE = True
@@ -357,7 +358,7 @@ class Cpu64AdvOmpOperator(Cpu64AdvOperator):
357358
_Target = COmpTarget
358359

359360

360-
class Cpu64CXXAdvOmpOperator(Cpu64AdvOperator):
361+
class Cpu64AdvCXXOmpOperator(Cpu64AdvOperator):
361362
_Target = CXXOmpTarget
362363
LINEARIZE = True
363364

@@ -366,7 +367,7 @@ class Cpu64FsgCOperator(Cpu64FsgOperator):
366367
_Target = CTarget
367368

368369

369-
class Cpu64CXXFsgCOperator(Cpu64FsgOperator):
370+
class Cpu64FsgCXXOperator(Cpu64FsgOperator):
370371
_Target = CXXTarget
371372
LINEARIZE = True
372373

@@ -375,6 +376,6 @@ class Cpu64FsgOmpOperator(Cpu64FsgOperator):
375376
_Target = COmpTarget
376377

377378

378-
class Cpu64CXXFsgOmpOperator(Cpu64FsgOperator):
379+
class Cpu64FsgCXXOmpOperator(Cpu64FsgOperator):
379380
_Target = CXXOmpTarget
380381
LINEARIZE = True

‎devito/core/intel.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
from devito.core.cpu import (Cpu64AdvCOperator, Cpu64AdvOmpOperator,
22
Cpu64FsgCOperator, Cpu64FsgOmpOperator,
3-
Cpu64AdvCXXOperator, Cpu64CXXAdvOmpOperator,
4-
Cpu64CXXFsgCOperator, Cpu64CXXFsgOmpOperator)
3+
Cpu64AdvCXXOperator, Cpu64AdvCXXOmpOperator,
4+
Cpu64FsgCXXOperator, Cpu64FsgCXXOmpOperator)
55

66
__all__ = ['Intel64AdvCOperator', 'Intel64AdvOmpOperator', 'Intel64FsgCOperator',
7-
'Intel64FsgOmpOperator', 'Intel64CXXAdvCOperator', 'Intel64CXXAdvOmpOperator',
8-
'Intel64CXXFsgCOperator', 'Intel64CXXFsgOmpOperator']
7+
'Intel64FsgOmpOperator', 'Intel64CXXAdvCOperator', 'Intel64AdvCXXOmpOperator',
8+
'Intel64FsgCXXOperator', 'Intel64FsgCXXOmpOperator']
99

1010

1111
Intel64AdvCOperator = Cpu64AdvCOperator
1212
Intel64AdvOmpOperator = Cpu64AdvOmpOperator
1313
Intel64FsgCOperator = Cpu64FsgCOperator
1414
Intel64FsgOmpOperator = Cpu64FsgOmpOperator
1515
Intel64CXXAdvCOperator = Cpu64AdvCXXOperator
16-
Intel64CXXAdvOmpOperator = Cpu64CXXAdvOmpOperator
17-
Intel64CXXFsgCOperator = Cpu64CXXFsgCOperator
18-
Intel64CXXFsgOmpOperator = Cpu64CXXFsgOmpOperator
16+
Intel64AdvCXXOmpOperator = Cpu64AdvCXXOmpOperator
17+
Intel64FsgCXXOperator = Cpu64FsgCXXOperator
18+
Intel64FsgCXXOmpOperator = Cpu64FsgCXXOmpOperator

‎devito/core/power.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from devito.core.cpu import (Cpu64AdvCOperator, Cpu64AdvOmpOperator,
2-
Cpu64AdvCXXOperator, Cpu64CXXAdvOmpOperator)
2+
Cpu64AdvCXXOperator, Cpu64AdvCXXOmpOperator)
33

44
__all__ = ['PowerAdvCOperator', 'PowerAdvOmpOperator',
5-
'PowerCXXAdvCOperator', 'PowerCXXAdvOmpOperator']
5+
'PowerCXXAdvCOperator', 'PowerAdvCXXOmpOperator']
66

77
PowerAdvCOperator = Cpu64AdvCOperator
88
PowerAdvOmpOperator = Cpu64AdvOmpOperator
99
PowerCXXAdvCOperator = Cpu64AdvCXXOperator
10-
PowerCXXAdvOmpOperator = Cpu64CXXAdvOmpOperator
10+
PowerAdvCXXOmpOperator = Cpu64AdvCXXOmpOperator

‎devito/passes/iet/languages/C.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class CPrinter(BasePrinter, C99CodePrinter):
4444
_func_litterals = {np.float32: 'f', np.complex64: 'f'}
4545
_func_prefix = {np.float32: 'f', np.float64: 'f',
4646
np.complex64: 'c', np.complex128: 'c'}
47-
_prec_litterals = {**BasePrinter._prec_litterals, np.float16: 'F16'}
4847
_default_includes = ['stdlib.h', 'math.h', 'sys/time.h']
4948

5049
# These cannot go through _print_xxx because they are classes not

0 commit comments

Comments
 (0)