From 5cdedc29dca8c082cffaa613121616157f901372 Mon Sep 17 00:00:00 2001 From: jpekkila Date: Wed, 17 Feb 2021 13:07:16 +0200 Subject: [PATCH] Removed AVX dependency from the core library (astaroth_core). Astaroth utils (astaroth_utils) still requires it though because the model CPU solver uses vectorization. --- CMakeLists.txt | 2 +- src/utils/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66b8001..bca0484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(astaroth C CXX CUDA) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) ## Project-wide compilation flags -set(COMMON_FLAGS "-mavx -DOMPI_SKIP_MPICXX -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow") # -DOMPI_SKIP_MPICXX is to force OpenMPI to use the C interface +set(COMMON_FLAGS "-DOMPI_SKIP_MPICXX -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow") # -DOMPI_SKIP_MPICXX is to force OpenMPI to use the C interface set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}") set(CMAKE_C_STANDARD 11) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 47f1116..a2066ae 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,3 +1,4 @@ ## Astaroth Utils add_library(astaroth_utils STATIC config_loader.c memory.c verification.c modelsolver.c modelreduce.c) add_dependencies(astaroth_utils dsl_headers) +target_compile_options(astaroth_utils PRIVATE "-mavx")