Skip to content

Commit ab7ce78

Browse files
igchorigchor
committed
[CI] Install hwloc on CI (UMF dependency)
1 parent 91c1d2b commit ab7ce78

File tree

9 files changed

+57
-4
lines changed

9 files changed

+57
-4
lines changed

‎.github/docker/ubuntu-22.04.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ ARG BASE_DEPS="\
3232
ARG UR_DEPS="\
3333
doxygen \
3434
python3 \
35-
python3-pip"
35+
python3-pip \
36+
libhwloc-dev"
3637

3738
# Unified Runtime's dependencies (installed via pip)
3839
ARG UR_PYTHON_DEPS="\

‎.github/workflows/bandit.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ jobs:
2222
- name: Install pip packages
2323
run: pip install -r third_party/requirements.txt
2424

25+
- name: Install apt packages
26+
run: |
27+
sudo apt-get update
28+
sudo apt-get install -y libhwloc-dev
29+
2530
# Scan is run only for the 'tools' folder.
2631
- name: Run Bandit
2732
run: |

‎.github/workflows/cmake.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Install apt packages
4545
run: |
4646
sudo apt-get update
47-
sudo apt-get install -y doxygen ${{matrix.compiler.c}}
47+
sudo apt-get install -y libhwloc-dev doxygen ${{matrix.compiler.c}}
4848
4949
- name: Install g++-7
5050
if: matrix.compiler.cxx == 'g++-7'
@@ -130,6 +130,11 @@ jobs:
130130
- name: Install pip packages
131131
run: pip install -r third_party/requirements.txt
132132

133+
- name: Install apt packages
134+
run: |
135+
sudo apt-get update
136+
sudo apt-get install -y libhwloc-dev
137+
133138
- name: Download DPC++
134139
run: |
135140
sudo apt install libncurses5
@@ -183,6 +188,11 @@ jobs:
183188
- name: Install pip packages
184189
run: pip install -r third_party/requirements.txt
185190

191+
- name: Install apt packages
192+
run: |
193+
sudo apt-get update
194+
sudo apt-get install -y libhwloc-dev
195+
186196
- name: Download DPC++
187197
run: |
188198
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz
@@ -240,6 +250,11 @@ jobs:
240250

241251
- name: Install pip packages
242252
run: pip install -r third_party/requirements.txt
253+
254+
- name: Install apt packages
255+
run: |
256+
sudo apt-get update
257+
sudo apt-get install -y libhwloc-dev
243258
244259
- name: Init conda env
245260
uses: conda-incubator/setup-miniconda@9f54435e0e72c53962ee863144e47a4b094bfd35 # v2.3.0
@@ -318,6 +333,13 @@ jobs:
318333
Expand-Archive -Path "$WorkingDir\doxygen.zip"
319334
Add-Content $env:GITHUB_PATH "$WorkingDir\doxygen"
320335
336+
- name: Install hwloc
337+
run: |
338+
$WorkingDir = $PWD.Path
339+
Invoke-WebRequest -Uri https://download.open-mpi.org/release/hwloc/v2.9/hwloc-win64-build-2.9.3.zip -OutFile "$WorkingDir\hwloc.zip"
340+
Expand-Archive -Path "$WorkingDir\hwloc.zip"
341+
Add-Content $env:GITHUB_PATH "$WorkingDir\hwloc"
342+
321343
- name: Configure CMake
322344
run: >
323345
cmake

‎.github/workflows/codeql.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
- name: Install pip packages
3232
run: pip install -r third_party/requirements.txt
3333

34+
- name: Install apt packages
35+
run: |
36+
sudo apt-get update
37+
sudo apt-get install -y libhwloc-dev
38+
3439
- name: Configure CMake
3540
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
3641

@@ -61,6 +66,13 @@ jobs:
6166
- name: Install pip packages
6267
run: python3 -m pip install -r third_party/requirements.txt
6368

69+
- name: Install hwloc
70+
run: |
71+
$WorkingDir = $PWD.Path
72+
Invoke-WebRequest -Uri https://download.open-mpi.org/release/hwloc/v2.9/hwloc-win64-build-2.9.3.zip -OutFile "$WorkingDir\hwloc.zip"
73+
Expand-Archive -Path "$WorkingDir\hwloc.zip"
74+
Add-Content $env:GITHUB_PATH "$WorkingDir\hwloc"
75+
6476
- name: Configure CMake
6577
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
6678

‎.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install apt packages
2525
run: |
2626
sudo apt-get update
27-
sudo apt-get install -y doxygen ${{matrix.compiler.c}}
27+
sudo apt-get install -y libhwloc-dev doxygen ${{matrix.compiler.c}}
2828
2929
- name: Install pip packages
3030
run: pip install -r third_party/requirements.txt

‎.github/workflows/coverity.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
- name: Install pip packages
3939
run: pip install -r third_party/requirements.txt
4040

41+
- name: Install apt packages
42+
run: |
43+
sudo apt-get update
44+
sudo apt-get install -y libhwloc-dev
45+
4146
- name: Configure CMake
4247
run: >
4348
cmake

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install apt package
3636
run: |
3737
sudo apt-get update
38-
sudo apt-get install -y doxygen
38+
sudo apt-get install -y libhwloc-dev doxygen
3939
4040
- name: Install prerequisites
4141
run: python3 -m pip install -r third_party/requirements.txt

‎.github/workflows/e2e_core.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ jobs:
110110
working-directory: ${{github.workspace}}/ur-repo
111111
run: pip install -r third_party/requirements.txt
112112

113+
- name: Install apt packages
114+
run: |
115+
sudo apt-get update
116+
sudo apt-get install -y libhwloc-dev
113117
- name: Configure CMake UR
114118
working-directory: ${{github.workspace}}/ur-repo
115119
run: >

‎.github/workflows/nightly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
- name: Install pip packages
2525
run: pip install -r third_party/requirements.txt
2626

27+
- name: Install apt packages
28+
run: |
29+
sudo apt-get update
30+
sudo apt-get install -y libhwloc-dev
2731
- name: Download DPC++
2832
run: |
2933
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz

0 commit comments

Comments
 (0)