refactor 0

asdlei99 · Nov 7, 2020 · 50f56b6 · 50f56b6
1 parent 382f462
commit 50f56b6
Show file tree

Hide file tree

Showing 21 changed files with 185 additions and 115 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(UGM VERSION 0.6.12)
+project(UGM VERSION 0.6.13)
 message(STATUS "[Project] ${PROJECT_NAME}")
 
 include(cmake/InitUCMake.cmake)
 Ubpa_InitUCMake()
 
 Ubpa_InitProject()
 
-set(Ubpa_USE_SIMD TRUE CACHE BOOL "use simd")
-set(Ubpa_USE_SSE_4_1 TRUE CACHE BOOL "use sse 4.1")
+option(Ubpa_UGM_UseSIMD "use SIMD" TRUE)
+option(Ubpa_UGM_UseSSE_4_1 "use SSE 4.1" TRUE)
 
 Ubpa_AddDep(UTemplate 0.4.8)
 

diff --git a/include/UGM/Interfaces/IArray/IArray.h b/include/UGM/Interfaces/IArray/IArray.h
@@ -147,7 +147,7 @@ namespace Ubpa {
 		}
 	};
 
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 	template<typename IArray_Base, typename Impl>
 	struct alignas(16) IArray_Impl<true, IArray_Base, Impl> : IArray_Base {
 	public:

diff --git a/include/UGM/Interfaces/IArray/IArray1D_Util.h b/include/UGM/Interfaces/IArray/IArray1D_Util.h
@@ -15,11 +15,11 @@ namespace Ubpa {
 
 		inline const Impl abs() const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_abs_ps(x);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -33,7 +33,7 @@ namespace Ubpa {
 		}
 
 		inline T min_component() const noexcept {
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>) {
 				// 5 instructions
 				const auto& s0 = *this;
@@ -46,7 +46,7 @@ namespace Ubpa {
 				//return std::min(std::min((*this)[0], (*this)[1]), std::min((*this)[2], (*this)[3]));
 			}
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			return (*this)[min_dim()];
 		}
 
@@ -55,7 +55,7 @@ namespace Ubpa {
 		}
 
 		inline T max_component() const noexcept {
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>) {
 				// 5 instructions
 				const auto& s0 = *this;
@@ -68,7 +68,7 @@ namespace Ubpa {
 				//return std::max(std::max((*this)[0], (*this)[1]), std::max((*this)[2], (*this)[3]));
 			}
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			return (*this)[max_dim()];
 		}
 
@@ -97,11 +97,11 @@ namespace Ubpa {
 		}
 
 		static const Impl min(const Impl& x, const Impl& y) noexcept {
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_min_ps(x, y);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -112,11 +112,11 @@ namespace Ubpa {
 		}
 
 		static const Impl max(const Impl& x, const Impl& y) noexcept {
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_max_ps(x, y);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)

diff --git a/include/UGM/Interfaces/IArray/IArrayAdd.h b/include/UGM/Interfaces/IArray/IArrayAdd.h
@@ -18,11 +18,11 @@ namespace Ubpa {
 
 		inline const Impl impl_add(const Impl& y) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_add_ps(x, y);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -33,11 +33,11 @@ namespace Ubpa {
 
 		inline Impl& impl_add_to_self(const Impl& y) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return x = x + y;
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				for (size_t i = 0; i < N; i++)
 					x[i] += y[i];
@@ -47,12 +47,12 @@ namespace Ubpa {
 
 		inline const Impl impl_add_inverse() const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				// ref: https://stackoverflow.com/questions/20083997/how-to-negate-change-sign-of-the-floating-point-elements-in-a-m128-type-vari
 				return _mm_sub_ps(Impl{ 0.f }, x);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++) {
@@ -67,12 +67,12 @@ namespace Ubpa {
 
 		inline const Impl impl_minus(const Impl& y) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>) {
 				return _mm_sub_ps(x, y);
 			}
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -83,12 +83,12 @@ namespace Ubpa {
 
 		inline Impl& impl_minus_to_self(const Impl& y) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>) {
 				return x = x - y;
 			}
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				for (size_t i = 0; i < N; i++)
 					x[i] -= y[i];
@@ -99,11 +99,11 @@ namespace Ubpa {
 		template<typename U, std::enable_if_t<std::is_integral_v<U>>* = nullptr>
 		inline Impl impl_add_mul(U v) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_mul_ps(x, Impl{ v });
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -115,11 +115,11 @@ namespace Ubpa {
 		template<typename U, std::enable_if_t<std::is_integral_v<U>>* = nullptr>
 		inline Impl& impl_add_mul_to_self(U v) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return x = x * v;
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				for (size_t i = 0; i < N; i++)
 					x[i] *= v;

diff --git a/include/UGM/Interfaces/IArray/IArrayHadamardProduct.h b/include/UGM/Interfaces/IArray/IArrayHadamardProduct.h
@@ -18,23 +18,23 @@ namespace Ubpa {
 
 		Impl& operator*=(const Impl& y) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				x = x * y;
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			for (size_t i = 0; i < N; i++)
 				x[i] *= y[i];
 			return x;
 		}
 
 		const Impl operator/(const Impl& y) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_div_ps(x, y);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -45,11 +45,11 @@ namespace Ubpa {
 
 		Impl& operator/=(const Impl& y) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return x = x / y;
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			for (size_t i = 0; i < N; i++)
 				x[i] /= y[i];
 			return x;
@@ -58,11 +58,11 @@ namespace Ubpa {
 		inline const Impl inverse() const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
 
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_div_ps(Impl{ 1.f }, x);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -78,11 +78,11 @@ namespace Ubpa {
 		inline const Impl impl_mul(const Impl& y) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
 
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_mul_ps(x, y);
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)

diff --git a/include/UGM/Interfaces/IArray/IArrayScalarMul.h b/include/UGM/Interfaces/IArray/IArrayScalarMul.h
@@ -12,7 +12,7 @@ namespace Ubpa {
 		static constexpr size_t N = ImplTraits_N<Impl>;
 		using F = ImplTraits_F<Impl>;
 
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 		using Base::operator*;
 		using Base::operator*=;
 		using Base::operator/;
@@ -47,19 +47,19 @@ namespace Ubpa {
 			const auto& x = static_cast<const Impl&>(*this);
 			return x = x / k;
 		}
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 
 	private:
 		template<typename Base, typename Impl>
 		friend struct IScalarMul;
 
 		inline Impl impl_scalar_mul(F k) const noexcept {
 			const auto& x = static_cast<const Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_mul_ps(x, Impl{ k });
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -70,11 +70,11 @@ namespace Ubpa {
 
 		inline Impl& impl_scalar_mul_to_self(F k) noexcept {
 			auto& x = static_cast<Impl&>(*this);
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return x = x * k;
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				for (size_t i = 0; i < N; i++)
 					x[i] *= k;

diff --git a/include/UGM/Interfaces/IArray/IArrayUtil.h b/include/UGM/Interfaces/IArray/IArrayUtil.h
@@ -37,11 +37,11 @@ namespace Ubpa {
 
 		static const Impl lerp(const Impl& x, const Impl& y, F t) noexcept {
 			F one_minus_t = static_cast<F>(1) - t;
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>)
 				return _mm_add_ps(_mm_mul_ps(x, _mm_set1_ps(one_minus_t)), _mm_mul_ps(y, _mm_set1_ps(t)));
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t i = 0; i < N; i++)
@@ -65,7 +65,7 @@ namespace Ubpa {
 			auto val_iter = vals.begin();
 			auto weight_iter = weights.begin();
 
-#ifdef UBPA_USE_SIMD
+#ifdef UBPA_UGM_USE_SIMD
 			if constexpr (ImplTraits_SupportSIMD<Impl>) {
 				__m128 rst = _mm_mul_ps(*val_iter, *weight_iter);
 				++val_iter;
@@ -78,7 +78,7 @@ namespace Ubpa {
 				return rst;
 			}
 			else
-#endif // UBPA_USE_SIMD
+#endif // UBPA_UGM_USE_SIMD
 			{
 				Impl rst;
 				for (size_t j = 0; j < N; j++)