Skip to content

Pass through scalar args on binary_op #1230

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
ejmeitz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Pass through scalar args on binary_op #1230

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
709e701
pass through args in binop
ejmeitz Aug 29, 2025
d990aa5
also do it in operators.cc
ejmeitz Aug 29, 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
7 changes: 6 additions & 1 deletion src/cupynumeric/ndarray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ void NDArray::trilu(NDArray rhs, int32_t k, bool lower)

void NDArray::dot(NDArray rhs1, NDArray rhs2) { dot_MM(rhs1.get_store(), rhs2.get_store()); }

void NDArray::binary_op(int32_t op_code, NDArray rhs1, NDArray rhs2)
void NDArray::binary_op(int32_t op_code, NDArray rhs1, NDArray rhs2,
const std::vector<legate::Scalar>& extra_args /*= {}*/)
{
if (rhs1.type() != rhs2.type()) {
throw std::invalid_argument("Operands must have the same type");
Expand All @@ -482,6 +483,10 @@ void NDArray::binary_op(int32_t op_code, NDArray rhs1, NDArray rhs2)
auto p_rhs2 = task.add_input(rhs2_store);
task.add_scalar_arg(legate::Scalar(op_code));

for (auto&& arg : extra_args) {
task.add_scalar_arg(arg);
}

task.add_constraint(align(p_lhs, p_rhs1));
task.add_constraint(align(p_rhs1, p_rhs2));

Expand Down
2 changes: 1 addition & 1 deletion src/cupynumeric/ndarray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class NDArray {
public:
void random(int32_t gen_code);
void fill(const Scalar& value);
void binary_op(int32_t op_code, NDArray rhs1, NDArray rhs2);
void binary_op(int32_t op_code, NDArray rhs1, NDArray rhs2, const std::vector<legate::Scalar>& extra_args = {});
void binary_reduction(int32_t op_code, NDArray rhs1, NDArray rhs2);
void unary_op(int32_t op_code, NDArray input, const std::vector<legate::Scalar>& extra_args = {});
void unary_reduction(int32_t op_code, NDArray input);
Expand Down
5 changes: 3 additions & 2 deletions src/cupynumeric/operators.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,15 @@ NDArray unary_reduction(UnaryRedCode op_code, NDArray input)
return out;
}

NDArray binary_op(BinaryOpCode op_code, NDArray rhs1, NDArray rhs2, std::optional<NDArray> out)
NDArray binary_op(BinaryOpCode op_code, NDArray rhs1, NDArray rhs2, std::optional<NDArray> out,
const std::vector<legate::Scalar>& extra_args = {})
{
auto runtime = CuPyNumericRuntime::get_runtime();
if (!out.has_value()) {
auto out_shape = broadcast_shapes({rhs1, rhs2});
out = runtime->create_array(out_shape, rhs1.type());
}
out->binary_op(static_cast<int32_t>(op_code), std::move(rhs1), std::move(rhs2));
out->binary_op(static_cast<int32_t>(op_code), std::move(rhs1), std::move(rhs2), extra_args);
return out.value();
}

Expand Down