commit 4e095d17d2a35a94b715cf17abe35528cfeb878b
parent b5467ed91faa676b418f8861f6981623058fac6d
Author: [email protected] <[email protected]>
Date: Sat, 16 Dec 2023 04:27:36 +0000
Remove kfr::complex (use std::complex instead)
Diffstat:
5 files changed, 6 insertions(+), 253 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,14 +164,12 @@ option(KFR_REGENERATE_TESTS "Regenerate auto tests" OFF)
option(KFR_DISABLE_CLANG_EXTENSIONS "Disable Clang vector extensions" OFF)
option(KFR_EXTENDED_TESTS "Extended tests (up to hour)" OFF)
option(KFR_SKIP_TESTS "Build tests but don't run tests" OFF)
-option(KFR_STD_COMPLEX "Use std::complex instead of custom complex type" OFF)
option(KFR_ENABLE_CAPI_BUILD "Enable KFR C API building" OFF)
option(KFR_INSTALL_HEADERS "Include headers in installation" ON)
option(KFR_INSTALL_LIBRARIES "Include libraries in installation" ON)
mark_as_advanced(KFR_ENABLE_ASMTEST)
mark_as_advanced(KFR_REGENERATE_TESTS)
mark_as_advanced(KFR_DISABLE_CLANG_EXTENSIONS)
-mark_as_advanced(KFR_STD_COMPLEX)
if (KFR_ENABLE_CAPI_BUILD AND NOT KFR_ENABLE_DFT)
message(
@@ -312,9 +310,6 @@ endif ()
if (KFR_DISABLE_CLANG_EXTENSIONS)
target_compile_definitions(kfr INTERFACE -DCMT_DISABLE_CLANG_EXT)
endif ()
-if (KFR_STD_COMPLEX)
- target_compile_definitions(kfr INTERFACE -DKFR_STD_COMPLEX)
-endif ()
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
add_compile_options(-Wno-ignored-qualifiers -Wno-psabi)
endif ()
diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp
@@ -33,9 +33,7 @@
#include "shape.hpp"
#include <tuple>
-#ifdef KFR_STD_COMPLEX
#include <complex>
-#endif
CMT_PRAGMA_GNU(GCC diagnostic push)
CMT_PRAGMA_GNU(GCC diagnostic ignored "-Wshadow")
@@ -44,17 +42,9 @@ CMT_PRAGMA_GNU(GCC diagnostic ignored "-Wparentheses")
namespace kfr
{
-#ifdef KFR_STD_COMPLEX
-
+#ifndef KFR_CUSTOM_COMPLEX
template <typename T>
using complex = std::complex<T>;
-
-#else
-#ifndef KFR_CUSTOM_COMPLEX
-
-template <typename>
-struct complex;
-#endif
#endif
template <typename T, typename V = void>
diff --git a/include/kfr/simd/complex.hpp b/include/kfr/simd/complex.hpp
@@ -35,158 +35,10 @@ CMT_PRAGMA_MSVC(warning(disable : 4814))
namespace kfr
{
-inline namespace CMT_ARCH_NAME
-{
-
-#ifndef KFR_STD_COMPLEX
-template <typename T>
-KFR_INTRINSIC complex<T> operator+(const complex<T>& x, const complex<T>& y)
-{
- return (make_vector(x) + make_vector(y))[0];
-}
-template <typename T>
-KFR_INTRINSIC complex<T> operator-(const complex<T>& x, const complex<T>& y)
-{
- return (make_vector(x) - make_vector(y))[0];
-}
-template <typename T>
-KFR_INTRINSIC complex<T> operator*(const complex<T>& x, const complex<T>& y)
-{
- return (make_vector(x) * make_vector(y))[0];
-}
-template <typename T>
-KFR_INTRINSIC complex<T> operator/(const complex<T>& x, const complex<T>& y)
-{
- return (make_vector(x) / make_vector(y))[0];
-}
-template <typename T>
-KFR_INTRINSIC complex<T>& operator+=(complex<T>& x, const complex<T>& y)
-{
- x = x + y;
- return x;
-}
-template <typename T>
-KFR_INTRINSIC complex<T>& operator-=(complex<T>& x, const complex<T>& y)
-{
- x = x - y;
- return x;
-}
-template <typename T>
-KFR_INTRINSIC complex<T>& operator*=(complex<T>& x, const complex<T>& y)
-{
- x = x * y;
- return x;
-}
-template <typename T>
-KFR_INTRINSIC complex<T>& operator/=(complex<T>& x, const complex<T>& y)
-{
- x = x / y;
- return x;
-}
-
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator+(const complex<T>& x, const U& y)
-{
- return static_cast<C>(x) + static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator-(const complex<T>& x, const U& y)
-{
- return static_cast<C>(x) - static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator*(const complex<T>& x, const U& y)
-{
- return static_cast<C>(x) * static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator/(const complex<T>& x, const U& y)
-{
- return static_cast<C>(x) / static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(std::is_convertible_v<U, T>)>
-KFR_INTRINSIC complex<T>& operator+=(complex<T>& x, const U& y)
-{
- x = x + y;
- return x;
-}
-template <typename T, typename U, KFR_ENABLE_IF(std::is_convertible_v<U, T>)>
-KFR_INTRINSIC complex<T>& operator-=(complex<T>& x, const U& y)
-{
- x = x - y;
- return x;
-}
-template <typename T, typename U, KFR_ENABLE_IF(std::is_convertible_v<U, T>)>
-KFR_INTRINSIC complex<T>& operator*=(complex<T>& x, const U& y)
-{
- x = x * y;
- return x;
-}
-template <typename T, typename U, KFR_ENABLE_IF(std::is_convertible_v<U, T>)>
-KFR_INTRINSIC complex<T>& operator/=(complex<T>& x, const U& y)
-{
- x = x / y;
- return x;
-}
-
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator+(const U& x, const complex<T>& y)
-{
- return static_cast<C>(x) + static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator-(const U& x, const complex<T>& y)
-{
- return static_cast<C>(x) - static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator*(const U& x, const complex<T>& y)
-{
- return static_cast<C>(x) * static_cast<C>(y);
-}
-template <typename T, typename U, KFR_ENABLE_IF(is_number<U>), typename C = std::common_type_t<complex<T>, U>>
-KFR_INTRINSIC C operator/(const U& x, const complex<T>& y)
-{
- return static_cast<C>(x) / static_cast<C>(y);
-}
-template <typename T>
-KFR_INTRINSIC complex<T> operator-(const complex<T>& x)
-{
- return (-make_vector(x))[0];
-}
-template <typename T>
-KFR_INTRINSIC complex<T> operator+(const complex<T>& x)
-{
- return x;
-}
-#endif
-
-} // namespace CMT_ARCH_NAME
} // namespace kfr
namespace cometa
{
template <typename T>
-struct compound_type_traits<kfr::complex<T>>
-{
- constexpr static size_t width = 2;
- constexpr static size_t deep_width = width * compound_type_traits<T>::width;
- using subtype = T;
- using deep_subtype = cometa::deep_subtype<T>;
- constexpr static bool is_scalar = false;
- constexpr static size_t depth = cometa::compound_type_traits<T>::depth + 1;
- template <typename U>
- using rebind = kfr::complex<U>;
- template <typename U>
- using deep_rebind = kfr::complex<typename compound_type_traits<subtype>::template deep_rebind<U>>;
-
- static constexpr subtype at(const kfr::complex<T>& value, size_t index)
- {
- return index == 0 ? value.real() : value.imag();
- }
-};
-
-#ifndef KFR_STD_COMPLEX
-template <typename T>
struct compound_type_traits<std::complex<T>>
{
constexpr static size_t width = 2;
@@ -205,8 +57,6 @@ struct compound_type_traits<std::complex<T>>
return index == 0 ? value.real() : value.imag();
}
};
-#endif
-
} // namespace cometa
namespace kfr
{
diff --git a/include/kfr/simd/complex_type.hpp b/include/kfr/simd/complex_type.hpp
@@ -28,70 +28,13 @@
#include "../cometa/string.hpp"
#include "constants.hpp"
-#ifdef KFR_STD_COMPLEX
#include <complex>
-#endif
namespace kfr
{
-#ifdef KFR_STD_COMPLEX
-
-template <typename T>
-using complex = std::complex<T>;
-
-#else
#ifndef KFR_CUSTOM_COMPLEX
-
-/**
- * @brief Represents the complex numbers. If KFR_STD_COMPLEX is defined, then kfr::complex is an alias for
- * std::complex.
- */
template <typename T>
-struct complex
-{
- static_assert(is_simd_type<T>, "Incorrect type for complex");
- constexpr complex() CMT_NOEXCEPT = default;
- KFR_MEM_INTRINSIC constexpr complex(T re) CMT_NOEXCEPT : re(re), im(0) {}
- KFR_MEM_INTRINSIC constexpr complex(T re, T im) CMT_NOEXCEPT : re(re), im(im) {}
- constexpr complex(const complex&) CMT_NOEXCEPT = default;
- constexpr complex(complex&&) CMT_NOEXCEPT = default;
- template <typename U>
- KFR_MEM_INTRINSIC constexpr complex(const complex<U>& other) CMT_NOEXCEPT
- : re(static_cast<T>(other.real())),
- im(static_cast<T>(other.imag()))
- {
- }
- template <typename U>
- KFR_MEM_INTRINSIC constexpr complex(complex<U>&& other) CMT_NOEXCEPT : re(std::move(other.real())),
- im(std::move(other.imag()))
- {
- }
-#ifdef CMT_COMPILER_GNU
- constexpr complex& operator=(const complex&) CMT_NOEXCEPT = default;
- constexpr complex& operator=(complex&&) CMT_NOEXCEPT = default;
-#else
- complex& operator=(const complex&) = default;
- complex& operator=(complex&&) = default;
-#endif
- KFR_MEM_INTRINSIC constexpr const T& real() const CMT_NOEXCEPT { return re; }
- KFR_MEM_INTRINSIC constexpr const T& imag() const CMT_NOEXCEPT { return im; }
- KFR_MEM_INTRINSIC constexpr void real(T value) CMT_NOEXCEPT { re = value; }
- KFR_MEM_INTRINSIC constexpr void imag(T value) CMT_NOEXCEPT { im = value; }
-
- KFR_MEM_INTRINSIC constexpr bool operator==(const complex& other) const CMT_NOEXCEPT
- {
- return re == other.re && im == other.im;
- }
- KFR_MEM_INTRINSIC constexpr bool operator!=(const complex& other) const CMT_NOEXCEPT
- {
- return !operator==(other);
- }
-
-private:
- T re;
- T im;
-};
-#endif
+using complex = std::complex<T>;
#endif
} // namespace kfr
diff --git a/tests/unit/dsp/fir.cpp b/tests/unit/dsp/fir.cpp
@@ -180,31 +180,6 @@ TEST(fir_different)
}
#endif
-#ifdef KFR_STD_COMPLEX
-template <typename T>
-inline std::complex<T> to_std(const std::complex<T>& c)
-{
- return c;
-}
-template <typename T>
-inline std::complex<T> from_std(const std::complex<T>& c)
-{
- return c;
-}
-#else
-template <typename T>
-inline std::complex<T> to_std(const kfr::complex<T>& c)
-{
- return { c.real(), c.imag() };
-}
-
-template <typename T>
-inline kfr::complex<T> from_std(const std::complex<T>& c)
-{
- return { c.real(), c.imag() };
-}
-#endif
-
TEST(fir_complex)
{
const univector<complex<float>, 100> data =
@@ -216,8 +191,8 @@ TEST(fir_complex)
{
std::complex<float> result = 0.0;
for (size_t i = 0; i < taps.size(); i++)
- result = result + to_std(data.get(index - i, 0.0)) * taps[i];
- return from_std(result);
+ result = result + data.get(index - i, 0.0) * taps[i];
+ return result;
});
CHECK_EXPRESSION(short_fir(data, taps), 100,
@@ -225,8 +200,8 @@ TEST(fir_complex)
{
std::complex<float> result = 0.0;
for (size_t i = 0; i < taps.size(); i++)
- result = result + to_std(data.get(index - i, 0.0)) * taps[i];
- return from_std(result);
+ result = result + data.get(index - i, 0.0) * taps[i];
+ return result;
});
}
} // namespace CMT_ARCH_NAME
