Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions conda-recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
:: 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%"

:: Treat warnings from the INCLUDE as external (a part of the above workaround)
:: The warning from the DPC++ compiler will be suppressed then
:: set "CFLAGS=%CFLAG% /external:I%BUILD_PREFIX%\include"
:: set "CXXFLAGS=%CXXFLAGS% /external:I%BUILD_PREFIX%\include"

"%PYTHON%" setup.py clean --all

set "MKLROOT=%PREFIX%/Library"
set "TBB_ROOT_HINT=%PREFIX%/Library"
set "DPL_ROOT_HINT=%PREFIX%/Library"

REM Overriding IPO is useful for building in resources constrained VMs (public CI)
:: Overriding IPO is useful for building in resources constrained VMs (public CI)
if DEFINED OVERRIDE_INTEL_IPO (
set "CMAKE_ARGS=%CMAKE_ARGS% -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=FALSE"
)

FOR %%V IN (17.0.0 17 18.0.0 18 19.0.0 19 20.0.0 20 21.0.0 21 22.0.0 22) DO @(
REM set DIR_HINT if directory exists
:: set DIR_HINT if directory exists
IF EXIST "%BUILD_PREFIX%\Library\lib\clang\%%V\" (
set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\%%V"
)
Expand All @@ -24,8 +29,8 @@ set "PATCHED_CMAKE_VERSION=3.26"
set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-%PATCHED_CMAKE_VERSION%\Modules\Platform"
set "FN=Windows-IntelLLVM.cmake"

rem Save the original file, and copy patched file to
rem fix the issue with IntelLLVM integration with cmake on Windows
:: Save the original file, and copy patched file to
:: fix the issue with IntelLLVM integration with cmake on Windows
if EXIST "%PLATFORM_DIR%" (
dir "%PLATFORM_DIR%\%FN%"
copy /Y "%PLATFORM_DIR%\%FN%" .
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/blas/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIRS})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
11 changes: 3 additions & 8 deletions dpnp/backend/extensions/fft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,12 @@ set_target_properties(
PROPERTIES CMAKE_POSITION_INDEPENDENT_CODE ON
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../src
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIRS})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/indexing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/lapack/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
14 changes: 5 additions & 9 deletions dpnp/backend/extensions/statistics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include
)
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../src
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/ufunc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(_dpnp_sycl_targets)
# make fat binary
target_compile_options(
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/vm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
10 changes: 5 additions & 5 deletions dpnp/backend/extensions/window/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ set_target_properties(

target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../common
)

# treat below headers as system to suppress the warnings there during the build
target_include_directories(
${python_module_name}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common
SYSTEM
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
)

target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

if(WIN32)
target_compile_options(
${python_module_name}
Expand Down
Loading