From fc0ba90c26974166abc73e39f03938e9f81acdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Tue, 9 Apr 2024 02:45:03 +0100 Subject: [PATCH] Build also for Poplar SDK v3.3 --- .github/workflows/build_libpoplar.yml | 18 +++++++++++++++++- deps/Project.toml | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_libpoplar.yml b/.github/workflows/build_libpoplar.yml index 8ffb02e..9af5091 100644 --- a/.github/workflows/build_libpoplar.yml +++ b/.github/workflows/build_libpoplar.yml @@ -18,6 +18,9 @@ jobs: matrix: include: - docker_image: graphcore/poplar:3.2.0-ubuntu-20.04-20230314 + artifact_name: poplar-3.2.0 + - docker_image: graphcore/poplar:3.3.0-ubuntu-20.04-20230703 + artifact_name: poplar-3.3.0 steps: - name: "Install, g++, jq" # g++ is needed to build the wrapper, jq for @@ -32,6 +35,19 @@ jobs: with: version: "1.7" - uses: julia-actions/cache@v1 + - name: "Export environment variables" + # Starting from graphcore/poplar:3.3.0 some environment variables like `CPATH` and + # `LD_LIBRARY_PATH`, which we need for building the bindings, are only set with the + # `bash` shell, while GHA uses by default `sh` for steps inside containers. So we + # need to start a step with `shell: bash` and re-export the relevant variables for + # the following steps. + shell: bash + run: | + echo "PATH=${PATH}" >> "${GITHUB_ENV}" + echo "CPATH=${CPATH}" >> "${GITHUB_ENV}" + echo "LIBRARY_PATH=${LIBRARY_PATH}" >> "${GITHUB_ENV}" + echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> "${GITHUB_ENV}" + echo "POPLAR_SDK_ENABLED=${POPLAR_SDK_ENABLED}" >> "${GITHUB_ENV}" - name: Instantiate wrapper generation environment working-directory: ${{ github.workspace }}/deps run: | @@ -54,5 +70,5 @@ jobs: julia --project=. --color=yes build_tarballs.jl --verbose - uses: actions/upload-artifact@v4 with: - name: products + name: products-${{ matrix.artifact_name }} path: ${{ github.workspace }}/deps/bb_recipe/products diff --git a/deps/Project.toml b/deps/Project.toml index 21edc42..e5949b7 100644 --- a/deps/Project.toml +++ b/deps/Project.toml @@ -7,7 +7,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" libcxxwrap_julia_jll = "3eaa8342-bff7-56a5-9981-c04077f7cee7" [compat] -Clang = "0.14, 0.17.4" +Clang = "0.14, 0.17.4, 0.18" JSON = "0.21.4" Pkg = "1" Scratch = "1.1"