Changes to build files to use the new FindLevelZero.cmake module.

  - Bumps Cmake requirement to 3.20 as we use cmake_path in the
    FindLevelZero module.
  - Adds a new environment variable to turn off level zero
    version checking as needed.
  - Updates CMakeLists.txt inside dpcomp_gpu_runtime.
  - Update azurepipeline to not use Level Zero version checks.

Author: Diptorup Deb

CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.20)
 
 project(mlir-extensions)
 
@@ -30,6 +30,8 @@ if(POLICY CMP0116)
     cmake_policy(SET CMP0116 OLD)
 endif()
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+
 # SDL
 # set(CMAKE_VERBOSE_MAKEFILE on) # enable for debug
 if (CMAKE_SYSTEM_NAME STREQUAL Windows)
@@ -66,11 +68,15 @@ macro(apply_llvm_compile_flags target)
     if (MSVC)
         target_compile_options(${target} PRIVATE /EHsc)
     endif ()
-
     target_compile_definitions(${target} PRIVATE ${LLVM_DEFINITIONS})
 endmacro()
 
 if(GPU_ENABLE)
+    if(DEFINED ENV{LEVEL_ZERO_VERSION_CHECK_OFF})
+        find_package(LevelZero REQUIRED)
+    else()
+        find_package(LevelZero 1.6 REQUIRED)
+    endif()
     add_subdirectory(dpcomp_gpu_runtime)
 endif()
 

azure-pipelines.yml

@@ -89,7 +89,7 @@ jobs:
   - script: |
       git clone https://github.com/oneapi-src/level-zero.git
       cd level-zero
-      git checkout v1.5.0
+      git checkout v1.6.2
       mkdir level_zero_install
       mkdir build
       cd build
@@ -111,6 +111,7 @@ jobs:
       export LLVM_PATH=$(System.DefaultWorkingDirectory)/llvm_cache
       export TBB_PATH=$(System.DefaultWorkingDirectory)/tbb
       export LEVEL_ZERO_DIR=$(System.DefaultWorkingDirectory)/level-zero/level_zero_install
+      export LEVEL_ZERO_VERSION_CHECK_OFF=1
       export OCL_ICD_FILENAMES_RESET=1
       export OCL_ICD_FILENAMES=libintelocl.so
       export SYCL_DEVICE_FILTER=opencl:cpu

dpcomp_gpu_runtime/CMakeLists.txt

@@ -16,28 +16,24 @@ project(dpcomp-gpu-runtime LANGUAGES CXX C)
 
 include(GenerateExportHeader)
 
-if(NOT LEVEL_ZERO_DIR)
-    message(FATAL_ERROR "LEVEL_ZERO_DIR is not set")
-endif()
-
 set(SOURCES_LIST
     lib/gpu_runtime.cpp
-    )
+)
 set(HEADERS_LIST
     lib/level_zero_printing.hpp
     lib/level_zero_wrapper.hpp
-    )
+)
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES_LIST} ${HEADERS_LIST})
 generate_export_header(${PROJECT_NAME})
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${PROJECT_BINARY_DIR}
-    ${LEVEL_ZERO_DIR}/include
-    )
+    ${LevelZero_INCLUDE_DIR}
+)
 
 target_link_directories(${PROJECT_NAME} PRIVATE
-    ${LEVEL_ZERO_DIR}/lib
-    )
+    ${LevelZero_LIBRARIES_DIR}
+)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE ze_loader)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LevelZero_LIBRARY})

numba_dpcomp/setup.py

@@ -89,7 +89,6 @@
     else:
         print("LEVEL_ZERO_DIR is", LEVEL_ZERO_DIR)
         cmake_cmd += [
-            "-DLEVEL_ZERO_DIR=" + LEVEL_ZERO_DIR,
             "-DGPU_ENABLE=ON",
         ]