Add build option for AdaptiveCpp

Also fix some tests when building with level zero enabled by AdaptiveCpp

Author: ndgrigorian

.github/workflows/adaptivecpp-build.yml

@@ -50,7 +50,8 @@ jobs:
         env:
           CACHE_NUMBER: 0  # Increase to reset cache
         with:
-          path: ~/.conda/pkgs
+          # the package directory that setup-miniconda configures
+          path: ~/conda_pkgs_dir
           key:
             ${{ runner.os }}-conda-acpp-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{ hashFiles('.github/workflows/adaptivecpp-build.yml') }}
           restore-keys: |
@@ -65,10 +66,6 @@ jobs:
           channels: conda-forge
           conda-remove-defaults: true
 
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-
       - name: Install AdaptiveCpp and build dependencies
         run: |
           # the Python build string selects the GIL or the free-threaded variant,
@@ -88,12 +85,7 @@ jobs:
 
       - name: Build dpctl
         run: |
-          # conda-forge builds AdaptiveCpp without the Level Zero backend
-          python scripts/build_locally.py \
-              --c-compiler="${CONDA_PREFIX}/bin/clang" \
-              --cxx-compiler="${CONDA_PREFIX}/bin/acpp" \
-              --no-level-zero \
-              --cmake-opts="-DDPCTL_SYCL_PROVIDER=AdaptiveCpp"
+          python scripts/build_locally.py --sycl-provider=AdaptiveCpp
 
       - name: List platforms
         run: |

dpctl/tests/test_sycl_compiler.py

@@ -244,6 +244,7 @@ def test_create_kernel_bundle_from_spirv_ocl():
     _check_multi_kernel_bundle(kb)
 
 
+@pytest.mark.unsupported_on_acpp
 def test_create_kernel_bundle_from_spirv_l0():
     q = _get_level_zero_queue_or_skip()
     spirv_file = get_spirv_abspath("multi_kernel.spv")

dpctl/tests/test_sycl_kernel_submit.py

@@ -315,6 +315,7 @@ def get_spirv_abspath(fn):
 # the process for generating the .spv files in this test is documented in
 # libsyclinterface/tests/test_sycl_queue_submit_local_accessor_arg.cpp
 # in a comment starting on line 123
+@pytest.mark.unsupported_on_acpp
 def test_submit_local_accessor_arg():
     try:
         q = dpctl.SyclQueue("level_zero")

scripts/_build_helper.py

@@ -25,13 +25,25 @@ def resolve_compilers(
     c_compiler: str,
     cxx_compiler: str,
     compiler_root: str,
+    sycl_provider: str = "Intel",
 ):
     is_linux = "linux" in sys.platform
 
+    if sycl_provider == "AdaptiveCpp":
+        if oneapi:
+            raise RuntimeError(
+                "--oneapi is specific to DPC++ and can not be used with the "
+                "AdaptiveCpp SYCL provider"
+            )
+        default_c_compiler, default_cxx_compiler = "clang", "acpp"
+    else:
+        default_c_compiler = "icx"
+        default_cxx_compiler = "icpx" if is_linux else "icx"
+
     if oneapi or (
         c_compiler is None and cxx_compiler is None and compiler_root is None
     ):
-        return "icx", ("icpx" if is_linux else "icx")
+        return default_c_compiler, default_cxx_compiler
 
     if (
         (c_compiler is None or not os.path.isabs(c_compiler))
@@ -45,19 +57,22 @@ def resolve_compilers(
 
     # default values
     if c_compiler is None:
-        c_compiler = "icx"
+        c_compiler = default_c_compiler
     if cxx_compiler is None:
-        cxx_compiler = "icpx" if is_linux else "icx"
+        cxx_compiler = default_cxx_compiler
 
     for name, opt_name in (
         (c_compiler, "--c-compiler"),
         (cxx_compiler, "--cxx-compiler"),
     ):
         if os.path.isabs(name):
             path = name
-        else:
+        elif compiler_root:
             path = os.path.join(compiler_root, name)
-        if not os.path.exists(path):
+        else:
+            # a default name with no compiler root is looked up in PATH
+            path = shutil.which(name)
+        if not path or not os.path.exists(path):
             raise RuntimeError(f"{opt_name} value {name} not found")
     return c_compiler, cxx_compiler
 
@@ -92,6 +107,7 @@ def make_cmake_args(
     level_zero: bool = True,
     glog: bool = False,
     verbose: bool = False,
+    sycl_provider: str = "Intel",
     other_opts: str = None,
 ):
     args = [
@@ -100,6 +116,7 @@ def make_cmake_args(
         "-DDPCTL_ENABLE_L0_KERNEL_BUNDLE_CREATION="
         f"{'ON' if level_zero else 'OFF'}",
         f"-DDPCTL_ENABLE_GLOG:BOOL={'ON' if glog else 'OFF'}",
+        f"-DDPCTL_SYCL_PROVIDER={sycl_provider}",
     ]
 
     if verbose:

scripts/build_locally.py

@@ -51,6 +51,14 @@ def parse_args():
         help="Path to compiler installation root",
     )
 
+    p.add_argument(
+        "--sycl-provider",
+        type=str,
+        choices=["Intel", "AdaptiveCpp"],
+        default="Intel",
+        help="SYCL implementation to build with (defaults to Intel).",
+    )
+
     p.add_argument(
         "--oneapi",
         dest="oneapi",
@@ -139,22 +147,31 @@ def main():
     setup_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
     c_compiler, cxx_compiler = resolve_compilers(
-        args.oneapi, args.c_compiler, args.cxx_compiler, args.compiler_root
+        args.oneapi,
+        args.c_compiler,
+        args.cxx_compiler,
+        args.compiler_root,
+        sycl_provider=args.sycl_provider,
     )
 
     # clean build dir if --clean set
     if args.clean:
         clean_build_dir(setup_dir)
 
-    # Level Zero state (on unless explicitly disabled)
-    level_zero_enabled = False if args.no_level_zero else True
+    # Level Zero state (on unless explicitly disabled), the backend is only
+    # implemented for DPC++
+    if args.sycl_provider == "AdaptiveCpp":
+        level_zero_enabled = False
+    else:
+        level_zero_enabled = False if args.no_level_zero else True
 
     cmake_args = make_cmake_args(
         c_compiler=c_compiler,
         cxx_compiler=cxx_compiler,
         level_zero=level_zero_enabled,
         glog=args.glog,
         verbose=args.verbose,
+        sycl_provider=args.sycl_provider,
         other_opts=args.cmake_opts,
     )