Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi platforms CI #1101

Merged
merged 24 commits into from
Jul 16, 2023
Merged

Multi platforms CI #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
143031d
add multi platform
alonfaraj Jul 12, 2023
baa885e
add image name
alonfaraj Jul 12, 2023
651c6c2
fix
alonfaraj Jul 12, 2023
eb5d839
fix /bin/sh path
alonfaraj Jul 12, 2023
8b8aa12
add missing \
alonfaraj Jul 12, 2023
ef371be
add all platforms for check
alonfaraj Jul 12, 2023
09c5d3f
remove platforms
alonfaraj Jul 12, 2023
74f4767
remove s390x
alonfaraj Jul 12, 2023
6d750b3
- add arm v6
alonfaraj Jul 12, 2023
2cf959f
remove arm v6
alonfaraj Jul 12, 2023
80933bc
- bump checkout to v3
alonfaraj Jul 12, 2023
c703707
mymindstorm/setup-emsdk to v12
alonfaraj Jul 12, 2023
bcf2597
add missing QEMU step
alonfaraj Jul 12, 2023
b0242a6
add fail-fast: false for debug
alonfaraj Jul 12, 2023
5d1f62e
add freebsd
alonfaraj Jul 13, 2023
9794990
remark all jobs except freebsd for test
alonfaraj Jul 13, 2023
b2822fc
add sudo
alonfaraj Jul 13, 2023
b3e4c06
enable all tests again
alonfaraj Jul 13, 2023
d69218a
format
Jul 13, 2023
77a3664
check __AVX__ support before include immintrin.h
alonfaraj Jul 13, 2023
882508c
try auto detect flag by cmake
alonfaraj Jul 13, 2023
809e7e5
fix check for immintrin.h
alonfaraj Jul 13, 2023
ff6acab
fix include check for immintrin.h
alonfaraj Jul 13, 2023
f7e750d
Remove all platforms for sanitizer build except amd64
alonfaraj Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 94 additions & 70 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
name: CI
on: [push, pull_request]

env:
ubuntu_image: "ubuntu:22.04"

jobs:
ubuntu-latest:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
arch: [linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le]

steps:
- name: Clone
uses: actions/checkout@v1

- name: Dependencies
run: |
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install libsdl2-dev
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build
- name: Build ${{ matrix.arch }}
run: |
make
make stream
docker run --platform ${{ matrix.arch }} --rm \
-v ${{ github.workspace }}:/workspace \
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
apt update
apt install -y build-essential libsdl2-dev
make
make stream'

macOS-latest:
runs-on: macOS-latest

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Dependencies
run: |
Expand All @@ -36,83 +46,105 @@ jobs:
run: |
make
make stream

freeBSD-latest:
runs-on: macos-12

steps:
- name: Clone
uses: actions/checkout@v3

- name: Build
uses: cross-platform-actions/action@v0.15.0
with:
operating_system: freebsd
version: '13.2'
run: |
sudo pkg update
sudo pkg install -y gmake sdl2
gmake
gmake stream

ubuntu-latest-gcc:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
build: [Debug, Release]
arch: [linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le]

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Dependencies
run: |
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install cmake
sudo apt-get install libsdl2-dev

- name: Configure
run: cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build
- name: Build ${{ matrix.arch }}
run: |
make
ctest -L gh --output-on-failure
docker run --platform ${{ matrix.arch }} --rm \
-v ${{ github.workspace }}:/workspace \
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
apt update
apt install -y build-essential cmake libsdl2-dev
cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
make
ctest -L gh --output-on-failure'

ubuntu-latest-clang:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
build: [Debug, Release]
arch: [linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le]

steps:
- name: Clone
uses: actions/checkout@v1

- name: Dependencies
run: |
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install cmake
sudo apt-get install libsdl2-dev
uses: actions/checkout@v3

- name: Configure
run: cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build
- name: Build ${{ matrix.arch }}
run: |
make
ctest -L gh --output-on-failure
docker run --platform ${{ matrix.arch }} --rm \
-v ${{ github.workspace }}:/workspace \
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
apt update
apt install -y build-essential cmake libsdl2-dev
cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
make
ctest -L gh --output-on-failure'

ubuntu-latest-gcc-sanitized:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
sanitizer: [ADDRESS, THREAD, UNDEFINED]
arch: [linux/amd64]

steps:
- name: Clone
uses: actions/checkout@v1

- name: Dependencies
run: |
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install cmake

- name: Configure
run: cmake . -DCMAKE_BUILD_TYPE=Debug -DWHISPER_SANITIZE_${{ matrix.sanitizer }}=ON

- name: Build
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build ${{ matrix.arch }}
run: |
make
ctest -L gh --output-on-failure
docker run --platform ${{ matrix.arch }} --rm \
-v ${{ github.workspace }}:/workspace \
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
apt update
apt install -y build-essential cmake
cmake . -DCMAKE_BUILD_TYPE=Debug -DWHISPER_SANITIZE_${{ matrix.sanitizer }}=ON
make
ctest -L gh --output-on-failure'

windows:
runs-on: windows-latest
Expand All @@ -134,7 +166,7 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
Expand Down Expand Up @@ -195,7 +227,7 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
Expand Down Expand Up @@ -261,7 +293,7 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
Expand Down Expand Up @@ -308,24 +340,16 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Dependencies
run: |
wget -q https://github.com/emscripten-core/emsdk/archive/master.tar.gz
tar -xvf master.tar.gz
emsdk-master/emsdk update
emsdk-master/emsdk install latest
emsdk-master/emsdk activate latest
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v12

- name: Configure
run: echo "tmp"
- name: Verify
run: emcc -v

- name: Build
run: |
pushd emsdk-master
source ./emsdk_env.sh
popd
emcmake cmake . -DCMAKE_BUILD_TYPE=${{ matrix.build }}
make

Expand All @@ -338,7 +362,7 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Configure
run: |
Expand All @@ -356,7 +380,7 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install Java
uses: actions/setup-java@v3
Expand All @@ -376,7 +400,7 @@ jobs:
needs: [ 'windows' ]
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Install Java
uses: actions/setup-java@v1
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,16 +256,16 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
else()
if(NOT WHISPER_NO_AVX)
if(__AVX__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
endif()
if(NOT WHISPER_NO_AVX2)
if(__AVX2__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
endif()
if(NOT WHISPER_NO_FMA)
if(__FMA__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
endif()
if(NOT WHISPER_NO_F16C)
if(__F16C__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mf16c")
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion ggml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ typedef double ggml_float;
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <intrin.h>
#else
#if !defined(__riscv)
#if defined(__AVX__) || defined(__AVX2__) || defined(__AVX512F__) || defined(__SSSE3__)
#include <immintrin.h>
#endif
#endif
Expand Down
Loading