Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docker: fix vpl gpu runtime component build after rename #171

Merged
merged 3 commits into from
Apr 17, 2024
Merged

docker: fix vpl gpu runtime component build after rename #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ce1e2
docker: fix vpl gpu runtime component build after rename
dvrogozh Apr 17, 2024
af63470
ci: update actions/checkout from v3 to v4
dvrogozh Apr 17, 2024
8808dad
ci: optimize workflow execution on resubmission
dvrogozh Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ on:

permissions: read-all

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
verify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Verify dockefiles are up-to-date
run: |
cmake .
Expand All @@ -22,7 +26,7 @@ jobs:
rst-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends \
Expand All @@ -36,42 +40,42 @@ jobs:
cdn-intel-pkgs-u22-04:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building CDN demo w/ Intel pkgs
run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu22.04/intel-gfx/Dockerfile -t intel-media-delivery-cdn .

cdn-native-pkgs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building CDN demo w/ Ubuntu native pkgs
run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/native/Dockerfile -t intel-media-delivery-cdn .

cdn-selfbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building CDN against selfbuild stack
run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/selfbuild/Dockerfile -t intel-media-delivery-cdn .

cdn-selfbuild-prodkmd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building CDN against selfbuild stack
run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile -t intel-media-delivery-cdn .

dkms-u2004:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building DKMS pkgs
run: docker build --no-cache --force-rm -f docker/ubuntu20.04/dkms/Dockerfile -t dkms .

dkms-u2204:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building DKMS pkgs
run: docker build --no-cache --force-rm -f docker/ubuntu22.04/dkms/Dockerfile -t dkms .

4 changes: 2 additions & 2 deletions docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ RUN apt-get update && \
cmake \
make && \
rm -rf /var/lib/apt/lists/*
ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-22.6.1.tar.gz
ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-22.6.1.tar.gz
RUN cd /opt/build && \
wget -O - ${ONEVPLGPU_REPO} | tar xz
# build oneVPL gpu
RUN cd /opt/build/oneVPL-intel-gpu-intel-onevpl-22.6.1 && \
RUN cd /opt/build/vpl-gpu-rt-intel-onevpl-22.6.1 && \
mkdir -p _build && cd _build && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
4 changes: 2 additions & 2 deletions docker/ubuntu20.04/selfbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ RUN apt-get update && \
cmake \
make && \
rm -rf /var/lib/apt/lists/*
ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-22.6.1.tar.gz
ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-22.6.1.tar.gz
RUN cd /opt/build && \
wget -O - ${ONEVPLGPU_REPO} | tar xz
# build oneVPL gpu
RUN cd /opt/build/oneVPL-intel-gpu-intel-onevpl-22.6.1 && \
RUN cd /opt/build/vpl-gpu-rt-intel-onevpl-22.6.1 && \
mkdir -p _build && cd _build && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
6 changes: 3 additions & 3 deletions templates/m4docker/components/onevpl-gpu.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ define(`ONEVPLGPU_BUILD_DEPS',`ca-certificates gcc g++ wget pkg-config cmake mak
')

define(`BUILD_ONEVPLGPU',
ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-ONEVPL_GPU_VER.tar.gz
ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-ONEVPL_GPU_VER.tar.gz
RUN cd BUILD_HOME && \
wget -O - ${ONEVPLGPU_REPO} | tar xz
ifdef(`ONEVPLGPU_PATCH_PATH',`PATCH(BUILD_HOME/oneVPL-intel-gpu-intel-onevpl-ONEVPL_GPU_VER,ONEVPLGPU_PATCH_PATH)')dnl
ifdef(`ONEVPLGPU_PATCH_PATH',`PATCH(BUILD_HOME/vpl-gpu-rt-intel-onevpl-ONEVPL_GPU_VER,ONEVPLGPU_PATCH_PATH)')dnl
# build oneVPL gpu
RUN cd BUILD_HOME/oneVPL-intel-gpu-intel-onevpl-ONEVPL_GPU_VER && \
RUN cd BUILD_HOME/vpl-gpu-rt-intel-onevpl-ONEVPL_GPU_VER && \
mkdir -p _build && cd _build && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down