Minor changes to ubuntu build

Minor changes to ubuntu build

Signed-off-by: Milosz Linkiewicz <[email protected]>

Author: Mionsz

.github/workflows/build-baremetal-ubuntu.yml

@@ -87,13 +87,16 @@ jobs:
       working-directory: "${BUILD_DIR}/ffmpeg"
       run: |
         ./configure \
+          --disable-debug \
+          --disable-doc \
           --enable-libipp \
-          --extra-cflags=-fopenmp \
-          --extra-ldflags=-fopenmp \
+          --enable-static \
           --enable-gpl \
           --enable-libx264 \
           --enable-libx265 \
           --extra-libs='-lraisr -lstdc++ -lippcore -lippvm -lipps -lippi -lm -lintlc -lsvml' \
+          --extra-cflags='-fopenmp -I/opt/intel/oneapi/ipp/latest/include/ipp/' \
+          --extra-ldflags='-fopenmp -L/opt/intel/oneapi/ipp/latest/lib' \
           --enable-cross-compile \
           --prefix="${PREFIX}"  && \
         make clean && \

.github/workflows/codeql.yml

@@ -9,9 +9,16 @@ on:
     - cron: '15 0 * * *'
 
 env:
+  TZ: "Europe/Warsaw"
   BUILD_TYPE: "Release"
-  PREFIX_DIR: /usr/local
   DEBIAN_FRONTEND: "noninteractive"
+  FFMPEG_COMMIT_ID: "n6.1.1"
+  BUILD_DIR: "${{ github.workspace }}/build"
+  PREFIX: "${{ github.workspace }}/_install"
+
+defaults:
+  run:
+    shell: bash
 
 permissions:
   contents: read
@@ -32,9 +39,6 @@ jobs:
     permissions:
       actions: read
       security-events: write
-    defaults:
-      run:
-        shell: bash
     steps:
     - name: 'Harden Runner'
       uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -44,30 +48,52 @@ jobs:
     - name: 'Checkout repository'
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-    - name: 'Get RAISR prerequisites and set-up git'
+    - name: 'Install OS level dependencies'
+      run: |
+        set -exo pipefail && \
+        mkdir -p "${PREFIX}" "${BUILD_DIR}/ffmpeg" && \
+        sudo apt-get update --fix-missing && \
+        sudo apt-get full-upgrade -y && \
+        sudo apt-get install --no-install-recommends -y \
+          build-essential \
+          ca-certificates \
+          cmake \
+          diffutils \
+          gpg \
+          libx264-dev \
+          libx265-dev \
+          llvm \
+          m4 \
+          meson \
+          nasm \
+          ocl-icd-opencl-dev \
+          opencl-headers \
+          zlib1g-dev \
+          make curl git sudo tar unzip wget yasm && \
+
+    - name: 'Install Intel OneAPI APT repository'
       run: |
-        sudo apt update -y
-        sudo apt install -y sudo git wget curl pkg-config bash tar zip unzip make
-        mkdir -p "${{ github.workspace }}/build"
-        git config --global user.email "[email protected]"
-        git config --global user.name "Your Name"
+        set -exo pipefail && \
+        curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg && \
+        echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/intel-oneAPI.list && \
+        sudo apt-get update --fix-missing && \
+        sudo apt-get install --no-install-recommends -y intel-oneapi-ipp-devel-2022.0
 
-    - name: 'Build RAISR prerequisites and install'
-      working-directory: "${{ github.workspace }}/build"
+    - name: 'Download and patch ffmpeg repository'
       run: |
-        "${{ github.workspace }}/scripts/01_pull_resources.sh"
-        "${{ github.workspace }}/scripts/02_install_prerequisites.sh" "${{ github.workspace }}/build/raisr.tar.gz"
+        set -eo pipefail && \
+        curl -Lf https://github.com/ffmpeg/ffmpeg/archive/${FFMPEG_COMMIT_ID}.tar.gz | tar -zx --strip-components=1 -C "${BUILD_DIR}/ffmpeg"
+        patch -d "${BUILD_DIR}/ffmpeg" -p1 -i <(cat "${{ github.workspace }}/ffmpeg/"*.patch)
+        cp "${{ github.workspace }}/ffmpeg/vf_raisr"*.c "${BUILD_DIR}/ffmpeg/libavfilter"
 
     - name: 'Initialize CodeQL action'
       uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
       with:
         languages: "c-cpp"
         config-file: "${{ github.workspace }}/.github/codeql/codeql-config.yml"
 
