Changed timeout times

assignment2/run_tests.py

@@ -14,16 +14,14 @@ RENDER_SCENES = [
     ["cbox_ajax_bunny_benchmark.xml", 100, "", ""],
     ["sponza_intersections.xml", 50, "", ""],
     ["sponza_normals.xml", 20, "", ""],
-    ["sponza_benchmark.xml", 2800, "", ""],
+    ["sponza_benchmark.xml", 1000, "", ""],
     ["veach_room_intersections.xml", 10, "", ""],
     ["veach_room_normals.xml", 10, "", ""],
-    ["veach_room_benchmark.xml", 30, "", ""],
-    ["cbox_ajax_bunny_pt.xml", 100, "", ""]
+    ["veach_room_benchmark.xml", 80, "", ""],
+    ["cbox_ajax_bunny_pt.xml", 100, "", ""],
 ]
 
-TEST_SCENES = [
-
-]
+TEST_SCENES = []
 
 TEST_WARPS = []
 
@@ -39,60 +37,70 @@ def find_build_directory():
         return os.path.join(root, "../build")
     return os.path.join(root, "build")
 
+
 def extract_times(text_log, value_for_failure):
     import re
-    
-    pattern_1 = r'# benchmark # Building the acceleration structure took: (.*) s'
-    pattern_2 = r'# benchmark # Rendering took: (.*) s'
-    
+
+    pattern_1 = r"# benchmark # Building the acceleration structure took: (.*) s"
+    pattern_2 = r"# benchmark # Rendering took: (.*) s"
+
     match_1 = re.search(pattern_1, text_log)
     match_2 = re.search(pattern_2, text_log)
-    
+
     build_time = float(match_1.group(1)) if match_1 else -1
     render_time = float(match_2.group(1)) if match_2 else -1
-    
+
     build_time_s = str(round(build_time, 4)) if build_time != -1 else value_for_failure
-    render_time_s = str(round(render_time, 2)) if render_time != -1 else value_for_failure
-    
+    render_time_s = (
+        str(round(render_time, 2)) if render_time != -1 else value_for_failure
+    )
+
     return build_time_s, render_time_s
 
+
 def test_warps_and_scenes():
     total = len(TEST_SCENES) + len(TEST_WARPS)
     passed = 0
     failed = []
     build_dir = find_build_directory()
-    print (build_dir)
+    print(build_dir)
     unit_test_output = open("unit_test_output.csv", "w")
     times_output = open("times.csv", "w")
-    
-    for t, to, skip, skip_to in RENDER_SCENES:        
+
+    for t, to, skip, skip_to in RENDER_SCENES:
         if (skip and os.path.exists(skip)) or (skip_to and os.path.exists(skip_to)):
-            times_output.write(t.replace("_", "\_") + ", skipped, skipped, " + str(round(to, 2)) + "\n")
+            times_output.write(
+                t.replace("_", "\_") + ", skipped, skipped, " + str(round(to, 2)) + "\n"
+            )
             continue
 
         path = t
         try:
             ret: subprocess.CompletedProcess = subprocess.run(
-                [os.path.join(build_dir, "nori"), path, "--no-gui"], 
+                [os.path.join(build_dir, "nori"), path, "--no-gui"],
                 timeout=to,
                 capture_output=True,
-                text=True
+                text=True,
             )
-            
+
             print(ret.stdout)
             print(ret.stderr)
-            bt_s, rt_s = extract_times(ret.stdout, "-" if ret.returncode == 0 else "error")
+            bt_s, rt_s = extract_times(
+                ret.stdout, "-" if ret.returncode == 0 else "error"
+            )
         except subprocess.TimeoutExpired as e:
-            out = e.stdout.decode('utf-8') if e.stdout else ""
-            err = e.stderr.decode('utf-8') if e.stderr else ""
+            out = e.stdout.decode("utf-8") if e.stdout else ""
+            err = e.stderr.decode("utf-8") if e.stderr else ""
             print(out)
             print(err)
             bt_s, rt_s = extract_times(out, "timeout")
-            with open("to_" + t, 'w') as fp:
+            with open("to_" + t, "w") as fp:
                 pass
-            
+
         to_s = str(round(to, 2))
-        times_output.write(t.replace("_", "\_") + ", " + bt_s  + ", " + rt_s + ", " + to_s + "\n")
+        times_output.write(
+            t.replace("_", "\_") + ", " + bt_s + ", " + rt_s + ", " + to_s + "\n"
+        )
 
     for t in TEST_SCENES:
         path = t
@@ -100,15 +108,15 @@ def test_warps_and_scenes():
         ret = subprocess.call([os.path.join(build_dir, "nori"), path])
         end_time = time.time()
         elapsed_time = end_time - start_time
-        elapsed_time_milliSeconds = elapsed_time*1000
+        elapsed_time_milliSeconds = elapsed_time * 1000
         times_output.write(t + ", " + str(int(elapsed_time_milliSeconds)) + "\n")
-        unit_test_output.write(f"{t}; {('passed' if ret == 0 else 'failed')}\n")        
+        unit_test_output.write(f"{t}; {('passed' if ret == 0 else 'failed')}\n")
         if ret == 0:
             passed += 1
         else:
             failed.append(t)
 
-    for (warp_type, param) in TEST_WARPS:
+    for warp_type, param in TEST_WARPS:
         args = [os.path.join(build_dir, "warptest"), warp_type]
         if param is not None:
             if not isinstance(param, (list, tuple)):
@@ -116,29 +124,46 @@ def test_warps_and_scenes():
             for p in param:
                 args.append(str(p))
         ret = subprocess.call(args)
-        unit_test_output.write(f"{warp_type}/{param if param != None else ''}; {('passed' if ret == 0 else 'failed')}\n")
+        unit_test_output.write(
+            f"{warp_type}/{param if param != None else ''}; {('passed' if ret == 0 else 'failed')}\n"
+        )
         if ret == 0:
             passed += 1
         else:
-            failed.append(' '.join(args))
+            failed.append(" ".join(args))
 
     print("")
     if passed < total:
-        print("\033[91m" + "Passed " + str(passed) + " / " + str(total) + " tests." + "\033[0m")
+        print(
+            "\033[91m"
+            + "Passed "
+            + str(passed)
+            + " / "
+            + str(total)
+            + " tests."
+            + "\033[0m"
+        )
         print("Failed tests (includes bonus point tests):")
         for t in failed:
             print("\t" + str(t))
         return False
     else:
-        print("\033[92m" + "Passed " + str(passed) + " / " + str(total) + " tests." + "\033[0m")
+        print(
+            "\033[92m"
+            + "Passed "
+            + str(passed)
+            + " / "
+            + str(total)
+            + " tests."
+            + "\033[0m"
+        )
         print("\tGood job!")
-    
+
     unit_test_output.close()
 
     return True
 
 
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     test_warps_and_scenes()
     sys.exit(0)