Merge pull request #1210 from IntelPython/feature/switch_to_sycl_comp…

…iler Switch to sycl compiler
IntelPython · Nov 14, 2023 · 35890ba · 35890ba
2 parents 6f670d6 + 5f70c5c
commit 35890ba
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Build numba-dpex
         run: |
           export PATH=$CONDA/bin-llvm:$PATH
-          python setup.py develop
+          CC=icx CXX=icpx python setup.py develop
 
       - name: Test installation
         run: |

diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -3,6 +3,20 @@
 @REM used BUILD_PREFIX as compiler installed in build section of meta.yml
 set "PATH=%BUILD_PREFIX%\Library\bin-llvm;%PATH%"
 
+REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
+set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
+SET "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
+
+REM Since the 60.0.0 release, setuptools includes a local, vendored copy
+REM of distutils (from late copies of CPython) that is enabled by default.
+REM It breaks build for Windows, so use distutils from "stdlib" as before.
+REM @TODO: remove the setting, once transition to build backend on Windows
+REM to cmake is complete.
+SET "SETUPTOOLS_USE_DISTUTILS=stdlib"
+
+set "CC=icx"
+set "CXX=icx"
+
 set "SKBUILD_ARGS=-G Ninja --"
 set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
 

diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -2,6 +2,19 @@
 
 set -euxo pipefail
 
+# Intel LLVM must cooperate with compiler and sysroot from conda
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${BUILD_PREFIX}/lib"
+
+echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg
+ICPXCFG="$(pwd)/icpx_for_conda.cfg"
+ICXCFG="$(pwd)/icpx_for_conda.cfg"
+
+export ICXCFG
+export ICPXCFG
+
+export CC=icx
+export CXX=icpx
+
 # new llvm-spirv location
 # starting from dpcpp_impl_linux-64=2022.0.0=intel_3610
 export PATH=$CONDA_PREFIX/bin-llvm:$PATH

diff --git a/numba_dpex/core/runtime/CMakeLists.txt b/numba_dpex/core/runtime/CMakeLists.txt
@@ -24,6 +24,10 @@ project(_dpexrt_python
     DESCRIPTION "A Python C extension for numba-dpex runtime."
 )
 
+# Help conda build find path from both host and build env.
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+
 # Get numba include path
 if(NOT DEFINED Numba_INCLUDE_DIRS)
     execute_process(
@@ -79,9 +83,10 @@ message(STATUS "CMAKE_MODULE_PATH=" "${CMAKE_MODULE_PATH}")
 
 # Add packages
 find_package(Python 3.9 REQUIRED
-  COMPONENTS Interpreter Development.Module NumPy)
+  COMPONENTS Interpreter Development.Module)
 find_package(Dpctl REQUIRED)
 find_package(NumPy REQUIRED)
+find_package(IntelSYCL REQUIRED)
 
 # Includes
 include(GNUInstallDirs)
@@ -92,14 +97,20 @@ include_directories(${Dpctl_INCLUDE_DIRS})
 include_directories(.)
 
 # Source files, *.c
-file(GLOB SOURCES "*.c")
+file(GLOB_RECURSE DPEXRT_SOURCES CONFIGURE_DEPENDS "*.c")
+file(GLOB_RECURSE KERNEL_SOURCES CONFIGURE_DEPENDS "*.cpp")
+set(SOURCES ${DPEXRT_SOURCES} ${KERNEL_SOURCES})
 
 # Link dpctl library path with -L
 link_directories(${DPCTL_LIBRARY_PATH})
 
 # Output static library, *.so or *.dll
 python_add_library(${PROJECT_NAME} MODULE ${SOURCES})
 
+# Add SYCL to target, this must come after python_add_library()
+# FIXME: sources incompatible with sycl include?
+# add_sycl_to_target(TARGET ${PROJECT_NAME} SOURCES ${KERNEL_SOURCES})
+
 # Link the DPCTLSyclInterface library to target
 target_link_libraries(${PROJECT_NAME} PRIVATE DPCTLSyclInterface)