Skip to content

ASR: Support param access in, out, inout #1820

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

Merged
merged 5 commits into from
May 17, 2023
Merged

ASR: Support param access in, out, inout #1820

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
c986b38
ASR: Support param intent in, out, inout
ubaidsk May 17, 2023
e35f45e
TEST: Add test and update refs
ubaidsk May 17, 2023
5f09977
LPython: Support Intent In, Out, InOut
ubaidsk May 17, 2023
6b27a70
LLVM: Support unsigned integer in list deepcopy
ubaidsk May 17, 2023
26017ad
TEST: Add integration_test for In, Out, InOut
ubaidsk May 17, 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
1 change: 1 addition & 0 deletions integration_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ RUN(NAME test_str_comparison LABELS cpython llvm c)
RUN(NAME test_bit_length LABELS cpython llvm c)
RUN(NAME str_to_list_cast LABELS cpython llvm c)
RUN(NAME test_sys_01 LABELS cpython llvm c)
RUN(NAME intent_01 LABELS cpython llvm)


RUN(NAME test_package_01 LABELS cpython llvm)
Expand Down
26 changes: 26 additions & 0 deletions integration_tests/intent_01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from lpython import i32, u32, f64, dataclass, In, Out, InOut

@dataclass
class Foo:
p: i32

def f(x: i32, y: In[f64], z: InOut[list[u32]], w: Out[Foo]):
assert (x == -12)
assert abs(y - (4.44)) <= 1e-12
z.append(u32(5))
w.p = 24


def main0():
a: i32 = (-12)
b: f64 = 4.44
c: list[u32] = [u32(1), u32(2), u32(3), u32(4)]
d: Foo = Foo(25)

print(a, b, c, d.p)

f(a, b, c, d)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about testing In[list[u32]], In[Foo]?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

$ cat examples/expr2.py 
from lpython import i32, u32, f64, dataclass, In, Out, InOut

@dataclass
class Foo:
    p: i32

def f(z: In[list[u32]], w: In[Foo]):
    print(z, w.p)


def main0():
    c: list[u32] = [u32(1), u32(2), u32(3), u32(4)]
    d: Foo = Foo(25)

    f(c, d)

    assert c[-1] == u32(4)
    assert d.p == 25

main0()
$ python examples/expr2.py 
[1, 2, 3, 4] 25
$ lpython examples/expr2.py
[1, 2, 3, 4] 25

It seems to work locally. Shall I add this as an integration_test?

Do you mean about printing errors when there is assignment/modification to In variables? I am hoping to handle printing errors in PR #1803 after completion/merging of this PR.

assert c[-1] == u32(5)
assert d.p == 24

