Revert the fix

include/ck/utility/data_type.hpp

@@ -205,11 +205,8 @@ struct vector_type<T, 1>
 template <typename T>
 struct vector_type<T, 2>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
 
     using type = d2_t;
 
@@ -258,12 +255,9 @@ struct vector_type<T, 2>
 template <typename T>
 struct vector_type<T, 4>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
 
     using type = d4_t;
 
@@ -323,13 +317,10 @@ struct vector_type<T, 4>
 template <typename T>
 struct vector_type<T, 8>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
 
     using type = d8_t;
 
@@ -400,14 +391,11 @@ struct vector_type<T, 8>
 template <typename T>
 struct vector_type<T, 16>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
-    typedef T_adjusted d16_t __attribute__((ext_vector_type(16)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
+    typedef T d16_t __attribute__((ext_vector_type(16)));
 
     using type = d16_t;
 
@@ -489,15 +477,12 @@ struct vector_type<T, 16>
 template <typename T>
 struct vector_type<T, 32>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
-    typedef T_adjusted d16_t __attribute__((ext_vector_type(16)));
-    typedef T_adjusted d32_t __attribute__((ext_vector_type(32)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
+    typedef T d16_t __attribute__((ext_vector_type(16)));
+    typedef T d32_t __attribute__((ext_vector_type(32)));
 
     using type = d32_t;
 
@@ -588,16 +573,13 @@ struct vector_type<T, 32>
 template <typename T>
 struct vector_type<T, 64>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
-    typedef T_adjusted d16_t __attribute__((ext_vector_type(16)));
-    typedef T_adjusted d32_t __attribute__((ext_vector_type(32)));
-    typedef T_adjusted d64_t __attribute__((ext_vector_type(64)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
+    typedef T d16_t __attribute__((ext_vector_type(16)));
+    typedef T d32_t __attribute__((ext_vector_type(32)));
+    typedef T d64_t __attribute__((ext_vector_type(64)));
 
     using type = d64_t;
 
@@ -699,17 +681,14 @@ struct vector_type<T, 64>
 template <typename T>
 struct vector_type<T, 128>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
-    typedef T_adjusted d16_t __attribute__((ext_vector_type(16)));
-    typedef T_adjusted d32_t __attribute__((ext_vector_type(32)));
-    typedef T_adjusted d64_t __attribute__((ext_vector_type(64)));
-    typedef T_adjusted d128_t __attribute__((ext_vector_type(128)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
+    typedef T d16_t __attribute__((ext_vector_type(16)));
+    typedef T d32_t __attribute__((ext_vector_type(32)));
+    typedef T d64_t __attribute__((ext_vector_type(64)));
+    typedef T d128_t __attribute__((ext_vector_type(128)));
 
     using type = d128_t;
 
@@ -820,18 +799,15 @@ struct vector_type<T, 128>
 template <typename T>
 struct vector_type<T, 256>
 {
-    using T_adjusted =
-        typename std::conditional<std::is_same<T, f8_t>::value, f8_t::data_type, T>::type;
-
-    using d1_t = T_adjusted;
-    typedef T_adjusted d2_t __attribute__((ext_vector_type(2)));
-    typedef T_adjusted d4_t __attribute__((ext_vector_type(4)));
-    typedef T_adjusted d8_t __attribute__((ext_vector_type(8)));
-    typedef T_adjusted d16_t __attribute__((ext_vector_type(16)));
-    typedef T_adjusted d32_t __attribute__((ext_vector_type(32)));
-    typedef T_adjusted d64_t __attribute__((ext_vector_type(64)));
-    typedef T_adjusted d128_t __attribute__((ext_vector_type(128)));
-    typedef T_adjusted d256_t __attribute__((ext_vector_type(256)));
+    using d1_t = T;
+    typedef T d2_t __attribute__((ext_vector_type(2)));
+    typedef T d4_t __attribute__((ext_vector_type(4)));
+    typedef T d8_t __attribute__((ext_vector_type(8)));
+    typedef T d16_t __attribute__((ext_vector_type(16)));
+    typedef T d32_t __attribute__((ext_vector_type(32)));
+    typedef T d64_t __attribute__((ext_vector_type(64)));
+    typedef T d128_t __attribute__((ext_vector_type(128)));
+    typedef T d256_t __attribute__((ext_vector_type(256)));
 
     using type = d256_t;