Skip to content

Implemented query method for log class #2384

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.

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 2 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions integration_tests/symbolics_02.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def test_symbolic_operations():
assert True
else:
assert False
assert(z.func == Add)
print(z)

# Subtraction
Expand All @@ -29,6 +30,7 @@ def test_symbolic_operations():
assert True
else:
assert False
assert(w.func == Add)
print(w)

# Multiplication
Expand All @@ -40,6 +42,7 @@ def test_symbolic_operations():
assert True
else:
assert False
assert(u.func == Mul)
print(u)

# Division
Expand All @@ -51,6 +54,7 @@ def test_symbolic_operations():
assert True
else:
assert False
assert(v.func == Mul)
print(v)

# Power
Expand All @@ -66,6 +70,7 @@ def test_symbolic_operations():
assert True
else:
assert False
assert(p.func == Pow)
print(p)

# Casting
Expand Down
7 changes: 7 additions & 0 deletions integration_tests/symbolics_06.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,15 @@ def test_elementary_functions():
b: S = sin(a)
c: S = cos(b)
d: S = log(c)
d1: bool = d.func == log
e: S = Abs(d)
print(e)
assert(d1 == True)
if d.func == log:
assert True
else:
assert False
assert(d.func == log)
assert(e == Abs(log(cos(sin(exp(x))))))

test_elementary_functions()
8 changes: 8 additions & 0 deletions src/libasr/pass/intrinsic_function_registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ enum class IntrinsicScalarFunctions : int64_t {
SymbolicAddQ,
SymbolicMulQ,
SymbolicPowQ,
SymbolicLogQ,
// ...
};

