Skip to content

Commit eece86b

Browse files
rbanka1rbanka1
committed
correctionsV4
1 parent c26684e commit eece86b

File tree

7 files changed

+34
-52
lines changed

7 files changed

+34
-52
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25+
# UMF's dependencies
26+
# libhwloc-dev is required
27+
2528
# Dependencies for tests (optional)
2629
ARG TEST_DEPS="\
2730
libnuma-dev \
28-
libhwloc-dev \
2931
libtbb-dev\
3032
valgrind"
3133

@@ -54,8 +56,7 @@ RUN apt-get update \
5456
${TEST_DEPS} \
5557
${MISC_DEPS} \
5658
${HWLOC_DEPS} \
57-
&& bash /opt/umf/install_hwloc.sh \
58-
&& ldconfig \
59+
&& /opt/umf/install_hwloc.sh \
5960
&& rm -rf /var/lib/apt/lists/* \
6061
&& apt-get clean all
6162

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,32 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25+
# UMF's dependencies
26+
ARG UMF_DEPS="\
27+
libhwloc-dev"
28+
2529
# Dependencies for tests (optional)
2630
ARG TEST_DEPS="\
2731
libnuma-dev \
28-
libhwloc-dev \
2932
libtbb-dev\
3033
valgrind"
3134

3235
# Miscellaneous for our builds/CI (optional)
3336
ARG MISC_DEPS="\
3437
automake \
3538
clang \
36-
g++ \
3739
python3-pip \
3840
sudo \
3941
whois \
4042
lcov"
4143

42-
# Hwloc installation dependencies
43-
ARG HWLOC_DEPS="\
44-
dos2unix \
45-
libtool"
46-
47-
# Copy hwloc
48-
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
49-
5044
# Update and install required packages
5145
RUN apt-get update \
5246
&& apt-get install -y --no-install-recommends \
5347
${BASE_DEPS} \
5448
${TEST_DEPS} \
5549
${MISC_DEPS} \
56-
${HWLOC_DEPS} \
57-
&& bash /opt/umf/install_hwloc.sh \
58-
&& ldconfig \
50+
${UMF_DEPS} \
5951
&& rm -rf /var/lib/apt/lists/* \
6052
&& apt-get clean all
6153

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,32 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25+
# UMF's dependencies
26+
ARG UMF_DEPS="\
27+
libhwloc-dev"
28+
2529
# Dependencies for tests (optional)
2630
ARG TEST_DEPS="\
2731
libnuma-dev \
28-
libhwloc-dev \
2932
libtbb-dev\
3033
valgrind"
3134

3235
# Miscellaneous for our builds/CI (optional)
3336
ARG MISC_DEPS="\
3437
automake \
3538
clang \
36-
g++ \
3739
python3-pip \
3840
sudo \
3941
whois \
4042
lcov"
4143

42-
# Hwloc installation dependencies
43-
ARG HWLOC_DEPS="\
44-
dos2unix \
45-
libtool"
46-
47-
# Copy hwloc
48-
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
49-
5044
# Update and install required packages
5145
RUN apt-get update \
5246
&& apt-get install -y --no-install-recommends \
5347
${BASE_DEPS} \
5448
${TEST_DEPS} \
5549
${MISC_DEPS} \
56-
${HWLOC_DEPS} \
57-
&& bash /opt/umf/install_hwloc.sh \
58-
&& ldconfig \
50+
${UMF_DEPS} \
5951
&& rm -rf /var/lib/apt/lists/* \
6052
&& apt-get clean all
6153

@@ -70,4 +62,4 @@ RUN pip3 install --no-cache-dir --break-system-packages -r /opt/umf/requirements
7062
ENV USER test_user
7163
ENV USERPASS pass
7264
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
73-
USER test_user
65+
USER test_user

‎.github/workflows/pr_push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: ./.github/workflows/reusable_dockers_build.yml
5151
FastBuild:
5252
if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
53-
needs: [ CodeChecks, DocsBuild, BuildDockers]
53+
needs: [CodeChecks, DocsBuild, BuildDockers]
5454
uses: ./.github/workflows/reusable_fast.yml
5555
Build:
5656
name: Basic builds

‎.github/workflows/reusable_basic.yml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
name: Ubuntu
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ${{ matrix.image }}
21+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2222
options: --user root --privileged
2323
volumes:
2424
- ${{ github.workspace }}:${{ github.workspace }}
2525
strategy:
2626
matrix:
27-
image: ['ghcr.io/rbanka1/umf-ubuntu-20.04:latest', 'ghcr.io/rbanka1/umf-ubuntu-22.04:latest' ]
27+
ubuntu_ver: ['20.04', '22.04']
2828
build_type: [Debug, Release]
2929
compiler: [{c: gcc, cxx: g++}]
3030
shared_library: ['OFF']
@@ -34,7 +34,7 @@ jobs:
3434
disable_hwloc: ['OFF']
3535
link_hwloc_statically: ['OFF']
3636
include:
37-
- image: ghcr.io/rbanka1/umf-ubuntu-20.04:latest
37+
- ubuntu_ver: 20.04
3838
build_type: Release
3939
compiler: {c: gcc-7, cxx: g++-7}
4040
shared_library: 'OFF'
@@ -43,7 +43,7 @@ jobs:
4343
install_tbb: 'ON'
4444
disable_hwloc: 'OFF'
4545
link_hwloc_statically: 'OFF'
46-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
46+
- ubuntu_ver: 22.04
4747
build_type: Release
4848
compiler: {c: clang, cxx: clang++}
4949
shared_library: 'OFF'
@@ -52,7 +52,7 @@ jobs:
5252
install_tbb: 'ON'
5353
disable_hwloc: 'OFF'
5454
link_hwloc_statically: 'OFF'
55-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
55+
- ubuntu_ver: 22.04
5656
build_type: Release
5757
compiler: {c: gcc, cxx: g++}
5858
shared_library: 'ON'
@@ -61,7 +61,7 @@ jobs:
6161
install_tbb: 'ON'
6262
disable_hwloc: 'OFF'
6363
link_hwloc_statically: 'OFF'
64-
- image: ghcr.io/rbanka1/umf-ubuntu-24.04:latest
64+
- ubuntu_ver: 24.04
6565
build_type: Debug
6666
compiler: {c: gcc, cxx: g++}
6767
shared_library: 'ON'
@@ -71,7 +71,7 @@ jobs:
7171
disable_hwloc: 'OFF'
7272
link_hwloc_statically: 'OFF'
7373
# test level_zero_provider='OFF' and cuda_provider='OFF'
74-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
74+
- ubuntu_ver: 22.04
7575
build_type: Release
7676
compiler: {c: gcc, cxx: g++}
7777
shared_library: 'OFF'
@@ -81,7 +81,7 @@ jobs:
8181
disable_hwloc: 'OFF'
8282
link_hwloc_statically: 'OFF'
8383
# test icx compiler
84-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
84+
- ubuntu_ver: 22.04
8585
build_type: Release
8686
compiler: {c: icx, cxx: icpx}
8787
shared_library: 'ON'
@@ -91,7 +91,7 @@ jobs:
9191
disable_hwloc: 'OFF'
9292
link_hwloc_statically: 'OFF'
9393
# test without installing TBB
94-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
94+
- ubuntu_ver: 22.04
9595
build_type: Release
9696
compiler: {c: gcc, cxx: g++}
9797
shared_library: 'ON'
@@ -100,7 +100,7 @@ jobs:
100100
install_tbb: 'OFF'
101101
disable_hwloc: 'OFF'
102102
link_hwloc_statically: 'OFF'
103-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
103+
- ubuntu_ver: 22.04
104104
build_type: Debug
105105
compiler: {c: gcc, cxx: g++}
106106
shared_library: 'ON'
@@ -109,7 +109,7 @@ jobs:
109109
install_tbb: 'ON'
110110
disable_hwloc: 'ON'
111111
link_hwloc_statically: 'OFF'
112-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
112+
- ubuntu_ver: 22.04
113113
build_type: Release
114114
compiler: {c: gcc, cxx: g++}
115115
shared_library: 'ON'
@@ -168,14 +168,11 @@ jobs:
168168
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
169169
LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure
170170
171-
- name: Set os name
172-
run: echo "ARTIFACT_NAME=${{ matrix.image }}" | sed -e 's|ghcr.io/rbanka1/||' -e 's|:|-|' >> $GITHUB_ENV
173-
174171
- name: Check os coverage
175172
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
176173
working-directory: ${{env.BUILD_DIR}}
177174
run: |
178-
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{env.ARTIFACT_NAME}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
175+
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
179176
echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
180177
../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
181178
mkdir -p ${{env.COVERAGE_DIR}}
@@ -184,7 +181,7 @@ jobs:
184181
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
185182
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
186183
with:
187-
name: ${{env.COVERAGE_NAME}}-${{env.ARTIFACT_NAME}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
184+
name: ${{env.COVERAGE_NAME}}-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
188185
path: ${{env.COVERAGE_DIR}}
189186

190187
- name: Remove the installation directory
@@ -496,4 +493,4 @@ jobs:
496493
--build-type ${{env.BUILD_TYPE}}
497494
--proxy
498495
--umf-version ${{env.UMF_VERSION}}
499-
--shared-library
496+
--shared-library

‎.github/workflows/reusable_dockers_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
- name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
3737
run: |
3838
docker build -f .github/docker/ubuntu-${{ matrix.ubuntu-version }}.Dockerfile -t ${{ env.IMG }} .
39-
docker push ${{ env.IMG }}
39+
docker push ${{ env.IMG }}

‎.github/workflows/reusable_fast.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
run: >
6969
cmake
7070
-B ${{env.BUILD_DIR}}
71+
-DCMAKE_BUILD_TYPE=Release
7172
-DUMF_BUILD_SHARED_LIBRARY=ON
7273
-DUMF_TESTS_FAIL_ON_SKIP=ON
7374
${{matrix.extra_build_options}}
@@ -145,7 +146,7 @@ jobs:
145146
-DUMF_TESTS_FAIL_ON_SKIP=ON
146147
147148
- name: Build
148-
run: cmake --build ${{env.BUILD_DIR}} --config Release -j
149+
run: cmake --build ${{env.BUILD_DIR}} --config Release -j $Env:NUMBER_OF_PROCESSORS
149150

150151
- name: Run examples
151152
working-directory: ${{env.BUILD_DIR}}
@@ -158,8 +159,7 @@ jobs:
158159

159160
# TODO: We could add some script to verify metadata of dll's (selected fields, perhaps)
160161
# ref. https://superuser.com/questions/381276/what-are-some-nice-command-line-ways-to-inspect-dll-exe-details
161-
162162
- name: Print metadata of our dll's
163163
run: |
164164
get-command ${{github.workspace}}/build/bin/Release/umf.dll | format-list
165-
get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list
165+
get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list

0 commit comments

Comments
 (0)