From 5ce472ddc008fbf2203c7c65c1a06edfa5ef540f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Chor=C4=85=C5=BCewicz?= Date: Mon, 11 Mar 2024 13:56:18 -0700 Subject: [PATCH] [CI] Install hwloc on CI (UMF dependency) --- .github/docker/ubuntu-22.04.Dockerfile | 3 ++- .github/workflows/bandit.yml | 5 +++++ .github/workflows/cmake.yml | 20 ++++++++++++++++---- .github/workflows/codeql.yml | 10 ++++++++++ .github/workflows/coverage.yml | 2 +- .github/workflows/coverity.yml | 5 +++++ .github/workflows/docs.yml | 2 +- .github/workflows/e2e_core.yml | 4 ++++ .github/workflows/nightly.yml | 4 ++++ 9 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.github/docker/ubuntu-22.04.Dockerfile b/.github/docker/ubuntu-22.04.Dockerfile index e8e88caa72..64c1f7ac24 100644 --- a/.github/docker/ubuntu-22.04.Dockerfile +++ b/.github/docker/ubuntu-22.04.Dockerfile @@ -32,7 +32,8 @@ ARG BASE_DEPS="\ ARG UR_DEPS="\ doxygen \ python3 \ - python3-pip" + python3-pip \ + libhwloc-dev" # Unified Runtime's dependencies (installed via pip) ARG UR_PYTHON_DEPS="\ diff --git a/.github/workflows/bandit.yml b/.github/workflows/bandit.yml index 862b278feb..f970bf574e 100644 --- a/.github/workflows/bandit.yml +++ b/.github/workflows/bandit.yml @@ -22,6 +22,11 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev + # Scan is run only for the 'tools' folder. - name: Run Bandit run: | diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8ce93b3867..763b932cb2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -44,7 +44,7 @@ jobs: - name: Install apt packages run: | sudo apt-get update - sudo apt-get install -y doxygen ${{matrix.compiler.c}} + sudo apt-get install -y libhwloc-dev doxygen ${{matrix.compiler.c}} - name: Install g++-7 if: matrix.compiler.cxx == 'g++-7' @@ -136,9 +136,6 @@ jobs: # sudo apt install libncurses5 # wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/sycl-nightly%2F20230626/dpcpp-compiler.tar.gz # tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz - - # - name: Setup DPC++ - # run: | # source ${{github.workspace}}/dpcpp_compiler/startup.sh # - name: Configure CMake @@ -184,6 +181,11 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev + - name: Download DPC++ run: | wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz @@ -241,6 +243,11 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev - name: Init conda env uses: conda-incubator/setup-miniconda@9f54435e0e72c53962ee863144e47a4b094bfd35 # v2.3.0 @@ -319,7 +326,12 @@ jobs: Expand-Archive -Path "$WorkingDir\doxygen.zip" Add-Content $env:GITHUB_PATH "$WorkingDir\doxygen" + - name: Install hwloc + run: vcpkg install hwloc:x64-windows + - name: Configure CMake + env: + PKG_CONFIG_PATH: "C:/vcpkg/packages/hwloc_x64-windows/lib/pkgconfig/" run: > cmake -B${{github.workspace}}/build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f1ae35587f..ac42b7f414 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,6 +31,11 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON -DUMF_ENABLE_POOL_TRACKING=ON @@ -61,7 +66,12 @@ jobs: - name: Install pip packages run: python3 -m pip install -r third_party/requirements.txt + - name: Install hwloc + run: vcpkg install hwloc:x64-windows + - name: Configure CMake + env: + PKG_CONFIG_PATH: "C:/vcpkg/packages/hwloc_x64-windows/lib/pkgconfig/" run: cmake -B ${{github.workspace}}/build -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON -DUMF_ENABLE_POOL_TRACKING=ON - name: Build diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a2f7aad796..ae67264f19 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -24,7 +24,7 @@ jobs: - name: Install apt packages run: | sudo apt-get update - sudo apt-get install -y doxygen ${{matrix.compiler.c}} + sudo apt-get install -y libhwloc-dev doxygen ${{matrix.compiler.c}} - name: Install pip packages run: pip install -r third_party/requirements.txt diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index ff6fdf6fde..876d799cfe 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -38,6 +38,11 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev + - name: Configure CMake run: > cmake diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0704038829..b805f30e13 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -35,7 +35,7 @@ jobs: - name: Install apt package run: | sudo apt-get update - sudo apt-get install -y doxygen + sudo apt-get install -y libhwloc-dev doxygen - name: Install prerequisites run: python3 -m pip install -r third_party/requirements.txt diff --git a/.github/workflows/e2e_core.yml b/.github/workflows/e2e_core.yml index e2f374ee1a..6d8740c364 100644 --- a/.github/workflows/e2e_core.yml +++ b/.github/workflows/e2e_core.yml @@ -110,6 +110,10 @@ jobs: working-directory: ${{github.workspace}}/ur-repo run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev - name: Configure CMake UR working-directory: ${{github.workspace}}/ur-repo run: > diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 311fdac40a..c00c79bc26 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -24,6 +24,10 @@ jobs: - name: Install pip packages run: pip install -r third_party/requirements.txt + - name: Install apt packages + run: | + sudo apt-get update + sudo apt-get install -y libhwloc-dev - name: Download DPC++ run: | wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz