refactor

ROCm · Oct 11, 2024 · 7a646f1 · 7a646f1
1 parent 0b60841
commit 7a646f1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 36 deletions.
diff --git a/src/include/migraphx/generic_float.hpp b/src/include/migraphx/generic_float.hpp
@@ -22,6 +22,9 @@
  * THE SOFTWARE.
  */
 
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+
 template<unsigned int N>
 constexpr unsigned int all_ones() noexcept
 {
@@ -260,3 +263,6 @@ struct generic_float
         return not(x == y);
     }
 };
+
+}
+}
diff --git a/src/include/migraphx/half.hpp b/src/include/migraphx/half.hpp
@@ -33,7 +33,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-using half = generic_float<10,5>;
+using half = migraphx::generic_float<10,5>;
 
 namespace detail {
 template <class T>
@@ -59,56 +59,45 @@ using deduce = typename detail::deduce<T>::type;
 
 namespace std {
 
-template <class T>
-struct common_type<migraphx::half, T> : std::common_type<float, T> // NOLINT
+template<unsigned int E, unsigned int M, unsigned int F>
+class numeric_limits<migraphx::generic_float<E, M, F>>
 {
-};
+    public:
+    static constexpr bool has_infinity = false;
+    static constexpr migraphx::generic_float<E, M, F> epsilon() { return migraphx::generic_float<E, M, F>::epsilon(); }
 
-template <class T>
-struct common_type<T, migraphx::half> : std::common_type<float, T> // NOLINT
-{
-};
+    static constexpr migraphx::generic_float<E, M, F> quiet_NaN() { return migraphx::generic_float<E, M, F>::quiet_NaN(); }
 
-template <>
-struct common_type<migraphx::fp8::fp8e4m3fnuz, migraphx::half>
-{
-    using type = float;
-};
+    static constexpr migraphx::generic_float<E, M, F> max() { return migraphx::generic_float<E, M, F>::max(); }
 
-template <>
-struct common_type<migraphx::half, migraphx::fp8::fp8e4m3fnuz>
-{
-    using type = float;
-};
+    static constexpr migraphx::generic_float<E, M, F> min() { return migraphx::generic_float<E, M, F>::min(); }
 
-template <>
-struct common_type<migraphx::fp8::fp8e4m3fn, migraphx::half>
-{
-    using type = float;
-};
+    static constexpr migraphx::generic_float<E, M, F> lowest() { return migraphx::generic_float<E, M, F>::lowest(); }
 
-template <>
-struct common_type<migraphx::half, migraphx::fp8::fp8e4m3fn>
-{
-    using type = float;
 };
 
-template <>
-struct common_type<migraphx::fp8::fp8e5m2, migraphx::half>
+template<unsigned int E, unsigned int M, unsigned int F, class T>
+struct common_type<migraphx::generic_float<E, M, F>, T> : std::common_type<float, T> // NOLINT
 {
-    using type = float;
 };
 
-template <>
-struct common_type<migraphx::half, migraphx::fp8::fp8e5m2>
+template<unsigned int E, unsigned int M, unsigned int F, class T>
+struct common_type<T, migraphx::generic_float<E, M, F>> : std::common_type<float, T> // NOLINT
 {
-    using type = float;
 };
 
-template <>
-struct common_type<migraphx::half, migraphx::half>
+template<unsigned int E, unsigned int M, unsigned int F, migraphx::fp8::f8_type T, bool FNUZ>
+struct common_type<migraphx::generic_float<E, M, F>, migraphx::fp8::float8<T, FNUZ>> : std::common_type<float, float>
+{};
+
+template<unsigned int E, unsigned int M, unsigned int F, migraphx::fp8::f8_type T, bool FNUZ>
+struct common_type<migraphx::fp8::float8<T, FNUZ>, migraphx::generic_float<E, M, F>> : std::common_type<float, float>
+{};
+
+template<unsigned int E, unsigned int M, unsigned int F>
+struct common_type<migraphx::generic_float<E, M, F>,  migraphx::generic_float<E, M, F>>
 {
-    using type = migraphx::half;
+    using type = migraphx::generic_float<E, M, F>;
 };
 
 } // namespace std