[ONNX] Diagnostic option 'warnings_as_errors'

test/onnx/internal/test_diagnostics.py

@@ -319,6 +319,30 @@ def test_diagnostic_context_raises_if_diagnostic_is_error(self):
                 )
             )
 
+    def test_diagnostic_context_raises_original_exception_from_diagnostic_created_from_it(
+        self,
+    ):
+        with self.assertRaises(ValueError):
+            try:
+                raise ValueError("original exception")
+            except ValueError as e:
+                diagnostic = infra.Diagnostic(
+                    self.rules.rule_without_message_args, infra.Level.ERROR
+                )
+                diagnostic = diagnostic.with_source_exception(e)
+                self.context.log_and_raise_if_error(diagnostic)
+
+    def test_diagnostic_context_raises_if_diagnostic_is_warning_and_warnings_as_errors_is_true(
+        self,
+    ):
+        with self.assertRaises(infra.RuntimeErrorWithDiagnostic):
+            self.context.options.warnings_as_errors = True
+            self.context.log_and_raise_if_error(
+                infra.Diagnostic(
+                    self.rules.rule_without_message_args, infra.Level.WARNING
+                )
+            )
+
 
 if __name__ == "__main__":
     common_utils.run_tests()

torch/onnx/_internal/diagnostics/infra/_infra.py

@@ -323,3 +323,5 @@ class DiagnosticOptions:
 
     log_verbose: bool = dataclasses.field(default=False)
     log_level: Level = dataclasses.field(default=Level.ERROR)
+    warnings_as_errors: bool = dataclasses.field(default=False)
+    """If True, warnings are treated as errors."""

torch/onnx/_internal/diagnostics/infra/context.py

@@ -255,16 +255,18 @@ def log(self, diagnostic: Diagnostic) -> None:
             raise TypeError(
                 f"Expected diagnostic of type {Diagnostic}, got {type(diagnostic)}"
             )
+        if self.options.warnings_as_errors and diagnostic.level == infra.Level.WARNING:
+            diagnostic.level = infra.Level.ERROR
         self.diagnostics.append(diagnostic)
         self.logger.log(diagnostic.level, diagnostic.message)
         self.logger.log(diagnostic.level, diagnostic.additional_message)
 
     def log_and_raise_if_error(self, diagnostic: Diagnostic) -> None:
         self.log(diagnostic)
         if diagnostic.level == infra.Level.ERROR:
-            raise RuntimeErrorWithDiagnostic(
-                diagnostic
-            ) from diagnostic.source_exception
+            if diagnostic.source_exception is not None:
+                raise diagnostic.source_exception
+            raise RuntimeErrorWithDiagnostic(diagnostic)
 
     @contextlib.contextmanager
     def add_inflight_diagnostic(