From afd66e4bc784b55915ceab605a95efd13458b13b Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Tue, 15 Apr 2025 21:57:27 +0200 Subject: [PATCH 1/2] use POCL with fixes --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ed61b671..45658dfb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,8 @@ jobs: if: ${{ matrix.pocl == 'local' }} uses: actions/checkout@v4 with: - repository: pocl/pocl + repository: pjaaskel/pocl + ref: UnreachableToReturns-fixes path: pocl - name: Install system dependencies if: ${{ matrix.pocl == 'local' }} @@ -92,9 +93,8 @@ jobs: "CMake_jll", ]) # versioned - llvm_version = "$(Base.libllvm_version.major).$(Base.libllvm_version.minor)" - Pkg.add(name="LLVM_full_jll", version=llvm_version) - Pkg.add(name="SPIRV_LLVM_Translator_jll", version=llvm_version)' + Pkg.add(name="LLVM_full_jll", version="19") + Pkg.add(name="SPIRV_LLVM_Translator_jll", version="19")' - name: Build PoCL if: ${{ matrix.pocl == 'local' }} run: | @@ -119,6 +119,7 @@ jobs: -DCMAKE_C_FLAGS="-fdiagnostics-color=always" -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS:Bool=OFF + -DSTATIC_LLVM:Bool=On -DPOCL_DEBUG_MESSAGES:Bool=ON -DCMAKE_INSTALL_PREFIX=$destdir -DWITH_LLVM_CONFIG=$(LLVM_full_jll.artifact_dir)/tools/llvm-config From d630770724df2cf43a179dda7acffed8e8820ec0 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Mon, 28 Apr 2025 10:00:56 +0200 Subject: [PATCH 2/2] switch back to main --- .github/workflows/ci.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45658dfb4..a424c5146 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,12 +36,17 @@ jobs: os: ubuntu-latest arch: x64 pocl: local - allow_failure: true + allow_failure: false - version: '1.11' os: ubuntu-latest arch: x64 pocl: local allow_failure: false + - version: '1.12' + os: ubuntu-latest + arch: x64 + pocl: local + allow_failure: false # - version: 'nightly' # os: ubuntu-latest # arch: x64 @@ -60,18 +65,15 @@ jobs: # steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v2 + - uses: julia-actions/install-juliaup@v2 with: - version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - show-versioninfo: true + channel: ${{ matrix.version }} - uses: julia-actions/cache@v2 - name: Checkout pocl if: ${{ matrix.pocl == 'local' }} uses: actions/checkout@v4 with: - repository: pjaaskel/pocl - ref: UnreachableToReturns-fixes + repository: pocl/pocl path: pocl - name: Install system dependencies if: ${{ matrix.pocl == 'local' }} @@ -93,8 +95,8 @@ jobs: "CMake_jll", ]) # versioned - Pkg.add(name="LLVM_full_jll", version="19") - Pkg.add(name="SPIRV_LLVM_Translator_jll", version="19")' + Pkg.add(name="LLVM_full_jll", version="20") + Pkg.add(name="SPIRV_LLVM_Translator_jll", version="20")' - name: Build PoCL if: ${{ matrix.pocl == 'local' }} run: |