Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontend: Final removal of OFP frontend #469

Merged
merged 5 commits into from
Jan 10, 2025
Merged

Frontend: Final removal of OFP frontend #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc5ae53
Frontend: Final removal of OFP frontend
mlange05 Jan 8, 2025
c166e21
Loki: Remove option to disk-cache OFP ASTs
mlange05 Jan 9, 2025
b72a0c2
ProgramUnit: Only apply source sanitisation for FP frontend
mlange05 Jan 9, 2025
b7dbf7c
Frontend: Remove utilities and tests that were purely used for OFP
mlange05 Jan 9, 2025
730399b
Tools: Remove unused disk_cached utility (formerly used for OFP)
mlange05 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions loki/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
config.register('frontend-strict-mode', False, env_variable='LOKI_FRONTEND_STRICT_MODE',
preprocess=lambda i: bool(i) if isinstance(i, int) else i)

# Disk-caching, which causes OFP ASTs to be cached on disk for
# fast re-parsing of unchanged source files
config.register('disk-cache', False, env_variable='LOKI_DISK_CACHE',
preprocess=lambda i: bool(i) if isinstance(i, int) else i)

# Force symbol comparison and object equality to be case sensitive
config.register('case-sensitive', False, env_variable='LOKI_CASE_SENSITIVE',
preprocess=lambda i: bool(i) if isinstance(i, int) else i)
Expand Down
4 changes: 2 additions & 2 deletions loki/batch/tests/test_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
ProcedureBindingItem, ExternalItem, InterfaceItem, SGraph,
SchedulerConfig, ItemFactory
)
from loki.frontend import HAVE_FP, HAVE_OFP, REGEX, RegexParserClass
from loki.frontend import HAVE_FP, REGEX, RegexParserClass
from loki.ir import nodes as ir


pytestmark = pytest.mark.skipif(not HAVE_FP and not HAVE_OFP, reason='Fparser and OFP not available')
pytestmark = pytest.mark.skipif(not HAVE_FP, reason='Fparser not available')


@pytest.fixture(scope='module', name='here')
Expand Down
39 changes: 1 addition & 38 deletions loki/expression/tests/test_expression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from loki.build import jit_compile, clean_test
from loki.expression import symbols as sym, parse_expr, AttachScopesMapper
from loki.frontend import (
available_frontends, OMNI, FP, HAVE_FP, parse_fparser_expression
available_frontends, OMNI, HAVE_FP, parse_fparser_expression
)
from loki.ir import (
nodes as ir, FindNodes, FindVariables, FindExpressions,
Expand Down Expand Up @@ -924,43 +924,6 @@ def test_masked_statements_nested(tmp_path, frontend):
clean_test(filepath)


@pytest.mark.parametrize('frontend', available_frontends(xfail=[
(OMNI, 'Not implemented'), (FP, 'Not implemented')
]))
def test_data_declaration(tmp_path, frontend):
"""
Variable initialization with DATA statements
"""
fcode = """
subroutine data_declaration(data_out)
implicit none
integer, dimension(5, 4), intent(out) :: data_out
integer, dimension(5, 4) :: data1, data2
integer, dimension(3) :: data3
integer :: i, j

data data1 /20*5/

data ((data2(i,j), i=1,5), j=1,4) /20*3/

data data3(1), data3(3), data3(2) /1, 2, 3/

data_out(:,:) = data1(:,:) + data2(:,:)
data_out(1:3,1) = data3
end subroutine data_declaration
"""
filepath = tmp_path/(f'expression_data_declaration_{frontend}.f90')
routine = Subroutine.from_source(fcode, frontend=frontend)
function = jit_compile(routine, filepath=filepath, objname='data_declaration')

expected = np.ones(shape=(5, 4), dtype=np.int32, order='F') * 8
expected[[0, 1, 2], 0] = [1, 3, 2]
result = np.zeros(shape=(5, 4), dtype=np.int32, order='F')
function(result)
assert np.all(result == expected)
clean_test(filepath)


@pytest.mark.parametrize('frontend', available_frontends())
def test_pointer_nullify(tmp_path, frontend):
"""
Expand Down
1 change: 0 additions & 1 deletion loki/frontend/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

from loki.frontend.preprocessing import * # noqa
from loki.frontend.source import * # noqa
from loki.frontend.ofp import * # noqa
from loki.frontend.omni import * # noqa
from loki.frontend.fparser import * # noqa
from loki.frontend.util import * # noqa
Expand Down
Loading
Loading