Attempting to resolve flag issues on cross compilations

Einsums · Oct 30, 2023 · 4ad36b4 · 4ad36b4
1 parent 928735e
commit 4ad36b4
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(HPTT C CXX)
 
 include(GNUInstallDirs)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -34,30 +34,30 @@ message(STATUS "HPTT_ENABLE_AVX ${HPTT_ENABLE_AVX}")
 
 find_package(OpenMP MODULE COMPONENTS CXX)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -qopenmp -xhost)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  if(HPTT_ENABLE_IBM)
-    set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp)
-  else()
-    set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp -march=native -mtune=native)
-  endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp -march=native)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -silent -w -Mnovect)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -qsmp=omp)
-endif()
-
-if(HPTT_ENABLE_AVX)
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mavx -DHPTT_ARCH_AVX)
-elseif(HPTT_ENABLE_ARM)
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mfpu=neon -DHPTT_ARCH_ARM)
-elseif(HPTT_ENABLE_IBM)
-  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mtune=native -DHPTT_ARCH_IBM -maltivec
-                     -mabi=altivec)
-endif()
+#if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -qopenmp -xhost)
+#elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+#  if(HPTT_ENABLE_IBM)
+#    set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp)
+#  else()
+#    set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp -march=native -mtune=native)
+#  endif()
+#elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -fopenmp -march=native)
+#elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -silent -w -Mnovect)
+#elseif(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -qsmp=omp)
+#endif()
+#
+#if(HPTT_ENABLE_AVX)
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mavx -DHPTT_ARCH_AVX)
+#elseif(HPTT_ENABLE_ARM)
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mfpu=neon -DHPTT_ARCH_ARM)
+#elseif(HPTT_ENABLE_IBM)
+#  set(HPTT_CXX_FLAGS ${HPTT_CXX_FLAGS} -mtune=native -DHPTT_ARCH_IBM -maltivec
+#                     -mabi=altivec)
+#endif()
 
 set(HPTT_SRCS src/hptt.cpp src/plan.cpp src/transpose.cpp src/utils.cpp)