diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ca887df463..5c0881bcc8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -203,6 +203,7 @@ jobs: make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/flang/bin/flang NO_SHARED=1 - job: OSX_OpenMP_Clang + timeoutInMinutes: 100 pool: vmImage: 'macOS-latest' variables: @@ -216,6 +217,7 @@ jobs: make TARGET=CORE2 USE_OPENMP=1 DYNAMIC_ARCH=1 DYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' CC=/usr/local/opt/llvm/bin/clang NOFORTRAN=1 - job: OSX_OpenMP_Clang_cmake + timeoutInMinutes: 100 pool: vmImage: 'macOS-latest' variables: @@ -227,11 +229,12 @@ jobs: brew install llvm libomp mkdir build cd build - cmake -DTARGET=CORE2 -DUSE_OPENMP=1 -DINTERFACE64=1 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DNOFORTRAN=1 -DNO_AVX512=1 .. + cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DTARGET=CORE2 -DUSE_OPENMP=1 -DINTERFACE64=1 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM;HASWELL;SKYLAKEX' -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DNOFORTRAN=1 -DNO_AVX512=1 .. make ctest - job: OSX_dynarch_cmake + timeoutInMinutes: 100 pool: vmImage: 'macOS-14' variables: diff --git a/cmake/arch.cmake b/cmake/arch.cmake index b902937a05..881976944b 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -111,6 +111,9 @@ if (DYNAMIC_ARCH) string(REGEX REPLACE "-march=native" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") endif () if (DYNAMIC_LIST) + if (NO_AVX512) + list(REMOVE_ITEM DYNAMIC_LIST "SKYLAKEX" "COOPERLAKE" "SAPPHIRERAPIDS") + endif() set(DYNAMIC_CORE PRESCOTT ${DYNAMIC_LIST}) endif () endif ()