ci: pin to avx for macos (#3502)
Related to #3439 Will see after a few weeks if the problem resurfaces. All macos related caches have been purged to eliminate that as a possibility.pull/3503/head
parent
f9e0aa82bc
commit
6569636abf
|
@ -47,8 +47,8 @@ jobs:
|
||||||
- name: Build Project
|
- name: Build Project
|
||||||
run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
|
run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
|
||||||
|
|
||||||
# - name: Run Tests
|
- name: Run Tests
|
||||||
# run: ./test.sh
|
run: ./test.sh
|
||||||
|
|
||||||
- name: Prepare artifacts
|
- name: Prepare artifacts
|
||||||
if: ${{ inputs.uploadArtifacts }}
|
if: ${{ inputs.uploadArtifacts }}
|
||||||
|
|
|
@ -101,7 +101,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||||
message(STATUS "AppleClang detected - Setting Defaults")
|
message(STATUS "AppleClang detected - Setting Defaults")
|
||||||
set(CMAKE_CXX_FLAGS
|
set(CMAKE_CXX_FLAGS
|
||||||
"${CMAKE_CXX_FLAGS} \
|
"${CMAKE_CXX_FLAGS} \
|
||||||
-march=native \
|
|
||||||
-Wall \
|
-Wall \
|
||||||
-Winit-self \
|
-Winit-self \
|
||||||
-ggdb \
|
-ggdb \
|
||||||
|
@ -117,6 +116,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||||
-Wsign-promo \
|
-Wsign-promo \
|
||||||
-fdiagnostics-color=always"
|
-fdiagnostics-color=always"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# pin to AVX for macOS, hopefully all macOS runners have atleast this architecture
|
||||||
|
# technically speaking, SSE4 is the cutoff for Apple Silicon so...only a matter of time!
|
||||||
|
if(NOT CMAKE_CXX_COMPILER_TARGET STREQUAL "arm64-apple-darwin")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
|
||||||
|
endif()
|
||||||
|
|
||||||
# additional c++ flags for release mode for our projects
|
# additional c++ flags for release mode for our projects
|
||||||
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||||
|
|
Loading…
Reference in New Issue