Expand Down Expand Up @@ -146,6 +147,7 @@ inline std::string get_intrinsic_name(int x) {
INTRINSIC_NAME_CASE(SymbolicAddQ)
INTRINSIC_NAME_CASE(SymbolicMulQ)
INTRINSIC_NAME_CASE(SymbolicPowQ)
INTRINSIC_NAME_CASE(SymbolicLogQ)
default : {
throw LCompilersException("pickle: intrinsic_id not implemented");
}
Expand Down Expand Up @@ -3146,6 +3148,7 @@ namespace X {
create_symbolic_query_macro(SymbolicAddQ)
create_symbolic_query_macro(SymbolicMulQ)
create_symbolic_query_macro(SymbolicPowQ)
create_symbolic_query_macro(SymbolicLogQ)


#define create_symbolic_unary_macro(X) \
Expand Down Expand Up @@ -3307,6 +3310,8 @@ namespace IntrinsicScalarFunctionRegistry {
{nullptr, &SymbolicMulQ::verify_args}},
{static_cast<int64_t>(IntrinsicScalarFunctions::SymbolicPowQ),
{nullptr, &SymbolicPowQ::verify_args}},
{static_cast<int64_t>(IntrinsicScalarFunctions::SymbolicLogQ),
{nullptr, &SymbolicLogQ::verify_args}},
};

static const std::map<int64_t, std::string>& intrinsic_function_id_to_name = {
Expand Down Expand Up @@ -3417,6 +3422,8 @@ namespace IntrinsicScalarFunctionRegistry {
"SymbolicMulQ"},
{static_cast<int64_t>(IntrinsicScalarFunctions::SymbolicPowQ),
"SymbolicPowQ"},
{static_cast<int64_t>(IntrinsicScalarFunctions::SymbolicLogQ),
"SymbolicLogQ"},
};


Expand Down Expand Up @@ -3475,6 +3482,7 @@ namespace IntrinsicScalarFunctionRegistry {
{"AddQ", {&SymbolicAddQ::create_SymbolicAddQ, &SymbolicAddQ::eval_SymbolicAddQ}},
{"MulQ", {&SymbolicMulQ::create_SymbolicMulQ, &SymbolicMulQ::eval_SymbolicMulQ}},
{"PowQ", {&SymbolicPowQ::create_SymbolicPowQ, &SymbolicPowQ::eval_SymbolicPowQ}},
{"LogQ", {&SymbolicLogQ::create_SymbolicLogQ, &SymbolicLogQ::eval_SymbolicLogQ}},
};

static inline bool is_intrinsic_function(const std::string& name) {
Expand Down
25 changes: 25 additions & 0 deletions src/libasr/pass/replace_symbolic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,24 @@ class ReplaceSymbolicVisitor : public PassUtils::PassVisitor<ReplaceSymbolicVisi
ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)), nullptr));
break;
}
case LCompilers::ASRUtils::IntrinsicScalarFunctions::SymbolicLogQ: {
ASR::symbol_t* basic_get_type_sym = declare_basic_get_type_function(al, loc, module_scope);
ASR::expr_t* value1 = handle_argument(al, loc, intrinsic_func->m_args[0]);
Vec<ASR::call_arg_t> call_args;
call_args.reserve(al, 1);
ASR::call_arg_t call_arg;
call_arg.loc = loc;
call_arg.m_value = value1;
call_args.push_back(al, call_arg);
ASR::expr_t* function_call = ASRUtils::EXPR(ASRUtils::make_FunctionCall_t_util(al, loc,
basic_get_type_sym, basic_get_type_sym, call_args.p, call_args.n,
ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 4)), nullptr, nullptr));
// Using 29 as the right value of the IntegerCompare node as it represents SYMENGINE_LOG through SYMENGINE_ENUM
return ASRUtils::EXPR(ASR::make_IntegerCompare_t(al, loc, function_call, ASR::cmpopType::Eq,
ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, 29, ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 4)))),
ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)), nullptr));
break;
}
default: {
throw LCompilersException("IntrinsicFunction: `"
+ ASRUtils::get_intrinsic_name(intrinsic_id)
Expand Down Expand Up @@ -1437,6 +1455,13 @@ class ReplaceSymbolicVisitor : public PassUtils::PassVisitor<ReplaceSymbolicVisi

ASR::stmt_t *assert_stmt = ASRUtils::STMT(ASR::make_Assert_t(al, x.base.base.loc, test, x.m_msg));
pass_result.push_back(al, assert_stmt);
} else if (ASR::is_a<ASR::IntrinsicScalarFunction_t>(*x.m_test)) {
ASR::IntrinsicScalarFunction_t* intrinsic_func = ASR::down_cast<ASR::IntrinsicScalarFunction_t>(x.m_test);
if (intrinsic_func->m_type->type == ASR::ttypeType::Logical) {
ASR::expr_t* test = process_attributes(al, x.base.base.loc, x.m_test, module_scope);
ASR::stmt_t *assert_stmt = ASRUtils::STMT(ASR::make_Assert_t(al, x.base.base.loc, test, x.m_msg));
pass_result.push_back(al, assert_stmt);
}
}
}
};
Expand Down
3 changes: 3 additions & 0 deletions src/lpython/semantics/python_ast_to_asr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6040,6 +6040,9 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
} else if (symbolic_type == "Pow") {
tmp = attr_handler.eval_symbolic_is_Pow(se, al, x.base.base.loc, args, diag);
return;
} else if (symbolic_type == "log") {
tmp = attr_handler.eval_symbolic_is_log(se, al, x.base.base.loc, args, diag);
return;
} else {
throw SemanticError(symbolic_type + " symbolic type not supported yet", x.base.base.loc);
}
Expand Down
14 changes: 14 additions & 0 deletions src/lpython/semantics/python_attribute_eval.h
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,20 @@ struct AttributeHandler {
{ throw SemanticError(msg, loc); });
}

static ASR::asr_t* eval_symbolic_is_log(ASR::expr_t *s, Allocator &al, const Location &loc,
Vec<ASR::expr_t*> &args, diag::Diagnostics &/*diag*/) {
Vec<ASR::expr_t*> args_with_list;
args_with_list.reserve(al, args.size() + 1);
args_with_list.push_back(al, s);
for(size_t i = 0; i < args.size(); i++) {
args_with_list.push_back(al, args[i]);
}
ASRUtils::create_intrinsic_function create_function =
ASRUtils::IntrinsicScalarFunctionRegistry::get_create_function("LogQ");
return create_function(al, loc, args_with_list, [&](const std::string &msg, const Location &loc)
{ throw SemanticError(msg, loc); });
}

}; // AttributeHandler

} // namespace LCompilers::LPython
Expand Down