From 4268897f1713f2396cb213eec69348792369a7e7 Mon Sep 17 00:00:00 2001 From: cliffburdick Date: Thu, 8 Aug 2024 10:49:35 -0700 Subject: [PATCH] Fixed base operator types --- examples/CMakeLists.txt | 1 + include/matx/operators/at.h | 2 +- include/matx/operators/concat.h | 2 +- include/matx/operators/frexp.h | 2 +- include/matx/operators/reshape.h | 2 +- include/matx/operators/stack.h | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 66523d298..12eedce02 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -16,6 +16,7 @@ set(examples spherical_harmonics svd_power qr + repro black_scholes print_styles) diff --git a/include/matx/operators/at.h b/include/matx/operators/at.h index 7f34512e6..a4da93263 100644 --- a/include/matx/operators/at.h +++ b/include/matx/operators/at.h @@ -45,7 +45,7 @@ namespace matx class AtOp : public BaseOp> { private: - Op op_; + typename base_type::type op_; cuda::std::array idx_; public: diff --git a/include/matx/operators/concat.h b/include/matx/operators/concat.h index 4fc33fd76..c0ce70383 100644 --- a/include/matx/operators/concat.h +++ b/include/matx/operators/concat.h @@ -227,7 +227,7 @@ namespace matx } private: - cuda::std::tuple ops_; + cuda::std::tuple::type ...> ops_; index_t size_; int axis_; }; // end class ConcatOp diff --git a/include/matx/operators/frexp.h b/include/matx/operators/frexp.h index 7e3f5ab44..538a1fdab 100644 --- a/include/matx/operators/frexp.h +++ b/include/matx/operators/frexp.h @@ -44,7 +44,7 @@ namespace detail { class FrexpOp : public BaseOp> { private: - OpA a_; + typename base_type::type a_; public: using matxop = bool; diff --git a/include/matx/operators/reshape.h b/include/matx/operators/reshape.h index c5fe61e01..53e6ba6a9 100644 --- a/include/matx/operators/reshape.h +++ b/include/matx/operators/reshape.h @@ -50,7 +50,7 @@ namespace matx using value_type = typename T::value_type; private: - T op_; + typename base_type::type op_; ShapeType sizes_; public: diff --git a/include/matx/operators/stack.h b/include/matx/operators/stack.h index aece2ade2..4b762134e 100644 --- a/include/matx/operators/stack.h +++ b/include/matx/operators/stack.h @@ -199,7 +199,7 @@ namespace matx } private: - cuda::std::tuple ops_; + cuda::std::tuple::type ...> ops_; index_t size_; int axis_; }; // end class StackOp