Make the build work on Windows

Author: oleksandr-pavlyk

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21...3.22 FATAL_ERROR)
 
 project(dpctl
     LANGUAGES CXX

cmake/IntelDPCPPConfig.cmake

@@ -201,7 +201,7 @@ if(SYCL_COMPILER)
     NAMES
       include
     HINTS
-      ${SYCL_PACKAGE_DIR} ENV SYCL_INCLUDE_DIR_HINT
+      ${SYCL_PACKAGE_DIR} $ENV{SYCL_INCLUDE_DIR_HINT}
     NO_DEFAULT_PATH
       )
 
@@ -210,7 +210,7 @@ if(SYCL_COMPILER)
     NAMES
       lib lib64
     HINTS
-      ${SYCL_PACKAGE_DIR} ENV SYCL_LIBRARY_DIR_HINT
+      ${SYCL_PACKAGE_DIR} $ENV{SYCL_LIBRARY_DIR_HINT}
     NO_DEFAULT_PATH
       )
 

conda-recipe/bld.bat

@@ -4,16 +4,17 @@ set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
 set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
 
 "%PYTHON%" setup.py clean --all
-set "INSTALL_CMD=install -- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON"
+set "SKBUILD_ARGS=-- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON"
+set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\14.0.0"
 
 if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
     rem Install and assemble wheel package from the build bits
-    "%PYTHON%" setup.py %INSTALL_CMD% bdist_wheel
+    "%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
     if errorlevel 1 exit 1
     copy dist\dpctl*.whl %WHEELS_OUTPUT_FOLDER%
     if errorlevel 1 exit 1
 ) ELSE (
     rem Only install
-    "%PYTHON%" setup.py %INSTALL_CMD%
+    "%PYTHON%" setup.py install %SKBUILD_ARGS%
     if errorlevel 1 exit 1
 )

conda-recipe/build.sh

@@ -7,8 +7,8 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
 
 ${PYTHON} setup.py clean --all
 export CMAKE_GENERATOR="Unix Makefiles"
-INSTALL_CMD="install -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
-echo "${PYTHON} setup.py ${INSTALL_CMD}"
+SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
+echo "${PYTHON} setup.py install ${SKBUILD_ARGS}"
 
 # Workaround for:
 # DPC++ launched by cmake does not see components of `dpcpp_cpp_rt`,
@@ -22,9 +22,9 @@ if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
     else
         WHEELS_BUILD_ARGS="-p manylinux2014_x86_64"
     fi
-    ${PYTHON} setup.py ${INSTALL_CMD} bdist_wheel ${WHEELS_BUILD_ARGS}
+    ${PYTHON} setup.py install bdist_wheel ${WHEELS_BUILD_ARGS} ${SKBUILD_ARGS}
     cp dist/dpctl*.whl ${WHEELS_OUTPUT_FOLDER}
 else
     # Perform regular install
-    ${PYTHON} setup.py ${INSTALL_CMD}
+    ${PYTHON} setup.py install ${SKBUILD_ARGS}
 fi

conda-recipe/meta.yaml

@@ -18,7 +18,7 @@ requirements:
     host:
         - setuptools
         - cython
-        - cmake
+        - cmake  >=3.21
         - python
         - make                     # [unix]
         - ninja                    # [win]

dpctl/CMakeLists.txt

@@ -11,6 +11,7 @@ if(WIN32)
         "-Wunused-function "
         "-Wuninitialized "
         "-Wmissing-declarations "
+        "-Wno-unused-parameter "
     )
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox ${WARNING_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox ${WARNING_FLAGS}")
@@ -70,11 +71,39 @@ set(DPCTL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_custom_target(_build_time_create_dpctl_include ALL
     COMMAND ${CMAKE_COMMAND} -E make_directory ${DPCTL_INCLUDE_DIR}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${DPCTL_INCLUDE_DIR}/syclinterface
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libsyclinterface/include/* ${DPCTL_INCLUDE_DIR}/syclinterface
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/apis/include/* ${DPCTL_INCLUDE_DIR}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DPCTL_INCLUDE_DIR}/syclinterface/Support
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DPCTL_INCLUDE_DIR}/syclinterface/Config
     DEPENDS DPCTLSyclInterface
 )
 
+file(GLOB _syclinterface_h ${CMAKE_SOURCE_DIR}/libsyclinterface/include/*.h)
+foreach(hf ${_syclinterface_h})
+   add_custom_command(TARGET _build_time_create_dpctl_include
+       COMMAND ${CMAKE_COMMAND} -E copy ${hf} ${DPCTL_INCLUDE_DIR}/syclinterface
+   )
+endforeach()
+
+file(GLOB _syclinterface_Support_h ${CMAKE_SOURCE_DIR}/libsyclinterface/include/Support/*.h)
+foreach(hf ${_syclinterface_Support_h})
+   add_custom_command(TARGET _build_time_create_dpctl_include
+       COMMAND ${CMAKE_COMMAND} -E copy ${hf} ${DPCTL_INCLUDE_DIR}/syclinterface/Support
+   )
+endforeach()
+
+file(GLOB _syclinterface_Config_h ${CMAKE_SOURCE_DIR}/libsyclinterface/include/Config/*.h)
+foreach(hf ${_syclinterface_Config_h})
+   add_custom_command(TARGET _build_time_create_dpctl_include
+       COMMAND ${CMAKE_COMMAND} -E copy ${hf} ${DPCTL_INCLUDE_DIR}/syclinterface/Config
+   )
+endforeach()
+
+file(GLOB _apis_h ${CMAKE_CURRENT_SOURCE_DIR}/apis/include/*)
+foreach(hf ${_apis_h})
+   add_custom_command(TARGET _build_time_create_dpctl_include
+       COMMAND ${CMAKE_COMMAND} -E copy ${hf} ${DPCTL_INCLUDE_DIR}
+   )
+endforeach()
+
 set(CMAKE_INSTALL_RPATH "$ORIGIN")
 
 function(build_dpctl_ext _trgt _src _dest)

libsyclinterface/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10...3.22 FATAL_ERROR)
 
 project(
     "libDPCTLSYCLInterface"
@@ -84,6 +84,7 @@ if(WIN32)
         "-Wunused-function "
         "-Wuninitialized "
         "-Wmissing-declarations "
+        "-Wno-deprecated-declarations "
     )
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
@@ -195,19 +196,6 @@ file(GLOB MAIN_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
 file(GLOB SUPPORT_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/Support/*.h")
 file(GLOB CONFIG_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/Config/*.h")
 
-if (0)
-set(ALL_HEADERS)
-foreach(HEADER ${MAIN_HEADERS})
-  list(APPEND ALL_HEADERS ${HEADER})
-endforeach()
-foreach(HEADER ${SUPPORT_HEADERS})
-  list(APPEND ALL_HEADERS ${HEADER})
-endforeach()
-foreach(HEADER ${CONFIG_HEADERS})
-  list(APPEND ALL_HEADERS ${HEADER})
-endforeach()
-endif()
-
 set_target_properties(DPCTLSyclInterface
     PROPERTIES PUBLIC_HEADER
     "${MAIN_HEADERS}"
@@ -225,6 +213,10 @@ install(TARGETS
     DPCTLSyclInterface
     LIBRARY
     DESTINATION ${_lib_destination}
+    ARCHIVE
+    DESTINATION ${_lib_destination}
+    RUNTIME
+    DESTINATION ${_lib_destination}
     PUBLIC_HEADER
     DESTINATION ${_include_destination}
 )