Revert more changes.

Author: Diptorup Deb

README.md

@@ -42,15 +42,15 @@ conda install dpctl
 
 Build and Install with setuptools
 =================================
-`dpctl` relies on DPC++ runtime. With Intel oneAPI installed you should activate it.
+dpctl relies on DPC++ runtime. With Intel oneAPI installed you should activate it.
 `setup.py` requires environment variable `ONEAPI_ROOT` and following packages
 installed:
 - `cython`
 - `numpy`
 - `cmake` - for building C API
 - `ninja` - only on Windows
 
-You need `DPC++` to build `dpctl`. If you want to build using the `DPC++` in a
+You need DPC++ to build dpctl. If you want to build using the DPC++ in a
 oneAPI distribution, activate DPC++ compiler as follows:
 ```bash
 export ONEAPI_ROOT=/opt/intel/oneapi

scripts/build_backend.py

@@ -34,29 +34,13 @@
 else:
     assert False, sys.platform + " not supported"
 
+ONEAPI_ROOT = os.environ.get("ONEAPI_ROOT")
 CODE_COVERAGE = os.environ.get("CODE_COVERAGE")
-DPCPP_HOME = os.environ.get("DPCPP_HOME")
 
-# Check if we want to enable L0 module creation support in dpctl
-if os.environ.get("HAS_LO_HEADERS"):
-    ENABLE_LO_PROGRAM_CREATION = "ON"
-else:
-    ENABLE_LO_PROGRAM_CREATION = "OFF"
-
-# If DPCPP_HOME is not set then look for ONEAPI_ROOT
-if not DPCPP_HOME:
-    ONEAPI_ROOT = os.environ.get("ONEAPI_ROOT")
-    if not ONEAPI_ROOT:
-        print("Fatal Error. A dpcpp toolchain is needed to build dpctl.")
-        import sys
-
-        sys.exit()
-    if IS_LIN:
-        DPCPP_HOME = os.path.join(ONEAPI_ROOT, r"compiler/latest/linux")
-    elif IS_WIN:
-        DPCPP_HOME = os.path.join(ONEAPI_ROOT, r"compiler\latest\windows")
-    else:
-        assert False, sys.platform + " not supported"
+if IS_LIN:
+    DPCPP_ROOT = os.path.join(ONEAPI_ROOT, r"compiler/latest/linux")
+if IS_WIN:
+    DPCPP_ROOT = os.path.join(ONEAPI_ROOT, r"compiler\latest\windows")
 
 dpctl_dir = os.getcwd()
 build_cmake_dir = os.path.join(dpctl_dir, "build_cmake")
@@ -78,8 +62,7 @@
             "-DCMAKE_BUILD_TYPE=Debug",
             "-DCMAKE_INSTALL_PREFIX=" + INSTALL_PREFIX,
             "-DCMAKE_PREFIX_PATH=" + INSTALL_PREFIX,
-            "-DDPCPP_INSTALL_DIR=" + DPCPP_HOME,
-            "-DDPCTL_ENABLE_LO_PROGRAM_CREATION=" + ENABLE_LO_PROGRAM_CREATION,
+            "-DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON"
             "-DDPCTL_BUILD_CAPI_TESTS=ON",
             "-DDPCTL_GENERATE_COVERAGE=ON",
             "-DDPCTL_COVERAGE_REPORT_OUTPUT_DIR=" + dpctl_dir,
@@ -96,8 +79,7 @@
             "-DCMAKE_BUILD_TYPE=Release",
             "-DCMAKE_INSTALL_PREFIX=" + INSTALL_PREFIX,
             "-DCMAKE_PREFIX_PATH=" + INSTALL_PREFIX,
-            "-DDPCPP_INSTALL_DIR=" + DPCPP_HOME,
-            "-DDPCTL_ENABLE_LO_PROGRAM_CREATION=" + ENABLE_LO_PROGRAM_CREATION,
+            "-DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON",
             backends,
         ]
         subprocess.check_call(cmake_args, stderr=subprocess.STDOUT, shell=False)
@@ -115,7 +97,6 @@
         "-DCMAKE_BUILD_TYPE=Release",
         "-DCMAKE_INSTALL_PREFIX=" + INSTALL_PREFIX,
         "-DCMAKE_PREFIX_PATH=" + INSTALL_PREFIX,
-        "-DDPCPP_INSTALL_DIR=" + DPCPP_HOME,
         backends,
     ]
     subprocess.check_call(cmake_args, stderr=subprocess.STDOUT, shell=False)

scripts/build_for_develop.sh

@@ -16,4 +16,4 @@ fi
 export CODE_COVERAGE=ON
 python setup.py clean --all
 python setup.py develop
-pytest --pyargs dpctl -vv
+pytest -q -ra --disable-warnings --cov dpctl --cov-report term-missing --pyargs dpctl -vv --cov-config=.coveragerc

setup.py

@@ -38,10 +38,19 @@
 elif sys.platform in ["win32", "cygwin"]:
     IS_WIN = True
 else:
-    assert False, "We currently do not build for " + sys.platform
+    assert False, sys.platform + " not supported"
 
-dpctl_sycl_interface_lib = "dpctl"
-dpctl_sycl_interface_include = r"dpctl/include"
+if IS_LIN:
+    os.environ["DPCTL_SYCL_INTERFACE_LIBDIR"] = "dpctl"
+    os.environ["DPCTL_SYCL_INTERFACE_INCLDIR"] = r"dpctl/include"
+    os.environ["CFLAGS"] = "-fPIC"
+elif IS_WIN:
+    os.environ["DPCTL_SYCL_INTERFACE_LIBDIR"] = "dpctl"
+    os.environ["DPCTL_SYCL_INTERFACE_INCLDIR"] = r"dpctl\include"
+
+dpctl_sycl_interface_lib = os.environ["DPCTL_SYCL_INTERFACE_LIBDIR"]
+dpctl_sycl_interface_include = os.environ["DPCTL_SYCL_INTERFACE_INCLDIR"]
+sycl_lib = os.environ["ONEAPI_ROOT"] + r"\compiler\latest\windows\lib"
 
 # Get long description
 with open("README.md", "r", encoding="utf-8") as file:
@@ -120,12 +129,12 @@ def extensions():
     elif IS_MAC:
         pass
     elif IS_WIN:
-        libs += ["DPCTLSyclInterface"]
+        libs += ["DPCTLSyclInterface", "sycl"]
 
     if IS_LIN:
         librarys = [dpctl_sycl_interface_lib]
     elif IS_WIN:
-        librarys = [dpctl_sycl_interface_lib]
+        librarys = [dpctl_sycl_interface_lib, sycl_lib]
     elif IS_MAC:
         librarys = [dpctl_sycl_interface_lib]