Skip to content

[ENH} FExpr bitwise operators #3450

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[ENH} FExpr bitwise operators #3450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6fabd9
and FExpr
samukweku Apr 1, 2023
c3d5e88
FExpr for or
samukweku Apr 1, 2023
2736061
xor fexpr
samukweku Apr 1, 2023
ba85ea1
add tests for xor
samukweku Apr 1, 2023
b00ae25
fix links for and/or/xor
samukweku Apr 1, 2023
a89712b
lshift/rshift FExpr
samukweku Apr 1, 2023
c09c1de
add tests for lshift/rshift
samukweku Apr 2, 2023
7dd5fd8
cleanup and fix type assertion logic
samukweku Apr 2, 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
2 changes: 1 addition & 1 deletion docs/api/fexpr/__and__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.. xmethod:: datatable.FExpr.__and__
:src: src/core/expr/fexpr.cc PyFExpr::nb__and__
:src: src/core/expr/fbinary/bitwise_and_or_xor.cc PyFExpr::nb__and__

__and__(x, y)
--
Expand Down
2 changes: 1 addition & 1 deletion docs/api/fexpr/__lshift__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.. xmethod:: datatable.FExpr.__lshift__
:src: src/core/expr/fexpr.cc PyFExpr::nb__lshift__
:src: src/core/expr/fbinary/bitwise_shift.cc PyFExpr::nb__lshift__

__lshift__(x, y)
--
Expand Down
2 changes: 1 addition & 1 deletion docs/api/fexpr/__or__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.. xmethod:: datatable.FExpr.__or__
:src: src/core/expr/fexpr.cc PyFExpr::nb__or__
:src: src/core/expr/fbinary/bitwise_and_or_xor.cc PyFExpr::nb__or__

__or__(x, y)
--
Expand Down
2 changes: 1 addition & 1 deletion docs/api/fexpr/__rshift__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.. xmethod:: datatable.FExpr.__rshift__
:src: src/core/expr/fexpr.cc PyFExpr::nb__rshift__
:src: src/core/expr/fbinary/bitwise_shift.cc PyFExpr::nb__rshift__

__rshift__(x, y)
--
Expand Down
2 changes: 1 addition & 1 deletion docs/api/fexpr/__xor__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.. xmethod:: datatable.FExpr.__xor__
:src: src/core/expr/fexpr.cc PyFExpr::nb__xor__
:src: src/core/expr/fbinary/bitwise_and_or_xor.cc PyFExpr::nb__xor__

__xor__(x, y)
--
Expand Down
6 changes: 0 additions & 6 deletions src/core/expr/fbinary/bimaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ static std::unordered_map<size_t, bimaker_ptr> bimakers_library;

bimaker_ptr resolve_op(Op opcode, SType stype1, SType stype2) {
switch (opcode) {
case Op::AND: return resolve_op_and(stype1, stype2);
case Op::OR: return resolve_op_or(stype1, stype2);
case Op::XOR: return resolve_op_xor(stype1, stype2);
case Op::LSHIFT: return resolve_op_lshift(stype1, stype2);
case Op::RSHIFT: return resolve_op_rshift(stype1, stype2);

case Op::ARCTAN2: return resolve_fn_atan2(stype1, stype2);
case Op::HYPOT: return resolve_fn_hypot(stype1, stype2);
case Op::POWERFN: return resolve_fn_pow(stype1, stype2);
Expand Down
6 changes: 0 additions & 6 deletions src/core/expr/fbinary/bimaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ using bimaker_ptr = std::unique_ptr<bimaker>;
// Main resolver, calls individual-op resolvers below
bimaker_ptr resolve_op(Op, SType, SType);

bimaker_ptr resolve_op_and(SType, SType);
bimaker_ptr resolve_op_or(SType, SType);
bimaker_ptr resolve_op_xor(SType, SType);
bimaker_ptr resolve_op_lshift(SType, SType);
bimaker_ptr resolve_op_rshift(SType, SType);

bimaker_ptr resolve_fn_atan2(SType, SType);
bimaker_ptr resolve_fn_hypot(SType, SType);
bimaker_ptr resolve_fn_pow(SType, SType);
Expand Down
Loading