From 7a10d3534ea8e756a2ff7c3b2f92ceea77726727 Mon Sep 17 00:00:00 2001
From: cliffburdick <cburdick@nvidia.com>
Date: Thu, 8 Aug 2024 10:49:35 -0700
Subject: [PATCH] Fixed base operator types

---
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/matx/operators/at.h b/include/matx/operators/at.h
index 7f34512e..a4da9326 100644
--- a/include/matx/operators/at.h
+++ b/include/matx/operators/at.h
@@ -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:
diff --git a/include/matx/operators/concat.h b/include/matx/operators/concat.h
index 4fc33fd7..c0ce7038 100644
--- a/include/matx/operators/concat.h
+++ b/include/matx/operators/concat.h
@@ -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
diff --git a/include/matx/operators/frexp.h b/include/matx/operators/frexp.h
index 7e3f5ab4..538a1fda 100644
--- a/include/matx/operators/frexp.h
+++ b/include/matx/operators/frexp.h
@@ -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;
diff --git a/include/matx/operators/reshape.h b/include/matx/operators/reshape.h
index c5fe61e0..53e6ba6a 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<T>::type op_;
 	      ShapeType sizes_;
 
       public:
diff --git a/include/matx/operators/stack.h b/include/matx/operators/stack.h
index aece2ade..4b762134 100644
--- a/include/matx/operators/stack.h
+++ b/include/matx/operators/stack.h
@@ -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