Add informative error message when IntelSYCL is not found

ohhmm · Sep 18, 2024 · 0c2e069 · 0c2e069
1 parent 2a035fb
commit 0c2e069
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -3,28 +3,24 @@ name: C/C++ CI
 on: [push]
 
 jobs:
-  build-in-macos:
+  build-in-linux-container:
+    runs-on: ubuntu-latest
+
+    container:
+      image: intel/oneapi:2024.1.0-devel-ubuntu22.04
 
-    runs-on: macos-latest
-
     steps:
     - uses: actions/checkout@v3
     - name: Create Build Dir
-      run: cmake -E make_directory ${{github.workspace}}/build
-    - name: Pre-Install Boost, LevelDB
-      run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" && ( brew install boost-python3 leveldb || brew install boost-python3 leveldb )
+      run: mkdir -p ${{github.workspace}}/build
+    - name: Set SYCL environment variable
+      run: echo "SYCL_DIR=/opt/intel/oneapi/compiler/2024.1/lib/cmake/IntelSYCL" >> $GITHUB_ENV
     - name: Configure
       working-directory: ${{github.workspace}}/build
-      run: cmake ${{github.workspace}} -GXcode -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON
-    - name: Install prerequisites
-      working-directory: ${{github.workspace}}/build
-      run: cmake --build ${{github.workspace}}/build --target prerequisites -j `sysctl -n hw.ncpu` --config Release
-    - name: Reconfigure to detect newly installed prerequisites
-      working-directory: ${{github.workspace}}/build
-      run: cmake .
+      run: cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=Release -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON
     - name: Build
       working-directory: ${{github.workspace}}/build
-      run: cmake --build ${{github.workspace}}/build -j `sysctl -n hw.ncpu` --config Release
-    - name: Check
+      run: cmake --build . --config Release
+    - name: Test
       working-directory: ${{github.workspace}}/build
-      run: ctest --timeout 120 -C Release -j `sysctl -n hw.ncpu` -E image_codec_test\|ts\|Polyfit_test
+      run: ctest -C Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,15 +107,13 @@ if(NOT EXISTS INTEL_COMPILER_PATH)
 		set(CMAKE_CXX_COMPILER ${INTEL_COMPILER_PATH} CACHE STRING "Intel compiler path" FORCE)
 	endif()
 endif()
-if(NOT IntelSYCL_FOUND)
-	find_package(IntelSYCL)
-	if(IntelSYCL_FOUND)
-		message("IntelSYCL_FOUND: ${IntelSYCL_FOUND}")
-		message("SYCL_FLAGS: ${SYCL_FLAGS}")
-		message("IntelSYCL_DIR: ${IntelSYCL_DIR}")
-	endif()
-	option(OPENMIND_USE_OPENCL_INTEL_SYCL "Use Intel SYCL" ${IntelSYCL_FOUND})
-endif()
+
+# Set the IntelSYCL_DIR to the known path in the Docker image
+set(IntelSYCL_DIR "/opt/intel/oneapi/2024.1/lib/cmake/IntelSYCL" CACHE PATH "Path to the IntelSYCL package")
+
+# Attempt to find the IntelSYCL package
+find_package(IntelSYCL REQUIRED)
+
 if(NOT IntelDPCPP_FOUND)
 	find_package(IntelDPCPP)
 	if(IntelDPCPP_FOUND)
@@ -128,7 +126,7 @@ if(NOT OpenCL_FOUND)
 	find_package(OpenCL)
 endif()
 
-if(IntelSYCL_FOUND AND OPENMIND_USE_OPENCL_INTEL_SYCL 
+if(IntelSYCL_FOUND AND OPENMIND_USE_OPENCL_INTEL_SYCL
 	AND NOT EXISTS OpenCL_INCLUDE_DIR
 	AND EXISTS IntelSYCL_DIR
 )
@@ -419,6 +417,6 @@ function(_openmind_hook_end_of_configure)
 	message("Building target prerequisites in ${CMAKE_BINARY_DIR} for prerequisites:")
 	execute_process(COMMAND ${PREREQUISITES_BUILD_CMD}
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMAND_ECHO STDOUT 
+		COMMAND_ECHO STDOUT
 	)
 endfunction()