Skip to content

Commit

Permalink
MacOS Arm build
Browse files Browse the repository at this point in the history
  • Loading branch information
KaperD authored Jul 5, 2024
1 parent 9a83b87 commit 882e106
Showing 1 changed file with 2 additions and 85 deletions.
87 changes: 2 additions & 85 deletions .github/workflows/build_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,6 @@ jobs:
name: astcenc-linux-x64
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
- name: Python Tests
run: |
python ./Test/astc_test_functional.py --encoder=none
python ./Test/astc_test_functional.py --encoder=sse2
python ./Test/astc_test_functional.py --encoder=sse4.1
python ./Test/astc_test_functional.py --encoder=avx2
python ./Test/astc_test_image.py --encoder=none --test-set Small --test-quality medium
python ./Test/astc_test_image.py --encoder=all-x86 --test-set Small --test-quality medium
- name: ctest
run: ctest
working-directory: build_rel

build-macos:
name: Build and test on MacOS
runs-on: macos-12
Expand Down Expand Up @@ -89,20 +66,6 @@ jobs:
name: astcenc-macos-x64
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
build-macos-arm:
name: Build and test on MacOS Arm
runs-on: macos-14
Expand All @@ -116,14 +79,14 @@ jobs:
run: |
mkdir build_rel
cd build_rel
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=arm ..
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm ..
make install package -j4
- name: Build D
run: |
mkdir build_dbg
cd build_dbg
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_ISA_NONE=ON ..
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_NEON=ON ..
make -j4
- name: Upload binaries
Expand All @@ -132,20 +95,6 @@ jobs:
name: astcenc-macos-arm
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
build-windows-msvc:
name: Build and test on Windows MSVC
runs-on: windows-2022
Expand Down Expand Up @@ -180,22 +129,6 @@ jobs:
name: astcenc-windows-x64-cl
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
shell: cmd

- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
shell: cmd

build-windows-ClangCL:
name: Build and test on Windows ClangCL
runs-on: windows-2022
Expand Down Expand Up @@ -231,19 +164,3 @@ jobs:
with:
name: astcenc-windows-x64-clangcl
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
shell: cmd

- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
shell: cmd

0 comments on commit 882e106

Please sign in to comment.