install oneAPI basekit insead using the containers

bratpiorka · bratpiorka · commit ce6b89d83c76 · 2024-05-21T23:26:24.000+02:00
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -11,78 +11,6 @@ env:
   UMF_VERSION: 0.1.0
 
 jobs:
-  icx-build:
-    # TODO: we could merge ICX build with gcc/clang (using our dockers) Issue: #259
-    name: Intel C++ Compiler
-    strategy:
-      matrix:
-        build_type: [Debug, Release]
-        compiler: [{c: icx, cxx: icpx}]
-        shared_library: ['OFF']
-    env:
-      BUILD_DIR : "${{github.workspace}}/build/"
-      INSTL_DIR : "${{github.workspace}}/../install-dir"
-
-    runs-on: ubuntu-22.04
-    container:
-      image: intel/oneapi:latest
-      volumes:
-        - ${{github.workspace}}:${{github.workspace}}
-      options: "--privileged"
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Install apt packages
-      run: |
-        apt-get update
-        apt-get install -y libnuma-dev libjemalloc-dev libtbb-dev libhwloc-dev python3-pip sudo
-
-    - name: Install Python requirements
-      run: python3 -m pip install -r third_party/requirements.txt
-
-    - name: Set ptrace value for IPC test
-      run: bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
-
-    - name: Configure build
-      run: >
-        cmake
-        -B build
-        -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
-        -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
-        -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
-        -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
-        -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
-        -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
-        -DUMF_FORMAT_CODE_STYLE=OFF
-        -DUMF_DEVELOPER_MODE=ON
-        -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
-        -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
-        -DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
-        -DUMF_BUILD_EXAMPLES=ON
-        -DUMF_TESTS_FAIL_ON_SKIP=ON
-
-    - name: Build UMF
-      run: cmake --build build -j $(nproc)
-
-    - name: Run tests
-      working-directory: ${{github.workspace}}/build
-      run: ctest --output-on-failure --test-dir test
-
-    - name: Test UMF installation and uninstallation
-      # The '--shared-library' parameter is added to the installation test when the UMF is built as a shared library
-      run: >
-        python3 ${{github.workspace}}/test/test_installation.py
-        --build-dir ${{env.BUILD_DIR}}
-        --install-dir ${{env.INSTL_DIR}}
-        --build-type ${{matrix.build_type}}
-        --disjoint-pool
-        --jemalloc-pool
-        --scalable-pool
-        --umf-version ${{env.UMF_VERSION}}
-        ${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
-
   ubuntu-build:
     name: Ubuntu
     strategy:
@@ -119,6 +47,12 @@ jobs:
             compiler: {c: gcc, cxx: g++}
             shared_library: 'OFF'
             level_zero_provider: 'OFF'
+          # test icx compiler
+          - os: 'ubuntu-22.04'
+            build_type: Release
+            compiler: {c: icx, cxx: icpx}
+            shared_library: 'OFF'
+            level_zero_provider: 'ON'
     env:
       BUILD_DIR : "${{github.workspace}}/build/"
       INSTL_DIR : "${{github.workspace}}/../install-dir"
@@ -128,6 +62,16 @@ jobs:
     - name: Checkout
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
+    - name: Install oneAPI basekit
+      if: matrix.compiler.cxx == 'icpx'
+      run: |
+        sudo apt update
+        sudo apt install -y gpg-agent wget
+        wget -O- 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 > /dev/null
+        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/oneAPI.list
+        sudo apt update
+        sudo apt install intel-basekit
+
     - name: Install apt packages
       run: |
         sudo apt-get update
@@ -145,6 +89,7 @@ jobs:
 
     - name: Configure build
       run: >
+        ${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh && ' || ''}} 
         cmake
         -B ${{env.BUILD_DIR}}
         -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
diff --git a/.github/workflows/pr_push.yml b/.github/workflows/pr_push.yml
@@ -11,166 +11,6 @@ permissions:
   contents: read
 
 jobs:
-  FastBuild:
-    name: Fast build
-    env:
-      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            disjoint: 'OFF'
-            build_tests: 'ON'
-          # pure C build (Windows)
-          - os: windows-latest
-            disjoint: 'OFF'
-            # Tests' building is off for a pure C build
-            build_tests: 'OFF'
-          - os: ubuntu-latest
-            disjoint: 'ON'
-            build_tests: 'ON'
-            # Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
-          # pure C build (Linux)
-          - os: ubuntu-latest
-            disjoint: 'OFF'
-            # Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
-            # Tests' building is off for a pure C build
-            build_tests: 'OFF'
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON'
-    runs-on: ${{matrix.os}}
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Initialize vcpkg
-      if: matrix.os == 'windows-latest'
-      uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
-      with:
-        vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
-        vcpkgDirectory: ${{github.workspace}}/build/vcpkg
-        vcpkgJsonGlob: '**/vcpkg.json'
-
-    - name: Install dependencies
-      if: matrix.os == 'windows-latest'
-      run: vcpkg install
-      shell: pwsh # Specifies PowerShell as the shell for running the script.
-
-    - name: Install apt packages
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y cmake libjemalloc-dev libhwloc-dev libnuma-dev libtbb-dev
-
-    - name: Set ptrace value for IPC test (on Linux only)
-      if: matrix.os == 'ubuntu-latest'
-      run: sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
-
-    - name: Configure CMake
-      run: >
-        cmake
-        -B ${{github.workspace}}/build
-        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
-        -DUMF_FORMAT_CODE_STYLE=OFF
-        -DUMF_DEVELOPER_MODE=ON
-        -DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
-        -DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
-        -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
-        -DUMF_BUILD_TESTS=${{matrix.build_tests}}
-        -DUMF_BUILD_EXAMPLES=ON
-        -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
-        -DUMF_TESTS_FAIL_ON_SKIP=ON
-        ${{matrix.extra_build_options}}
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config Release -j
-
-    - name: Run examples
-      working-directory: ${{github.workspace}}/build
-      run: ctest --output-on-failure --test-dir examples -C Release
-
-    - name: Run tests
-      if: matrix.build_tests == 'ON'
-      working-directory: ${{github.workspace}}/build
-      run: ctest --output-on-failure --test-dir test -C Release
-
-  CodeStyle:
-    name: Coding style
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Install apt packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y black cmake clang-format-15 cmake-format libhwloc-dev
-
-    - name: Configure CMake
-      run: >
-        cmake
-        -B ${{github.workspace}}/build
-        -DUMF_FORMAT_CODE_STYLE=ON
-        -DUMF_BUILD_TESTS=OFF
-        -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
-        -DUMF_BUILD_LIBUMF_POOL_SCALABLE=OFF
-        -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
-
-    - name: Check C/C++ formatting
-      run: cmake --build build --target clang-format-check
-
-    - name: Check CMake formatting
-      run: cmake --build build --target cmake-format-check
-
-    - name: Check Python formatting
-      run: cmake --build build --target black-format-check
-
-  DocsBuild:
-    name: Build docs
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Install doxygen
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y doxygen
-
-    - name: Install pip requirements
-      run: python3 -m pip install -r third_party/requirements.txt
-
-    - name: Build the documentation
-      working-directory: scripts
-      run: python3 generate_docs.py
-
-  Spellcheck:
-    uses: ./.github/workflows/spellcheck.yml
   Build:
     name: Basic builds
-    needs: [Spellcheck, FastBuild, CodeStyle]
-    uses: ./.github/workflows/basic.yml
-  Sanitizers:
-    needs: [Spellcheck, FastBuild, CodeStyle]
-    uses: ./.github/workflows/sanitizers.yml
-  Benchmarks:
-    needs: [Build]
-    uses: ./.github/workflows/benchmarks.yml
-  ProxyLib:
-    needs: [Build]
-    uses: ./.github/workflows/proxy_lib.yml
-  GPU:
-    needs: [Build]
-    uses: ./.github/workflows/gpu.yml
-  Qemu:
-    needs: [Build]
-    uses: ./.github/workflows/qemu.yml
-  Valgrind:
-    needs: [Build]
-    uses: ./.github/workflows/valgrind.yml
-  MultiNuma:
-    needs: [Build]
-    uses: ./.github/workflows/multi_numa.yml
+    uses: ./.github/workflows/basic.yml
