Skip to content

Commit

Permalink
try fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
prudhomm committed Jul 8, 2023
1 parent b0dcced commit ae5859f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/pull_request_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ on:
jobs:
build_linux:
name: Build for linux
if: "!contains(github.event.head_commit.message, '[skip linux]')"
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 4
matrix:
arch: [DEIGEN_DONT_VECTORIZE, msse2, mssse3, mavx, mavx2]
eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0]
os: [ubuntu-18.04]
os: [ubuntu-22.04]
steps:
- uses: actions/checkout@v3
- name: Install dependencies
Expand All @@ -40,13 +41,14 @@ jobs:
build_linux_avx512:
name: Build for linux AVX512
if: "!contains(github.event.head_commit.message, '[skip avx]')"
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 4
matrix:
arch: [mavx512dq]
eigenversion: [3.4.0]
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-22.04]
steps:
- uses: actions/checkout@v3
- name: Install dependencies
Expand All @@ -71,6 +73,7 @@ jobs:
build_macos:
name: Build for macOS
if: "!contains(github.event.head_commit.message, '[skip macos]')"
runs-on: macOS-10.15
strategy:
max-parallel: 4
Expand Down Expand Up @@ -100,6 +103,7 @@ jobs:
build_windows:
name: Build for Windows
if: "!contains(github.event.head_commit.message, '[skip windows]')"
runs-on: windows-2019
strategy:
max-parallel: 4
Expand Down Expand Up @@ -133,6 +137,7 @@ jobs:
build_windows_avx512:
name: Build for Windows
if: "!contains(github.event.head_commit.message, '[skip windows-avx]')"
runs-on: windows-2019
strategy:
max-parallel: 4
Expand Down Expand Up @@ -169,7 +174,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
os: [ubuntu-18.04, macOS-10.15, windows-2019]
os: [ubuntu-22.04, macOS-10.15, windows-2019]
steps:
- uses: actions/checkout@v3
- name: Set up Python3
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pull_request_test_non_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ on:
jobs:
build_macos_aarch64:
name: Build for macOS aarch64
if: "!contains(github.event.head_commit.message, '[skip macos-aarch64]')"
runs-on: macOS-11
strategy:
max-parallel: 4
matrix:
arch: [DEIGEN_DONT_VECTORIZE, DDUMMY]
eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Install dependencies
run: |
wget https://gitlab.com/libeigen/eigen/-/archive/${{ matrix.eigenversion }}/eigen-${{ matrix.eigenversion }}.tar.gz
Expand All @@ -36,15 +37,16 @@ jobs:

build-arm64:
name: Build for Arm64-Centos7
runs-on: ubuntu-18.04
if: "!contains(github.event.head_commit.message, '[skip arm64]')"
runs-on: ubuntu-22.04
strategy:
max-parallel: 4
matrix:
arch: [DEIGEN_DONT_VECTORIZE, march=native]
eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
with:
submodules: true
- uses: bab2min/run-on-arch-action@use-custom-image
Expand Down
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ set(ITEMS
foreach(app ${ITEMS})
get_filename_component(app_name ${app} NAME_WE)
string(TOLOWER ${app_name} app_name_lower)
string(TOLOWER ${PROJECT_NAME} project_name_lower)
add_executable(${project_name_lower}-${app_name_lower} ${app})
target_link_libraries(${project_name_lower}-${app_name_lower} PRIVATE eigenrand)
install(TARGETS ${project_name_lower}-${app_name_lower} DESTINATION bin)
# string(TOLOWER ${PROJECT_NAME} project_name_lower)
add_executable(${project_name}-${app_name_lower} ${app})
target_link_libraries(${project_name}-${app_name_lower} PRIVATE eigenrand)
install(TARGETS ${project_name}-${app_name_lower} DESTINATION bin)
endforeach()


Expand All @@ -119,6 +119,9 @@ FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googlet

if(EIGENRAND_BUILD_TEST)
FetchContent_MakeAvailable(googletest)
if (NOT TARGET gtest)
message(STATUS FATAL_ERROR "gtest target not found, is there a problem with googltest?")
endif()
enable_testing()
add_subdirectory( test )
endif()
Expand Down

0 comments on commit ae5859f

Please sign in to comment.