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

Update fparser to 0.1.3 #1371

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Update fparser to 0.1.3 #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9fb35c
Fix fparser imports to make them compatible with newer package versions
mcopik Sep 20, 2023
6c9a16d
Bump fparser to 0.1.3
mcopik Sep 20, 2023
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
7 changes: 3 additions & 4 deletions dace/frontend/fortran/ast_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Copyright 2019-2023 ETH Zurich and the DaCe authors. All rights reserved.
from fparser.two.Fortran2008 import Fortran2008 as f08
from fparser.two import Fortran2008
from fparser.two import Fortran2008 as f08
from fparser.two import Fortran2003 as f03
from fparser.two import symbol_table

Expand Down Expand Up @@ -608,7 +607,7 @@ def type_declaration_stmt(self, node: FASTNode):
if i.string.lower() == "parameter":
symbol = True

if isinstance(i, Fortran2008.Attr_Spec_List):
if isinstance(i, f08.Attr_Spec_List):

dimension_spec = get_children(i, "Dimension_Attr_Spec")
if len(dimension_spec) == 0:
Expand Down Expand Up @@ -1052,7 +1051,7 @@ def specification_part(self, node: FASTNode):

decls = [self.create_ast(i) for i in node.children if isinstance(i, f08.Type_Declaration_Stmt)]

uses = [self.create_ast(i) for i in node.children if isinstance(i, f08.Use_Stmt)]
uses = [self.create_ast(i) for i in node.children if isinstance(i, f03.Use_Stmt)]
tmp = [self.create_ast(i) for i in node.children]
typedecls = [i for i in tmp if isinstance(i, ast_internal_classes.Type_Decl_Node)]
symbols = []
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ charset-normalizer==3.1.0
click==8.1.3
dill==0.3.6
Flask==2.3.2
fparser==0.1.2
fparser==0.1.3
idna==3.4
importlib-metadata==6.6.0
itsdangerous==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
include_package_data=True,
install_requires=[
'numpy', 'networkx >= 2.5', 'astunparse', 'sympy<=1.9', 'pyyaml', 'ply', 'websockets', 'requests', 'flask',
'fparser >= 0.1.2', 'aenum >= 3.1', 'dataclasses; python_version < "3.7"', 'dill',
'fparser >= 0.1.3', 'aenum >= 3.1', 'dataclasses; python_version < "3.7"', 'dill',
'pyreadline;platform_system=="Windows"', 'typing-compat; python_version < "3.8"'
] + cmake_requires,
extras_require={
Expand Down
Loading