Removed mutiple config options

libsemigroups · Jan 14, 2020 · 3d53987 · 3d53987
1 parent 1a4ee10
commit 3d53987
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,13 +79,14 @@ check_cxx_source_compiles(
   HPCOMBI_CONSTEXPR_FUN_ARGS)
 
 check_cxx_compiler_flag('-mavx' HPCOMBI_HAVE_FLAG_AVX)
+#check_cxx_compiler_flag('-march=native' HPCOMBI_HAVE_FLAG_NATIVE)
 #check_cxx_compiler_flag('-mavx2' HPCOMBI_HAVE_FLAG_AVX2)
 #check_cxx_compiler_flag('-mavx512bw' HPCOMBI_HAVE_FLAG_AVX512BW)
 
 ## Check for Intel intrisics
 check_include_file_cxx("x86intrin.h" HPCOMBI_HAVE_X86INTRIN)
 if (NOT ${HPCOMBI_HAVE_FLAG_AVX} OR NOT ${HPCOMBI_HAVE_X86INTRIN})
-  message(FATAL_ERROR "No AVX compiler intrinsics")
+  message(FATAL_ERROR "No SSE/AVX compiler intrinsics")
 endif()
 file(READ ${CMAKE_SOURCE_DIR}/list_intrin.txt hpcombi_intrinsics)
 string(REPLACE ";" "|" hpcombi_intrinsics "${hpcombi_intrinsics}")
@@ -112,6 +113,7 @@ foreach (intrin ${hpcombi_intrinsics})
   endif()
 endforeach()
 
+add_compile_options(-mavx -mtune=native -funroll-loops -flax-vector-conversions)
 
 ###################
 # Project Structure

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -24,7 +24,6 @@ set(benchmark_src
 foreach(f ${benchmark_src})
   get_filename_component(benchName ${f} NAME_WE)
   add_executable (${benchName} ${f})
-  target_compile_options(${benchName} PUBLIC -mavx -mtune=native -funroll-loops -flax-vector-conversions)
   target_link_libraries(${benchName} benchmark pthread)
   # install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${benchName}
   #   DESTINATION bin

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -30,7 +30,6 @@ set(usage_examples RD.cpp Renner.cpp stringmonoid.cpp Trans.cpp CF.cpp image.cpp
 foreach(f ${usage_examples})
   get_filename_component(exampleName ${f} NAME_WE)
   add_executable (${exampleName} ${f})
-  target_compile_options(${exampleName} PUBLIC -mavx -mtune=native -funroll-loops -flax-vector-conversions)
   # install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${exampleName}
   #   DESTINATION bin
   #   RENAME ${CMAKE_PROJECT_NAME}-${exampleName})

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -25,7 +25,6 @@ include_directories(
   ${PROJECT_BINARY_DIR})
 
 add_definitions (-DBOOST_TEST_DYN_LINK)
-add_compile_options(-mavx -mtune=native -funroll-loops -flax-vector-conversions)
 
 set(test_src
   test_epu.cpp test_perm16.cpp test_perm_all.cpp test_bmat8.cpp)