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.

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

Fixed base operator types #703

Merged
merged 1 commit into from
Aug 8, 2024
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
2 changes: 1 addition & 1 deletion include/matx/operators/at.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace matx
class AtOp : public BaseOp<AtOp<Op, Is...>>
{
private:
Op op_;
typename base_type<Op>::type op_;
cuda::std::array<index_t, sizeof...(Is)> idx_;

public:
Expand Down
2 changes: 1 addition & 1 deletion include/matx/operators/concat.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace matx
}

private:
cuda::std::tuple<Ts...> ops_;
cuda::std::tuple<typename base_type<Ts>::type ...> ops_;
index_t size_;
int axis_;
}; // end class ConcatOp
Expand Down
2 changes: 1 addition & 1 deletion include/matx/operators/frexp.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace detail {
class FrexpOp : public BaseOp<FrexpOp<OpA, WHICH>>
{
private:
OpA a_;
typename base_type<OpA>::type a_;

public:
using matxop = bool;
Expand Down
2 changes: 1 addition & 1 deletion include/matx/operators/reshape.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace matx
using value_type = typename T::value_type;

private:
T op_;
typename base_type<T>::type op_;
ShapeType sizes_;

public:
Expand Down
2 changes: 1 addition & 1 deletion include/matx/operators/stack.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ namespace matx
}

private:
cuda::std::tuple<Ts...> ops_;
cuda::std::tuple<typename base_type<Ts>::type ...> ops_;
index_t size_;
int axis_;
}; // end class StackOp
Expand Down