Disable ComputeBench and llama

Author: omarahmed1111

unified-runtime/scripts/benchmarks/benches/compute.py

@@ -58,6 +58,9 @@ def benchmarks(self) -> list[Benchmark]:
         if options.sycl is None:
             return []
 
+        if options.ur_adapter == "cuda":
+            return []
+
         benches = [
             SubmitKernelL0(self, 0),
             SubmitKernelL0(self, 1),

unified-runtime/scripts/benchmarks/benches/llamacpp.py

@@ -75,6 +75,9 @@ def benchmarks(self) -> list[Benchmark]:
         if options.sycl is None:
             return []
 
+        if options.ur_adapter == "cuda":
+            return []
+
         return [LlamaBench(self)]
 
 

unified-runtime/scripts/benchmarks/benches/syclbench.py

@@ -43,9 +43,13 @@ def setup(self):
             f"-DCMAKE_CXX_COMPILER={options.sycl}/bin/clang++",
             f"-DCMAKE_C_COMPILER={options.sycl}/bin/clang",
             f"-DSYCL_IMPL=dpcpp",
-            f"-DCMAKE_CXX_FLAGS=-fsycl -fsycl-targets=nvptx64-nvidia-cuda",
         ]
 
+        if options.ur_adapter == "cuda":
+            configure_command += [
+                f"-DCMAKE_CXX_FLAGS=-fsycl -fsycl-targets=nvptx64-nvidia-cuda"
+            ]
+
         run(configure_command, add_sycl=True)
         run(f"cmake --build {build_path} -j", add_sycl=True)
 

unified-runtime/scripts/benchmarks/benches/velocity.py

@@ -16,18 +16,10 @@
 import os
 
 
-def isCudaDependenciesAvailable():
-    return options.cudnn_directory is not None and options.cublas_directory is not None
-
-
 class VelocityBench(Suite):
     def __init__(self, directory):
         if options.sycl is None:
             return
-        if options.ur_adapter == "cuda" and not isCudaDependenciesAvailable():
-            raise ValueError(
-                "CuDnn and CuBlas libraries directory must be specified with cuda adapter."
-            )
 
         self.directory = directory
 
@@ -49,6 +41,15 @@ def benchmarks(self) -> list[Benchmark]:
         if options.sycl is None:
             return []
 
+        if options.ur_adapter == "cuda":
+            return [
+                Hashtable(self),
+                Bitcracker(self),
+                CudaSift(self),
+                QuickSilver(self),
+                SobelFilter(self),
+            ]
+
         return [
             Hashtable(self),
             Bitcracker(self),
@@ -372,7 +373,7 @@ def extra_cmake_args(self):
             return [
                 f"-DUSE_NVIDIA_BACKEND=YES",
                 f"-DUSE_SM=80",
-                f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()} -L{options.cublas_directory} -L{options.cudnn_directory}",
+                f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()}",
             ]
         return [
             f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()}"
@@ -478,7 +479,7 @@ def extra_cmake_args(self):
             return [
                 f"-DUSE_NVIDIA_BACKEND=YES",
                 f"-DUSE_SM=80",
-                f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()} -L{options.cublas_directory} -L{options.cudnn_directory}",
+                f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()}",
             ]
         return [
             f"-DCMAKE_CXX_FLAGS=-O3 -fsycl -ffast-math -I{oneapi.dnn_include()} -I{oneapi.mkl_include()} -L{oneapi.dnn_lib()} -L{oneapi.mkl_lib()}"

unified-runtime/scripts/benchmarks/main.py

@@ -144,6 +144,7 @@ def main(directory, additional_env_vars, save_name, compare_names, filter):
 
     suites = (
         [
+            ComputeBench(directory),
             VelocityBench(directory),
             SyclBench(directory),
             LlamaCppBench(directory),
@@ -154,9 +155,6 @@ def main(directory, additional_env_vars, save_name, compare_names, filter):
         else []
     )
 
-    if not options.ur_adapter == "cuda":
-        suites.append(ComputeBench(directory))
-
     benchmarks = []
 
     for s in suites: