Fix recursive is building check

Author: vzhurba01

cuda_core/cuda/core/experimental/_graph.py

@@ -239,9 +239,8 @@ def is_building(self) -> bool:
         elif capture_status == driver.CUstreamCaptureStatus.CU_STREAM_CAPTURE_STATUS_ACTIVE:
             return True
         elif capture_status == driver.CUstreamCaptureStatus.CU_STREAM_CAPTURE_STATUS_INVALIDATED:
-            self.end_building()
             raise RuntimeError(
-                "Build process encountered an error and has been invalidated. Build process has been ended."
+                "Build process encountered an error and has been invalidated. Build process must now be ended."
             )
         else:
             raise NotImplementedError(f"Unsupported capture status type received: {capture_status}")
@@ -277,6 +276,14 @@ def complete(self, options: Optional[CompleteOptions] = None) -> Graph:
         if not self._building_ended:
             raise RuntimeError("Graph has not finished building.")
 
+        if _driver_ver < 12000:
+            flags = 0
+            if options.auto_free_on_launch:
+                flags |= driver.CUgraphInstantiate_flags.CUDA_GRAPH_INSTANTIATE_FLAG_AUTO_FREE_ON_LAUNCH
+            if options.use_node_priority:
+                flags |= driver.CUgraphInstantiate_flags.CUDA_GRAPH_INSTANTIATE_FLAG_USE_NODE_PRIORITY
+            graph = Graph._init(handle_return(driver.cuGraphInstantiateWithFlags(self._mnff.graph, flags)))
+
         params = driver.CUDA_GRAPH_INSTANTIATE_PARAMS()
         if options:
             flags = 0

cuda_core/tests/test_graph.py

@@ -225,7 +225,13 @@ def test_graph_conditional_if(init_cuda, condition_value):
     gb = Device().create_graph_builder().begin_building()
 
     # Add Node A (sets condition)
-    handle = gb.create_conditional_handle()
+    try:
+        handle = gb.create_conditional_handle()
+    except RuntimeError as e:
+        with pytest.raises(RuntimeError, match="^Driver version \d+ does not support conditional handles"):
+            raise e
+        gb.end_building()
+        pytest.skip("Driver does not support conditional handle")
     launch(gb, LaunchConfig(grid=1, block=1), set_handle, handle, condition_value)
 
     # # Add Node B (if condition)
@@ -283,7 +289,7 @@ def test_graph_conditional_if_else(init_cuda, condition_value):
     try:
         gb_if, gb_else = gb.if_else(handle)
     except RuntimeError as e:
-        with pytest.raises(RuntimeError, match="does not support conditional"):
+        with pytest.raises(RuntimeError, match="^Driver version \d+ does not support conditional if-else"):
             raise e
         gb.end_building()
         pytest.skip("Driver does not support conditional if-else")
@@ -351,7 +357,7 @@ def test_graph_conditional_switch(init_cuda, condition_value):
     try:
         gb_case = list(gb.switch(handle, 3))
     except RuntimeError as e:
-        with pytest.raises(RuntimeError, match="does not support conditional"):
+        with pytest.raises(RuntimeError, match="^Driver version \d+ does not support conditional switch"):
             raise e
         gb.end_building()
         pytest.skip("Driver does not support conditional switch")
@@ -485,7 +491,7 @@ def test_graph_child_graph(init_cuda):
     except NotImplementedError as e:
         with pytest.raises(
             NotImplementedError,
-            match="^Launching child graphs is not implemented for versions older than CUDA 12. Found driver version is",
+            match="^Launching child graphs is not implemented for versions older than CUDA 12",
         ):
             raise e
         gb_parent.end_building()
@@ -528,7 +534,7 @@ def build_graph(condition_value):
         try:
             gb_case = list(gb.switch(handle, 3))
         except RuntimeError as e:
-            with pytest.raises(RuntimeError, match="does not support conditional"):
+            with pytest.raises(RuntimeError, match="^Driver version \d+ does not support conditional switch"):
                 raise e
             gb.end_building()
             pytest.skip("Driver does not support conditional switch")