Merge pull request #158 from IntelPython/windows-build-for-develop-tweak

Changes to build_for_develop.bat

Author: oleksandr-pavlyk

backends/source/dppl_sycl_queue_manager.cpp

@@ -79,12 +79,6 @@ class QMgrHelper
                     auto devty = d.get_info<info::device::device_type>();
                     if(devty == DTy && be == BE) {
                         SelectedDevices.push_back(d);
-
-                        // Workaround for situations when in some environments
-                        // get_devices() returns each device TWICE. Then it fails in call
-                        // for context constructor with all doubled devices.
-                        // So use only one first device.
-                        break;
                     }
                 }
                 if (SelectedDevices.size() > 0) {

dpctl/tests/test_sycl_usm.py

@@ -205,11 +205,6 @@ def test_create_with_only_size(self):
         dpctl.has_sycl_platforms(), "No SYCL Devices except the default host device."
     )
     def test_sycl_usm_array_interface(self):
-        import sys
-
-        if self.MemoryUSMClass is MemoryUSMHost and sys.platform in ["win32", "cygwin"]:
-            # MemoryUSMHost.copy_to_host() hangs on Windows. TODO: investigate
-            raise unittest.SkipTest
         m = self.MemoryUSMClass(256)
         m2 = Dummy(m.nbytes)
         hb = np.random.randint(0, 256, size=256, dtype="|u1")

scripts/build_for_develop.bat

@@ -1,5 +1,10 @@
-call "%ONEAPI_ROOT%\compiler\latest\env\vars.bat"
-IF ERRORLEVEL 1 exit /b 1
+REM check if oneAPI has been activated, only try activating if not
+dpcpp.exe --version >nul 2>&1
+IF %ERRORLEVEL% NEQ 0 (
+    set ERRORLEVEL=
+    call "%ONEAPI_ROOT%\compiler\latest\env\vars.bat"
+    IF ERRORLEVEL 1 exit /b 1
+)
 REM conda uses %ERRORLEVEL% but FPGA scripts can set it. So it should be reseted.
 set ERRORLEVEL=
 
@@ -19,6 +24,13 @@ for /f "delims=" %%a in ('%CONDA_PREFIX%\python.exe -c "import numpy; print(nump
 set PYTHON_INC=
 for /f "delims=" %%a in ('%CONDA_PREFIX%\python.exe -c "import distutils.sysconfig as sc; print(sc.get_python_inc())"') do @set PYTHON_INC=%%a 
 
+if defined USE_GTEST (
+    set "_GTEST_INCLUDE_DIR=%CONDA_PREFIX%\Library\include"
+    set "_GTEST_LIB_DIR=%CONDA_PREFIX%\Library\lib"
+) else (
+    set "_GTEST_INCLUDE_DIR="
+    set "_GTEST_LIB_DIR="
+)
 cmake -G Ninja ^
     -DCMAKE_BUILD_TYPE=Release ^
     "-DCMAKE_CXX_FLAGS=-Wno-unused-function /EHa" ^
@@ -27,17 +39,19 @@ cmake -G Ninja ^
     "-DDPCPP_ROOT=%DPCPP_ROOT%" ^
     "-DCMAKE_C_COMPILER:PATH=%DPCPP_ROOT%\bin\clang-cl.exe" ^
     "-DCMAKE_CXX_COMPILER:PATH=%DPCPP_ROOT%\bin\dpcpp.exe" ^
+    "-DGTEST_INCLUDE_DIR=%_GTEST_INCLUDE_DIR%" ^
+    "-DGTEST_LIB_DIR=%_GTEST_LIB_DIR%" ^
     "-DPYTHON_INCLUDE_DIR=%PYTHON_INC%" ^
-    "-DGTEST_INCLUDE_DIR=%CONDA_PREFIX%\Library\include" ^
-    "-DGTEST_LIB_DIR=%CONDA_PREFIX%\Library\lib" ^
     "-DNUMPY_INCLUDE_DIR=%NUMPY_INC%" ^
     "%cd%\..\backends"
 IF %ERRORLEVEL% NEQ 0 exit /b 1
 
 ninja -n 
 IF %ERRORLEVEL% NEQ 0 exit /b 1
-ninja check
-IF %ERRORLEVEL% NEQ 0 exit /b 1
+if defined USE_GTEST (
+    ninja check
+    IF %ERRORLEVEL% NEQ 0 exit /b 1
+)
 ninja install
 IF %ERRORLEVEL% NEQ 0 exit /b 1
 

scripts/build_for_develop.sh

@@ -37,8 +37,8 @@ cp -r backends/include/* dpctl/include
 export DPPL_SYCL_INTERFACE_LIBDIR=dpctl
 export DPPL_SYCL_INTERFACE_INCLDIR=dpctl/include
 
-export CC=clang
-export CXX=dpcpp
+export CC=${DPCPP_ROOT}/bin/clang
+export CXX=${DPCPP_ROOT}/bin/dpcpp
 # FIXME: How to pass this using setup.py? The fPIC flag is needed when
 # dpcpp compiles the Cython generated cpp file.
 export CFLAGS=-fPIC