Merge pull request #2654 from pbalcer/add-sycl-target-pvc

[benchmarks] don't fail on suite setup issues

Author: pbalcer

scripts/benchmarks/benches/oneapi.py

@@ -29,12 +29,12 @@ def install_package(self, name, url):
 
         package = download(self.oneapi_dir, url, f'package_{name}.sh')
         try:
-            print(f"installing f{name}")
+            print(f"installing {name}")
             run(f"sh {package} -a -s --eula accept --install-dir {self.oneapi_dir} --instance f{self.ONEAPI_BENCHMARK_INSTANCE_ID}")
         except:
             print("oneAPI installation likely exists already")
             return
-        print(f"f{name} installation complete")
+        print(f"{name} installation complete")
 
     def package_dir(self, package, dir):
         return os.path.join(self.oneapi_dir, package, 'latest', dir)

scripts/benchmarks/main.py

@@ -143,9 +143,13 @@ def main(directory, additional_env_vars, save_name, compare_names, filter):
 
         if suite_benchmarks:
             print(f"Setting up {type(s).__name__}")
-            s.setup()
-            print(f"{type(s).__name__} setup complete.")
-            benchmarks += suite_benchmarks
+            try:
+                s.setup()
+            except:
+                print(f"{type(s).__name__} setup failed. Benchmarks won't be added.")
+            else:
+                print(f"{type(s).__name__} setup complete.")
+                benchmarks += suite_benchmarks
 
     for b in benchmarks:
         print(b.name())