Remove dangerous scalar_cardinal remaining uses

jfalcou · Dec 16, 2022 · ae3c5ef · ae3c5ef
1 parent 4e766d7
commit ae3c5ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/include/eve/arch/cardinals.hpp b/include/eve/arch/cardinals.hpp
@@ -73,15 +73,6 @@ namespace eve
   template <typename T>
   concept wide_cardinal = detail::is_wide_cardinal<T>::value;
 
-  //================================================================================================
-  //! @brief Cardinal type for scalar values
-  //================================================================================================
-  struct scalar_cardinal : std::integral_constant<std::ptrdiff_t, 1ULL>
-  {
-    using type          = scalar_cardinal;
-    using combined_type = fixed<2>;
-  };
-
   template<std::ptrdiff_t Cardinal>
   inline constexpr fixed<Cardinal> const lane = {};
 

diff --git a/include/eve/detail/skeleton.hpp b/include/eve/detail/skeleton.hpp
@@ -56,7 +56,13 @@ namespace eve::detail
   template<typename F, typename... Ts>
   struct wide_result
   {
-    static constexpr std::size_t card_v = std::max({eve::cardinal_v<std::decay_t<Ts>>...});
+    template<typename T>
+    static constexpr std::ptrdiff_t card() noexcept
+    {
+      if constexpr(simd_value<T>) return T::size(); else return 1;
+    }
+
+    static constexpr std::size_t card_v = std::max({card<std::decay_t<Ts>>()...});
     using value_t                       = decltype(std::declval<F>()(at(std::declval<Ts>(), 0)...));
     using fixed_t                       = fixed<card_v>;
 

diff --git a/include/eve/traits/cardinal.hpp b/include/eve/traits/cardinal.hpp
@@ -13,7 +13,6 @@
 namespace eve
 {
   template<std::ptrdiff_t Cardinal> struct fixed;
-  struct  scalar_cardinal;
 
   //================================================================================================
   //! @addtogroup traits
@@ -51,10 +50,8 @@ namespace eve
   //! @}
   //================================================================================================
   template<typename Type>
-  struct cardinal : scalar_cardinal
-  {
-    using type = scalar_cardinal;
-  };
+  struct cardinal : fixed<1>
+  {};
 
   template<typename Type, typename Size>
   struct cardinal<wide<Type, Size>> : Size

diff --git a/test/unit/meta/cardinal.cpp b/test/unit/meta/cardinal.cpp
@@ -12,10 +12,7 @@
 
 TTS_CASE( "Check for scalar cardinals")
 {
-  TTS_TYPE_IS( eve::cardinal_t<float> , eve::scalar_cardinal );
-  TTS_EQUAL  ( eve::cardinal_v<float>   , 1 );
-
-  TTS_TYPE_IS( eve::cardinal_t<eve::logical<float>> , eve::scalar_cardinal );
+  TTS_EQUAL  ( eve::cardinal_v<float> , 1 );
   TTS_EQUAL  ( eve::cardinal_v<eve::logical<float>> , 1 );
 };