a

Author: bratpiorka

.github/workflows/reusable_basic.yml

@@ -26,6 +26,7 @@ jobs:
         install_tbb: ['ON']
         disable_hwloc: ['OFF']
         link_hwloc_statically: ['OFF']
+        cmake_ver: ['latest']
         include:
           - os: 'ubuntu-22.04'
             build_type: Release
@@ -36,6 +37,8 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            # check minimum supported cmake version
+            cmake_ver: '3.14.0'
           - os: 'ubuntu-22.04'
             build_type: Release
             compiler: {c: gcc, cxx: g++}
@@ -45,6 +48,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           - os: 'ubuntu-24.04'
             build_type: Debug
             compiler: {c: gcc, cxx: g++}
@@ -54,6 +58,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           # test level_zero_provider='OFF' and cuda_provider='OFF'
           - os: 'ubuntu-22.04'
             build_type: Release
@@ -64,6 +69,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           # test icx compiler
           - os: 'ubuntu-22.04'
             build_type: Release
@@ -74,6 +80,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           # test lld linker
           - os: 'ubuntu-24.04'
             build_type: Release
@@ -85,7 +92,8 @@ jobs:
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
             llvm_linker: '-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"'
-          # test without installing TBB
+            cmake_ver: 'latest'
+            # test without installing TBB
           - os: 'ubuntu-22.04'
             build_type: Release
             compiler: {c: gcc, cxx: g++}
@@ -95,6 +103,7 @@ jobs:
             install_tbb: 'OFF'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           - os: 'ubuntu-22.04'
             build_type: Debug
             compiler: {c: gcc, cxx: g++}
@@ -104,6 +113,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'ON'
             link_hwloc_statically: 'OFF'
+            cmake_ver: 'latest'
           - os: 'ubuntu-22.04'
             build_type: Release
             compiler: {c: gcc, cxx: g++}
@@ -113,6 +123,7 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'ON'
+            cmake_ver: 'latest'
     runs-on: ${{matrix.os}}
 
     steps:
@@ -124,7 +135,19 @@ jobs:
     - name: Install apt packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y clang cmake libnuma-dev lcov
+        sudo apt-get install -y clang libnuma-dev lcov
+
+    - name: Install cmake (latest)
+      if: matrix.cmake_ver == 'latest'
+      run: |
+        sudo apt-get install -y cmake
+
+    - name: Install cmake (minimum supported version)
+      if: matrix.cmake_ver != 'latest'
+      run: |
+        wget https://github.com/Kitware/CMake/releases/download/v${{matrix.cmake_ver}}/cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
+        chmod +x cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
+        sudo ./cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh --skip-license --prefix=/usr/local
 
     - name: Install hwloc
       if: matrix.disable_hwloc == 'OFF'

CMakeLists.txt

@@ -2,7 +2,9 @@
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+message(STATUS "CMake version: ${CMAKE_VERSION}")
 cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
+
 # needed when UMF is used as an external project
 set(UMF_CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -404,16 +406,17 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (NOT UMF_LEVEL_ZERO_INCLUDE_DIR))
         GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
         GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
         EXCLUDE_FROM_ALL)
-    FetchContent_MakeAvailable(level-zero-loader)
+    # Only populate the repo - we don't need to build it
+    FetchContent_Populate(level-zero-loader)
 
     set(LEVEL_ZERO_INCLUDE_DIRS
         ${level-zero-loader_SOURCE_DIR}/include
-        CACHE PATH "Path to Level Zero Headers")
-    message(STATUS "Level Zero include directory: ${LEVEL_ZERO_INCLUDE_DIRS}")
+        CACHE PATH "Path to Level Zero headers")
+    message(STATUS "LEVEL_ZERO_INCLUDE_DIRS = ${LEVEL_ZERO_INCLUDE_DIRS}")
 elseif(UMF_BUILD_LEVEL_ZERO_PROVIDER)
     # Only header is needed to build UMF
     set(LEVEL_ZERO_INCLUDE_DIRS ${UMF_LEVEL_ZERO_INCLUDE_DIR})
-    message(STATUS "Level Zero include directory: ${LEVEL_ZERO_INCLUDE_DIRS}")
+    message(STATUS "LEVEL_ZERO_INCLUDE_DIRS = ${LEVEL_ZERO_INCLUDE_DIRS}")
 endif()
 
 # Fetch CUDA only if needed i.e.: if building CUDA provider is ON and CUDA
