From 9a83b87e084246142b0aa5619e6f7e23732677fc Mon Sep 17 00:00:00 2001 From: Danil Bubnov Date: Fri, 5 Jul 2024 12:06:18 +0300 Subject: [PATCH 1/2] MacOS Arm build --- .github/workflows/build_test.yaml | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 0378ae6a4..ea3188952 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -103,6 +103,49 @@ jobs: 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 + steps: + - name: Git checkout + uses: actions/checkout@v4 + with: + submodules: 'true' + + - name: Build R + 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 .. + 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 .. + make -j4 + + - name: Upload binaries + uses: actions/upload-artifact@v3 + with: + 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 From 882e106bb74d43d2fcb29a638ac4d713f0ff6c7c Mon Sep 17 00:00:00 2001 From: Danil Bubnov Date: Fri, 5 Jul 2024 12:11:08 +0300 Subject: [PATCH 2/2] MacOS Arm build --- .github/workflows/build_test.yaml | 87 +------------------------------ 1 file changed, 2 insertions(+), 85 deletions(-) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index ea3188952..7085cda2d 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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