-    - name: 'Build RAISR source library'
-      working-directory: "${{ github.workspace }}/build"
-      run: |
-        "${{ github.workspace }}/scripts/03_build_raisr_ffmpeg.sh" "${{ github.workspace }}/build/raisr/Video-Super-Resolution-Library"
+    - name: 'Build RAISR from source code'
+      run: '${{ github.workspace }}/build.sh -DENABLE_RAISR_OPENCL=ON'
 
     - name: 'Perform CodeQL Analysis'
       uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11

build.sh

@@ -7,17 +7,20 @@
 set -ex -o pipefail
 
 SCRIPT_DIR="$(readlink -f "$(dirname -- "${BASH_SOURCE[0]}")")"
+REPOSITORY_DIR="$(readlink -f "${SCRIPT_DIR}")"
+
 . "${SCRIPT_DIR}/scripts/common.sh"
 nproc="${nproc:-$(nproc)}"
 
+# Env variable BUILD_TYPE can be one off: RelWithDebInfo, Release, Debug
+BUILD_TYPE="${BUILD_TYPE:-Release}"
+
 # Helpful when copying and pasting functions and debuging.
 if printf '%s' "$0" | grep -q '\.sh'; then
     IN_SCRIPT=true
 fi
 
-
-
-cd_safe() {
+function cd_safe() {
     if (cd "$1"); then
         cd "$1"
     else
@@ -28,60 +31,68 @@ cd_safe() {
 }
 
 # Usage: build [test]
-build() (
-    build_type=Release
-    log_info "Create folder: build, build type: $build_type"
-    mkdir -p build > /dev/null 2>&1
-    cd_safe build
-
-    for file in *; do
-        rm -rf "$file"
-    done
+function build()
+(
+    log_info "Create folder: build, build type: ${BUILD_TYPE}"
+
+    if [[ -d "${REPOSITORY_DIR:?}/build" ]]; then
+      rm -rf "${REPOSITORY_DIR:?}/build/"*
+    fi
+
+    mkdir -p "${REPOSITORY_DIR}/build" > /dev/null 2>&1
 
-    cmake .. -DCMAKE_BUILD_TYPE="$build_type" $CMAKE_EXTRA_FLAGS "$@"
+    cmake -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" "${CMAKE_EXTRA_FLAGS}" -B "${REPOSITORY_DIR}/build" -S "${REPOSITORY_DIR}" "$@"
     #cmake .. -DCMAKE_BUILD_TYPE="RelWithDebInfo" $CMAKE_EXTRA_FLAGS "$@"
 
-    if [ -f Makefile ]; then
-        make -j "${nproc}"
-        make install -j "${nproc}"
+    if [ -f "${REPOSITORY_DIR}/build/Makefile" ]; then
+      make -j"${nproc}" -C "${REPOSITORY_DIR}/build"
+      as_root make install -j"${nproc}" -C "${REPOSITORY_DIR}/build"
     fi
-
-    cd ..
 )
 
+function check_executable()
+{
+    print_exec=(printf '\0')
+    if [[ "$#" -ge "2" ]]; then
+      if [[ "${1}" == "-p" ]]; then
+        print_exec=(printf '%s\n')
+      fi
+      shift
+    fi
 
-check_executable() (
-    print_exec=false
-    while true; do
-        case "$1" in
-        -p) print_exec=true && shift ;;
-        *) break ;;
-        esac
-    done
-    [ -n "$1" ] && command_to_check="$1" || return 1
-    shift
-    if [ -e "$command_to_check" ]; then
-        $print_exec && printf '%s\n' "$command_to_check"
-        return 0
+    if [[ "$#" -ge "1" ]]; then
+      command_to_check="${1}" && shift
+    else
+      log_error "Wrong number of parameters passed to check_executable()."
+      return 1
+    fi
+
+    if [ -e "${command_to_check}" ]; then
+      "${print_exec[@]}" "${command_to_check}"
+      return 0
     fi
-    for d in "$@" $(printf '%s ' "$PATH" | tr ':' ' '); do
-        if [ -e "$d/$command_to_check" ]; then
-            $print_exec && printf '%s\n' "$d/$command_to_check"
-            return 0
-        fi
+
+    for pt in "$@" $(echo "${PATH}" | tr ':' ' '); do
+      if [ -e "${pt}/${command_to_check}" ]; then
+        "${print_exec[@]}" "${pt}/${command_to_check}"
+        return 0
+      fi
     done
+
     return 127
-)
+}
+
 if check_executable icpx; then
     CXX=$(check_executable -p icpx)
 elif check_executable clang++; then
     CXX=$(check_executable -p clang++)
 elif check_executable g++; then
     CXX=$(check_executable -p g++)
 else
-    die "No suitable cpp compiler found in path" \
-        "Please either install one or set it via cxx=*"
+    log_error "No suitable cpp compiler found in path."
+    log_error "Please either install one or set it via cxx=*"
+    die "[Exiting due to error.]"
 fi
-export CXX
 
+export CXX
 build "$@"

docker/Flex/Dockerfile.ubuntu22.04

@@ -5,7 +5,8 @@
 
 # se Ubuntu 22.04 with Intel IPP
 ARG IMAGE_CACHE_REGISTRY=docker.io
-ARG IMAGE_NAME=intel/oneapi-basekit:2023.2.1-devel-ubuntu22.04
+ARG IMAGE_NAME=library/ubuntu:22.04@sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658
+# ARG IMAGE_NAME=intel/oneapi-basekit:2023.2.1-devel-ubuntu22.04
 FROM ${IMAGE_CACHE_REGISTRY}/${IMAGE_NAME} AS build
 
 ARG SVT_AV1_VER=v2.1.2
@@ -37,22 +38,34 @@ ENV TZ="Europe/Warsaw"
 # Update apt and install dependances
 SHELL ["/bin/bash", "-ex", "-o", "pipefail", "-c"]
 WORKDIR ${PREFIX}
-RUN rm /etc/apt/sources.list.d/oneAPI.list && \
+RUN rm -f /etc/apt/sources.list.d/oneAPI.list && \
     apt-get update --fix-missing && \
     apt-get full-upgrade -y && \
     apt-get install --no-install-recommends -y \
+      autoconf \
+      automake \
+      build-essential \
       ca-certificates \
-      automake libdrm-dev libtool libx11-dev libxext-dev libxfixes-dev libwayland-dev \
+      clang \
       cmake \
-      curl \
-      libx265-dev \
-      libx264-dev \
-      zlib1g-dev \
-      nasm \
-      opencl-headers \
+      diffutils \
+      g++ \
+      gcc gcc-multilib gpg \
+      libdrm-dev libtool libx11-dev libxext-dev libxfixes-dev \
+      libwayland-dev libpciaccess-dev libx264-dev libx265-dev \
+      llvm m4 meson nasm \
       ocl-icd-opencl-dev \
-      libpciaccess-dev \
-      yasm && \
+      opencl-headers \
+      pkg-config \
+      python3-pyelftools \
+      systemtap-sdt-dev \
+      ubuntu-drivers-common \
+      zlib1g-dev \
+      make curl git sudo tar unzip wget yasm && \
+    curl -fsSL "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" | gpg --dearmor > "/usr/share/keyrings/oneapi-archive-keyring.gpg" && \
+    echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" > "/etc/apt/sources.list.d/intel-oneAPI.list" && \
+    apt-get update --fix-missing && \
+    apt-get install --no-install-recommends -y intel-oneapi-ipp-devel-2022.0 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -117,19 +130,23 @@ RUN curl -Lf "${FFMPEG_REPO}" | \
 
 # Configure and build ffmpeg
 WORKDIR ${DL_PREFIX}/ffmpeg
+# RUN ./configure --disable-shared \
 RUN ./configure \
+      --disable-debug \
+      --disable-doc \
+      --enable-static \
       --enable-libipp \
-      --extra-cflags=-fopenmp \
-      --extra-ldflags=-fopenmp \
       --enable-gpl \
       --enable-libx264 \
       --enable-libx265 \
-      --extra-libs='-lraisr -lstdc++ -lippcore -lippvm -lipps -lippi -lm -lintlc -lsvml' \
-      --enable-cross-compile  \
       --enable-opencl \
       --enable-vaapi \
       --enable-libsvtav1 \
       --enable-libvpx \
+      --extra-libs='-lraisr -lstdc++ -lippcore -lippvm -lipps -lippi -lm -lintlc -lsvml' \
+      --extra-cflags='-fopenmp -I/opt/intel/oneapi/ipp/latest/include/ipp/' \
+      --extra-ldflags='-fopenmp -L/opt/intel/oneapi/ipp/latest/lib' \
+      --enable-cross-compile  \
       --prefix="${PREFIX}"  && \
     make clean && \
     make -j"$(nproc)" && \
@@ -191,7 +208,7 @@ RUN apt-get update --fix-missing && \
     apt-get install --no-install-recommends -y \
       intel-opencl-icd \
       intel-level-zero-gpu \
-      intel-oneapi-ipp && \
+      intel-oneapi-ipp-2022.0 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     ln -s /usr/bin/ffmpeg /opt/raisrfolder/ffmpeg && \
@@ -200,7 +217,6 @@ RUN apt-get update --fix-missing && \
     curl -Lf http://nginx.org/download/nginx-1.24.0.tar.gz | tar xz --strip-components=1 -C "/opt/nginx" && \
     ldconfig
 
-
 # Install ngnix and run ffmpeg to verify that the raisr filter is supported
 WORKDIR /opt/nginx
 RUN ./configure --with-http_ssl_module --add-module=../nginx-rtmp-module && \