@@ -423,14 +426,15 @@ if(UMF_BUILD_CUDA_PROVIDER AND (NOT UMF_CUDA_INCLUDE_DIR))
         "https://gitlab.com/nvidia/headers/cuda-individual/cudart.git")
     set(CUDA_TAG cuda-12.5.1)
 
-    message(STATUS "Fetching CUDA ${CUDA_TAG} from ${CUDA_REPO} ...")
+    message(STATUS "Fetching CUDA (${CUDA_TAG}) from ${CUDA_REPO} ...")
 
     FetchContent_Declare(
         cuda-headers
         GIT_REPOSITORY ${CUDA_REPO}
         GIT_TAG ${CUDA_TAG}
         EXCLUDE_FROM_ALL)
-    FetchContent_MakeAvailable(cuda-headers)
+    # Only populate the repo - we don't need to build it
+    FetchContent_Populate(cuda-headers)
 
     set(CUDA_INCLUDE_DIRS
         ${cuda-headers_SOURCE_DIR}
@@ -707,16 +711,31 @@ else()
     )
 endif()
 
-if((UMF_BUILD_GPU_TESTS OR UMF_BUILD_GPU_EXAMPLES) AND UMF_BUILD_CUDA_PROVIDER)
-    find_package(CUDA REQUIRED cuda)
-    if(CUDA_LIBRARIES)
-        set(UMF_CUDA_ENABLED TRUE)
-    else()
-        message(
-            STATUS "Disabling tests and examples that use the CUDA provider "
-                   "because the CUDA libraries they require were not found.")
+if(UMF_BUILD_GPU_TESTS OR UMF_BUILD_GPU_EXAMPLES)
+    if(UMF_BUILD_CUDA_PROVIDER)
+        find_package(CUDA REQUIRED cuda)
+        if(CUDA_LIBRARIES)
+            set(UMF_CUDA_ENABLED TRUE)
+        else()
+            message(
+                STATUS
+                    "Disabling tests and examples that use the CUDA Provider "
+                    "because the CUDA libraries they require were not found.")
+        endif()
+    endif()
+
+    if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
+        find_package(LEVEL_ZERO REQUIRED level-zero)
+        if(LEVEL_ZERO_LIBRARIES)
+            set(UMF_LEVEL_ZERO_ENABLED TRUE)
+        else()
+            message(
+                STATUS
+                    "Disabling tests and examples that use the Level Zero Provider "
+                    "because the Level Zero libraries they require were not found."
+            )
+        endif()
     endif()
-    # TODO do the same for ze_loader
 endif()
 
 add_subdirectory(src)

test/test_installation.py

@@ -13,6 +13,7 @@
 import subprocess  # nosec B404
 import sys
 from typing import List
+import os
 
 
 class UmfInstaller:
@@ -57,6 +58,23 @@ def __init__(
         self.hwloc = hwloc
         self.match_list = self._create_match_list()
 
+    def _get_cmake_major_minor_version(self) -> List[int]:
+        """
+        Returns the version of CMake
+        """
+
+        cmake_cmd = "cmake --version"
+        try:
+            output = subprocess.check_output(cmake_cmd.split()).decode()  # nosec B603
+            version_line = output.splitlines()[0]
+            cmake_version = version_line.split()[2]
+            # get major and minor version
+            major_minor = [int(x) for x in cmake_version.split(".")[:2]]
+            print("CMake version:", major_minor, flush=True)
+            return major_minor
+        except subprocess.CalledProcessError:
+            sys.exit(f"Error: Unable to get CMake version using command '{cmake_cmd}'")
+
     def _create_match_list(self) -> List[str]:
         """
         Defines a list of relative paths to files that should be installed.
@@ -182,8 +200,21 @@ def install_umf(self) -> None:
                 )
 
         install_cmd = f"cmake --install {self.build_dir} --config {self.build_type.title()} --prefix {self.install_dir}"
+        env = os.environ.copy()
+
+        # use make to install UMF if CMake version is lower than 3.15
+        major, minor = self._get_cmake_major_minor_version()
+        if major <= 3 and minor < 15:
+            install_cmd = "make -C " + str(self.build_dir) + " install"
+            env["CMAKE_INSTALL_PREFIX"] = str(self.install_dir)
+            env["CMAKE_BUILD_TYPE"] = self.build_type.title()
+
         try:
-            subprocess.run(install_cmd.split()).check_returncode()  # nosec B603
+            print(f"Running command: {install_cmd}", flush=True)
+            subprocess.run(
+                install_cmd.split(), env=env
+            ).check_returncode()  # nosec B603
+
         except subprocess.CalledProcessError:
             sys.exit(f"Error: UMF installation command '{install_cmd}' failed")