main0()
3 changes: 2 additions & 1 deletion src/libasr/codegen/llvm_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ namespace LCompilers {
std::map<std::string, std::map<std::string, int>>& name2memidx) {
switch( asr_type->type ) {
case ASR::ttypeType::Integer:
case ASR::ttypeType::UnsignedInteger:
case ASR::ttypeType::Real:
case ASR::ttypeType::Logical:
case ASR::ttypeType::Complex: {
Expand Down Expand Up @@ -2635,7 +2636,7 @@ namespace LCompilers {
*
* int i = 0;
* int j = end_point - 1;
*
*
* tmp;
*
* while(j > i) {
Expand Down
36 changes: 31 additions & 5 deletions src/lpython/semantics/python_ast_to_asr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,29 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
}
}

AST::expr_t* get_var_intent_and_annotation(AST::expr_t *annotation, ASR::intentType &intent) {
if (AST::is_a<AST::Subscript_t>(*annotation)) {
AST::Subscript_t *s = AST::down_cast<AST::Subscript_t>(annotation);
if (AST::is_a<AST::Name_t>(*s->m_value)) {
std::string ann_name = AST::down_cast<AST::Name_t>(s->m_value)->m_id;
if (ann_name == "In") {
intent = ASRUtils::intent_in;
return s->m_slice;
} else if (ann_name == "InOut") {
intent = ASRUtils::intent_inout;
return s->m_slice;
} else if (ann_name == "Out") {
intent = ASRUtils::intent_out;
return s->m_slice;
}
return annotation;
} else {
throw SemanticError("Only Name in Subscript supported for now in annotation", annotation->base.loc);
}
}
return annotation;
}

// Convert Python AST type annotation to an ASR type
// Examples:
// i32, i64, f32, f64
Expand Down Expand Up @@ -3741,7 +3764,9 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
if (x.m_args.m_args[i].m_annotation == nullptr) {
throw SemanticError("Argument does not have a type", loc);
}
ASR::ttype_t *arg_type = ast_expr_to_asr_type(x.base.base.loc, *x.m_args.m_args[i].m_annotation);
ASR::intentType s_intent = ASRUtils::intent_unspecified;
AST::expr_t* arg_annotation_type = get_var_intent_and_annotation(x.m_args.m_args[i].m_annotation, s_intent);
ASR::ttype_t *arg_type = ast_expr_to_asr_type(x.base.base.loc, *arg_annotation_type);
// Set the function as generic if an argument is typed with a type parameter
if (ASRUtils::is_generic(*arg_type)) {
ASR::ttype_t* arg_type_type = ASRUtils::get_type_parameter(arg_type);
Expand All @@ -3766,12 +3791,13 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
}

std::string arg_s = arg;

ASR::expr_t *value = nullptr;
ASR::expr_t *init_expr = nullptr;
ASR::intentType s_intent = ASRUtils::intent_in;
if (ASRUtils::is_array(arg_type)) {
s_intent = ASRUtils::intent_inout;
if (s_intent == ASRUtils::intent_unspecified) {
s_intent = ASRUtils::intent_in;
if (ASRUtils::is_array(arg_type)) {
s_intent = ASRUtils::intent_inout;
}
}
ASR::storage_typeType storage_type =
ASR::storage_typeType::Default;
Expand Down
12 changes: 12 additions & 0 deletions src/runtime/lpython/lpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ def __init__(self, type, dims):
Union = ctypes.Union
Pointer = PointerType("Pointer")


class Intent:
def __init__(self, type):
self._type = type

def __getitem__(self, params):
return params

In = Intent("In")
Out = Intent("Out")
InOut = Intent("InOut")
Comment on lines +88 to +97
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disabled the auto-merge. I think/guess this needs a review. I would like to know if this approach is fine for supporting In, Out, InOut in CPython.


# Generics

class TypeVar():
Expand Down
6 changes: 6 additions & 0 deletions tests/intent_01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@dataclass
class Foo:
p: i32

def f(x: i32, y: In[f64], z: InOut[list[u32]], w: Out[Foo[5]]):
pass
13 changes: 13 additions & 0 deletions tests/reference/asr-intent_01-66824bc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"basename": "asr-intent_01-66824bc",
"cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
"infile": "tests/intent_01.py",
"infile_hash": "0a8fa2940567fccee2cfccd4af40f353b74dbe542590460a195246a5",
"outfile": null,
"outfile_hash": null,
"stdout": "asr-intent_01-66824bc.stdout",
"stdout_hash": "6c217775c0f43212356588d01124266dfe417ce0fd72c63c8cec30ad",
"stderr": null,
"stderr_hash": null,
"returncode": 0
}
175 changes: 175 additions & 0 deletions tests/reference/asr-intent_01-66824bc.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
(TranslationUnit
(SymbolTable
1
{
_global_symbols:
(Module
(SymbolTable
5
{
Foo:
(StructType
(SymbolTable
2
{
p:
(Variable
2
p
[]
Local
()
()
Default
(Integer 4 [])
Source
Public
Required
.false.
)
})
Foo
[]
[p]
Source
Public
.false.
.false.
()
()
),
f:
(Function
(SymbolTable
3
{
w:
(Variable
3
w
[]
Out
()
()
Default
(Struct
5 Foo
[((IntegerConstant 0 (Integer 4 []))
(IntegerConstant 5 (Integer 4 [])))]
)
Source
Public
Required
.false.
),
x:
(Variable
3
x
[]
In
()
()
Default
(Integer 4 [])
Source
Public
Required
.false.
),
y:
(Variable
3
y
[]
In
()
()
Default
(Real 8 [])
Source
Public
Required
.false.
),
z:
(Variable
3
z
[]
InOut
()
()
Default
(List
(UnsignedInteger
4
[]
)
)
Source
Public
Required
.false.
)
})
f
(FunctionType
[(Integer 4 [])
(Real 8 [])
(List
(UnsignedInteger
4
[]
)
)
(Struct
5 Foo
[((IntegerConstant 0 (Integer 4 []))
(IntegerConstant 5 (Integer 4 [])))]
)]
()
Source
Implementation
()
.false.
.false.
.false.
.false.
.false.
[]
[]
.false.
)
[]
[(Var 3 x)
(Var 3 y)
(Var 3 z)
(Var 3 w)]
[]
()
Public
.false.
.false.
()
)
})
_global_symbols
[]
.false.
.false.
),
main_program:
(Program
(SymbolTable
4
{

})
main_program
[]
[]
)
})
[]
)
8 changes: 6 additions & 2 deletions tests/tests.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,6 @@ c = true
filename = "test_end_sep_keywords.py"
asr = true

# integration_tests

[[test]]
filename = "lpython1.py"
llvm = true
Expand All @@ -301,6 +299,12 @@ llvm = true
filename = "print_str.py"
wat = true

[[test]]
filename = "intent_01.py"
asr = true

# integration_tests

[[test]]
filename = "../integration_tests/test_builtin.py"
asr = true
Expand Down