Commit 5c29739a authored by Bednárek David RNDr. Ph.D.'s avatar Bednárek David RNDr. Ph.D.
Browse files

Merge branch 'build_test' into 'master'

corrected ifdef USE_AVX blocks

See merge request teaching/nprg054/asgn!6
parents 28eeb497 17a281a9
...@@ -108,12 +108,8 @@ namespace levensol { ...@@ -108,12 +108,8 @@ namespace levensol {
struct policy_scalar; struct policy_scalar;
struct policy_sse; struct policy_sse;
#ifdef USE_AVX
struct policy_avx; struct policy_avx;
#endif
#ifdef USE_AVX512
struct policy_avx512; struct policy_avx512;
#endif
}; };
namespace levenmain { namespace levenmain {
...@@ -132,23 +128,19 @@ namespace levenmain { ...@@ -132,23 +128,19 @@ namespace levenmain {
using policy = levensol::policy_sse; using policy = levensol::policy_sse;
}; };
#ifdef USE_AVX
struct platform_avx { struct platform_avx {
using tag_category = fmwkng::platform_tag_category; using tag_category = fmwkng::platform_tag_category;
static auto name() { return "avx"; } static auto name() { return "avx"; }
static auto code_name() { return "levenmain::platform_avx"; } static auto code_name() { return "levenmain::platform_avx"; }
using policy = levensol::policy_avx; using policy = levensol::policy_avx;
}; };
#endif
#ifdef USE_AVX512
struct platform_avx512 { struct platform_avx512 {
using tag_category = fmwkng::platform_tag_category; using tag_category = fmwkng::platform_tag_category;
static auto name() { return "avx512"; } static auto name() { return "avx512"; }
static auto code_name() { return "levenmain::platform_avx512"; } static auto code_name() { return "levenmain::platform_avx512"; }
using policy = levensol::policy_avx512; using policy = levensol::policy_avx512;
}; };
#endif
struct a_size { struct a_size {
using tag_category = fmwkng::range_tag_category; using tag_category = fmwkng::range_tag_category;
......
...@@ -53,12 +53,8 @@ namespace macrosol { ...@@ -53,12 +53,8 @@ namespace macrosol {
struct policy_scalar; struct policy_scalar;
struct policy_sse; struct policy_sse;
#ifdef USE_AVX
struct policy_avx; struct policy_avx;
#endif
#ifdef USE_AVX512
struct policy_avx512; struct policy_avx512;
#endif
}; };
namespace macromain { namespace macromain {
...@@ -76,23 +72,19 @@ namespace macromain { ...@@ -76,23 +72,19 @@ namespace macromain {
using policy = macrosol::policy_sse; using policy = macrosol::policy_sse;
}; };
#ifdef USE_AVX
struct platform_avx { struct platform_avx {
using tag_category = fmwkng::platform_tag_category; using tag_category = fmwkng::platform_tag_category;
static auto name() { return "avx"; } static auto name() { return "avx"; }
static auto code_name() { return "macromain::platform_avx"; } static auto code_name() { return "macromain::platform_avx"; }
using policy = macrosol::policy_avx; using policy = macrosol::policy_avx;
}; };
#endif
#ifdef USE_AVX512
struct platform_avx512 { struct platform_avx512 {
using tag_category = fmwkng::platform_tag_category; using tag_category = fmwkng::platform_tag_category;
static auto name() { return "avx512"; } static auto name() { return "avx512"; }
static auto code_name() { return "macromain::platform_avx512"; } static auto code_name() { return "macromain::platform_avx512"; }
using policy = macrosol::policy_avx512; using policy = macrosol::policy_avx512;
}; };
#endif
struct nonmacro_weight { struct nonmacro_weight {
using tag_category = fmwkng::range_tag_category; using tag_category = fmwkng::range_tag_category;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment