Skip to content

Commit f15cda9

Browse files
rbanka1rbanka1
committed
corrections
1 parent ae65dbf commit f15cda9

File tree

10 files changed

+112
-130
lines changed

10 files changed

+112
-130
lines changed

‎.github/docker/ubuntu-20.04.Dockerfile‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,8 @@ ARG BASE_DEPS="\
2424

2525
# Hwloc installation dependencies
2626
ARG HWLOC_DEPS="\
27-
dos2unix \
2827
libtool"
2928

30-
# Copy hwloc
31-
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
32-
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
33-
34-
# UMF's dependencies
35-
ARG UMF_DEPS="\
36-
libtbb-dev"
37-
3829
# Dependencies for tests (optional)
3930
ARG TEST_DEPS="\
4031
libnuma-dev \
@@ -46,10 +37,13 @@ ARG MISC_DEPS="\
4637
automake \
4738
clang \
4839
g++-7 \
40+
lcov \
4941
python3-pip \
5042
sudo \
51-
whois \
52-
lcov"
43+
whois"
44+
45+
# libhwloc-dev is required - installed via script because hwloc version is too old on this OS
46+
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
5347

5448
# Update and install required packages
5549
RUN apt-get update \
@@ -73,5 +67,5 @@ COPY third_party/requirements.txt /opt/umf/requirements.txt
7367
# Add a new (non-root) 'test_user'
7468
ENV USER test_user
7569
ENV USERPASS pass
76-
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
70+
RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
7771
USER test_user

‎.github/docker/ubuntu-22.04.Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,33 @@ ENV NOTTY 1
1717
ENV DEBIAN_FRONTEND noninteractive
1818

1919
# Base development packages
20+
# It seems that libtool is not directly needed
21+
# but it is still required when Building UMF
2022
ARG BASE_DEPS="\
2123
build-essential \
2224
cmake \
2325
git \
24-
libtool"
26+
libtool \
27+
wget"
2528

2629
# UMF's dependencies
2730
ARG UMF_DEPS="\
28-
libtbb-dev \
2931
libhwloc-dev"
3032

3133
# Dependencies for tests (optional)
3234
ARG TEST_DEPS="\
3335
libnuma-dev \
36+
libtbb-dev \
3437
valgrind"
3538

3639
# Miscellaneous for our builds/CI (optional)
3740
ARG MISC_DEPS="\
3841
automake \
3942
clang \
43+
lcov \
4044
python3-pip \
4145
sudo \
42-
whois \
43-
lcov"
46+
whois"
4447

4548
# Update and install required packages
4649
RUN apt-get update \
@@ -62,5 +65,5 @@ RUN pip3 install --no-cache-dir -r /opt/umf/requirements.txt
6265
# Add a new (non-root) 'test_user'
6366
ENV USER test_user
6467
ENV USERPASS pass
65-
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
68+
RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
6669
USER test_user

‎.github/docker/ubuntu-24.04.Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ ARG BASE_DEPS="\
2121
build-essential \
2222
cmake \
2323
git \
24-
gnupg"
24+
wget"
2525

2626
# UMF's dependencies
2727
ARG UMF_DEPS="\
28-
libtbb-dev \
2928
libhwloc-dev"
3029

3130
# Dependencies for tests (optional)
3231
ARG TEST_DEPS="\
3332
libnuma-dev \
33+
libtbb-dev \
3434
valgrind"
3535

3636
# Miscellaneous for our builds/CI (optional)
3737
ARG MISC_DEPS="\
3838
automake \
3939
clang \
40+
lcov \
4041
python3-pip \
4142
sudo \
42-
whois \
43-
lcov"
43+
whois"
4444

4545
# Update and install required packages
4646
RUN apt-get update \
@@ -64,4 +64,3 @@ ENV USER test_user
6464
ENV USERPASS pass
6565
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
6666
USER test_user
67-
#

‎.github/scripts/install_oneAPI.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
# Copyright (C) 2025 Intel Corporation
3+
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
4+
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
5+
6+
# install_oneAPI.sh - Script for installing Intel oneAPI from the official repository
7+
8+
apt-get update
9+
apt-get install -y gpg-agent gnupg
10+
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg
11+
echo 'deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main' > /etc/apt/sources.list.d/oneAPI.list
12+
apt-get update
13+
apt-get install -y intel-oneapi-ippcp-devel intel-oneapi-ipp-devel intel-oneapi-common-oneapi-vars intel-oneapi-compiler-dpcpp-cpp

‎.github/workflows/detect_changes.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ on:
1010

1111
permissions:
1212
contents: read
13-
packages: read
1413

15-
jobs:
14+
jobs:
1615
DetectChanges:
1716
runs-on: ubuntu-latest
1817
outputs:
@@ -25,20 +24,19 @@ jobs:
2524

2625
- name: Get changed files
2726
id: changed-files
28-
uses: tj-actions/changed-files@v45.0.3
27+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v46.0.5
2928

3029
- name: List all changed files
3130
env:
3231
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
3332
run: |
3433
echo "Changed files: $ALL_CHANGED_FILES"
3534
36-
RunReusableDocker:
35+
BuildDocker:
3736
needs: DetectChanges
38-
runs-on: ubuntu-latest
3937
if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
38+
uses: ./.github/workflows/reusable_dockers_build.yml
4039
permissions:
4140
contents: read
4241
packages: write
4342
secrets: inherit
44-
uses: ./.github/workflows/reusable_dockers_build.yml

‎.github/workflows/pr_push.yml‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,62 +19,28 @@ permissions:
1919
jobs:
2020
CodeChecks:
2121
uses: ./.github/workflows/reusable_checks.yml
22-
DocsBuild:
23-
uses: ./.github/workflows/reusable_docs_build.yml
24-
# DetectChanges:
25-
# runs-on: ubuntu-latest
26-
# outputs:
27-
# changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
28-
# steps:
29-
# - name: Checkout code
30-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31-
# with:
32-
# fetch-depth: 0
33-
34-
# - name: Get changed files
35-
# id: changed-files
36-
# uses: tj-actions/[email protected]
37-
38-
# - name: List all changed files
39-
# env:
40-
# ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
41-
# run: |
42-
# echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}"
43-
# BuildDockers:
44-
# if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
45-
# needs: [DetectChanges]
46-
# permissions:
47-
# contents: read
48-
# packages: write
49-
# secrets: inherit
50-
# uses: ./.github/workflows/reusable_dockers_build.yml
5122
FastBuild:
52-
# if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
53-
needs: [CodeChecks, DocsBuild]
23+
name: Fast builds
24+
needs: [CodeChecks]
5425
uses: ./.github/workflows/reusable_fast.yml
5526
Build:
5627
name: Basic builds
57-
# if: always() && (needs.FastBuild.result == 'success')
5828
needs: [FastBuild]
5929
uses: ./.github/workflows/reusable_basic.yml
6030
DevDax:
61-
# if: always() && (needs.FastBuild.result == 'success')
6231
needs: [FastBuild]
6332
uses: ./.github/workflows/reusable_dax.yml
6433
MultiNuma:
65-
# if: always() && (needs.FastBuild.result == 'success')
6634
needs: [FastBuild]
6735
uses: ./.github/workflows/reusable_multi_numa.yml
6836
L0:
69-
# if: always() && (needs.Build.result == 'success')
7037
needs: [Build]
7138
uses: ./.github/workflows/reusable_gpu.yml
7239
with:
7340
provider: "LEVEL_ZERO"
7441
runner: "L0"
7542
shared_lib: "['ON']"
7643
L0-BMG:
77-
# if: always() && (needs.Build.result == 'success')
7844
needs: [Build]
7945
uses: ./.github/workflows/reusable_gpu.yml
8046
with:
@@ -83,29 +49,24 @@ jobs:
8349
shared_lib: "['ON']"
8450
os: "['Ubuntu']"
8551
CUDA:
86-
# if: always() && (needs.Build.result == 'success')
8752
needs: [Build]
8853
uses: ./.github/workflows/reusable_gpu.yml
8954
with:
9055
provider: "CUDA"
9156
runner: "CUDA"
9257
shared_lib: "['ON']"
9358
Sanitizers:
94-
# if: always() && (needs.FastBuild.result == 'success')
9559
needs: [FastBuild]
9660
uses: ./.github/workflows/reusable_sanitizers.yml
9761
QEMU:
98-
# if: always() && (needs.FastBuild.result == 'success')
9962
needs: [FastBuild]
10063
uses: ./.github/workflows/reusable_qemu.yml
10164
with:
10265
short_run: true
10366
ProxyLib:
104-
# if: always() && (needs.Build.result == 'success')
10567
needs: [Build]
10668
uses: ./.github/workflows/reusable_proxy_lib.yml
10769
Valgrind:
108-
# if: always() && (needs.Build.result == 'success')
10970
needs: [Build]
11071
uses: ./.github/workflows/reusable_valgrind.yml
11172
Coverage:
@@ -118,26 +79,22 @@ jobs:
11879
trigger: "${{github.event_name}}"
11980
Coverage_partial:
12081
# partial coverage (on forks)
121-
# if: github.repository != 'oneapi-src/unified-memory-framework' && always() && (needs.Build.result == 'success')
12282
if: github.repository != 'oneapi-src/unified-memory-framework'
12383
needs: [Build, QEMU, ProxyLib]
12484
uses: ./.github/workflows/reusable_coverage.yml
12585
CodeQL:
126-
# if: always() && (needs.Build.result == 'success')
12786
needs: [Build]
12887
permissions:
12988
contents: read
13089
security-events: write
13190
uses: ./.github/workflows/reusable_codeql.yml
13291
Trivy:
133-
# if: always() && (needs.Build.result == 'success')
13492
needs: [Build]
13593
permissions:
13694
contents: read
13795
security-events: write
13896
uses: ./.github/workflows/reusable_trivy.yml
13997
Compatibility:
140-
# if: always() && (needs.Build.result == 'success')
14198
needs: [Build]
14299
uses: ./.github/workflows/reusable_compatibility.yml
143100
strategy:

0 commit comments

Comments
 (0)