Merge branch 'master' into impl_fft

Author: vtavana

conda-recipe/bld.bat

@@ -1,14 +1,7 @@
 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 "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"
-
 "%PYTHON%" setup.py clean --all
 
 set "MKLROOT=%PREFIX%/Library"
@@ -18,10 +11,15 @@ set "DPL_ROOT_HINT=%PREFIX%/Library"
 set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
 set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
 
+REM Overriding IPO is useful for building in resources constrained VMs (public CI)
+if DEFINED OVERRIDE_INTEL_IPO (
+   set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=FALSE"
+)
+
 FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16 17.0.0 17) DO @(
   REM 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"
+    SET "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\%%V"
   )
 )
 
@@ -40,19 +38,20 @@ if EXIST "%PLATFORM_DIR%" (
 )
 
 if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
-    rem Install and assemble wheel package from the build bits
-    "%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
-    if errorlevel 1 exit 1
-    copy dist\dpnp*.whl %WHEELS_OUTPUT_FOLDER%
-    if errorlevel 1 exit 1
+  rem Install and assemble wheel package from the build bits
+  "%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
+  if errorlevel 1 exit 1
+  copy dist\dpnp*.whl %WHEELS_OUTPUT_FOLDER%
+  if errorlevel 1 exit 1
 ) ELSE (
-    rem Only install
-    "%PYTHON%" setup.py install %SKBUILD_ARGS%
-    if errorlevel 1 exit 1
+  rem Only install
+  "%PYTHON%" setup.py install %SKBUILD_ARGS%
+  if errorlevel 1 exit 1
 )
 
 rem copy back
 if EXIST "%PLATFORM_DIR%" (
-   copy /Y "%FN%" "%PLATFORM_DIR%\%FN%"
-   if errorlevel 1 exit 1
+  rem copy back
+  copy /Y "%FN%" "%PLATFORM_DIR%\%FN%"
+  if errorlevel 1 exit 1
 )

conda-recipe/meta.yaml

@@ -42,6 +42,7 @@ build:
     include_recipe: False
     script_env:
       - WHEELS_OUTPUT_FOLDER
+      - OVERRIDE_INTEL_IPO  # [win]
 
 test:
     requires:

tests/test_random_state.py

@@ -35,6 +35,9 @@ def get_default_floating():
 
 
 class TestNormal:
+    # TODO: Temporary skip due to incorrect results in public CI
+    # (ARM architecture) with the new MKL package 2024.2.0 (SAT-7080)
+    @pytest.mark.skipif(is_cpu_device(), reason="SAT-7080")
     @pytest.mark.parametrize(
         "dtype",
         [dpnp.float32, dpnp.float64, dpnp.float, None],
@@ -605,6 +608,9 @@ def test_invalid_usm_type(self, usm_type):
 
 
 class TestRandN:
+    # TODO: Temporary skip due to incorrect results in public CI
+    # (ARM architecture) with the new MKL package 2024.2.0 (SAT-7080)
+    @pytest.mark.skipif(is_cpu_device(), reason="SAT-7080")
     @pytest.mark.parametrize(
         "usm_type",
         ["host", "device", "shared"],