Skip to content

Commit 3d53987

Browse files
committed
Removed mutiple config options
1 parent 1a4ee10 commit 3d53987

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,14 @@ check_cxx_source_compiles(
7979
HPCOMBI_CONSTEXPR_FUN_ARGS)
8080

8181
check_cxx_compiler_flag('-mavx' HPCOMBI_HAVE_FLAG_AVX)
82+
#check_cxx_compiler_flag('-march=native' HPCOMBI_HAVE_FLAG_NATIVE)
8283
#check_cxx_compiler_flag('-mavx2' HPCOMBI_HAVE_FLAG_AVX2)
8384
#check_cxx_compiler_flag('-mavx512bw' HPCOMBI_HAVE_FLAG_AVX512BW)
8485

8586
## Check for Intel intrisics
8687
check_include_file_cxx("x86intrin.h" HPCOMBI_HAVE_X86INTRIN)
8788
if (NOT ${HPCOMBI_HAVE_FLAG_AVX} OR NOT ${HPCOMBI_HAVE_X86INTRIN})
88-
message(FATAL_ERROR "No AVX compiler intrinsics")
89+
message(FATAL_ERROR "No SSE/AVX compiler intrinsics")
8990
endif()
9091
file(READ ${CMAKE_SOURCE_DIR}/list_intrin.txt hpcombi_intrinsics)
9192
string(REPLACE ";" "|" hpcombi_intrinsics "${hpcombi_intrinsics}")
@@ -112,6 +113,7 @@ foreach (intrin ${hpcombi_intrinsics})
112113
endif()
113114
endforeach()
114115

116+
add_compile_options(-mavx -mtune=native -funroll-loops -flax-vector-conversions)
115117

116118
###################
117119
# Project Structure

benchmark/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set(benchmark_src
2424
foreach(f ${benchmark_src})
2525
get_filename_component(benchName ${f} NAME_WE)
2626
add_executable (${benchName} ${f})
27-
target_compile_options(${benchName} PUBLIC -mavx -mtune=native -funroll-loops -flax-vector-conversions)
2827
target_link_libraries(${benchName} benchmark pthread)
2928
# install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${benchName}
3029
# DESTINATION bin

examples/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ set(usage_examples RD.cpp Renner.cpp stringmonoid.cpp Trans.cpp CF.cpp image.cpp
3030
foreach(f ${usage_examples})
3131
get_filename_component(exampleName ${f} NAME_WE)
3232
add_executable (${exampleName} ${f})
33-
target_compile_options(${exampleName} PUBLIC -mavx -mtune=native -funroll-loops -flax-vector-conversions)
3433
# install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${exampleName}
3534
# DESTINATION bin
3635
# RENAME ${CMAKE_PROJECT_NAME}-${exampleName})

tests/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ include_directories(
2525
${PROJECT_BINARY_DIR})
2626

2727
add_definitions (-DBOOST_TEST_DYN_LINK)
28-
add_compile_options(-mavx -mtune=native -funroll-loops -flax-vector-conversions)
2928

3029
set(test_src
3130
test_epu.cpp test_perm16.cpp test_perm_all.cpp test_bmat8.cpp)

0 commit comments

Comments
 (0)