Revert "Introduce guard_or_true, guard_or_false (pytorch#148430)"

This reverts commit d5593ea.

Reverted pytorch#148430 on behalf of https://github.com/laithsakka due to need to fix stuff ([comment](pytorch#148430 (comment)))

Author: pytorchmergebot

docs/source/fx.experimental.rst

@@ -40,8 +40,6 @@ torch.fx.experimental.symbolic_shapes
     has_free_unbacked_symbols
     definitely_true
     definitely_false
-    guard_or_true
-    guard_or_false
     guard_size_oblivious
     sym_eq
     constrain_range

test/allowlist_for_publicAPI.json

@@ -2009,8 +2009,6 @@
     "constrain_unify",
     "definitely_false",
     "definitely_true",
-    "guard_or_true",
-    "guard_or_false",
     "error",
     "eval_guards",
     "eval_is_non_overlapping_and_dense",

torch/fx/experimental/sym_node.py

@@ -853,7 +853,6 @@ def _optimized_add(
     from sympy.core.basic import _args_sortkey as sortkey
 
     def make_optimized(ordered_args):
-        print(" optimized")
         result = sympy.Add(*ordered_args, evaluate=False)
         return (True, result)
 
@@ -888,7 +887,6 @@ def make_optimized(ordered_args):
         if new_args is not None:
             return make_optimized(new_args)
 
-    print("not optimized")
     result = sympy.Add(lhs, rhs)
     return (_is_symbols_binary_summation(result), result)
 

torch/fx/experimental/symbolic_shapes.py

@@ -122,8 +122,6 @@ class PendingUnbackedSymbolNotFound(RuntimeError):
 aten = torch._ops.ops.aten  # type: ignore[has-type]
 
 __all__ = [
-    "guard_or_false",
-    "guard_or_true",
     "has_symbolic_sizes_strides",
     "create_contiguous",
     "ShapeEnv",
@@ -1183,38 +1181,6 @@ def compute_unbacked_bindings(
     return symbol_to_path
 
 
-# The following two functions are common utilities used while defining unbacked semantics
-# of various framework code. Those would be used in situations you prefer to guard and know
-# the result of the expression over not guarding, but in case you hit a data dependent error
-# you are ok with just returning true or false.
-# Some reasons you might be ok with returning true/false instead could be:
-#  (1) It's an optimization/additional check I do not want to fail for not performing it.
-#  (2) I am willing to deviate from the normal semantics when I have unbacked for the
-#      benefit of not failing.
-def guard_or_false(a: BoolLikeType) -> bool:
-    """
-    Try to gaurd a, if data dependent error encountered just return false.
-    """
-    if isinstance(a, SymBool):
-        try:
-            guard_bool(a)
-        except GuardOnDataDependentSymNode:
-            return False
-    return bool(a)
-
-
-def guard_or_true(a: BoolLikeType) -> bool:
-    """
-    Try to gaurd a, if data dependent error encountered just return true.
-    """
-    if isinstance(a, SymBool):
-        try:
-            guard_bool(a)
-        except GuardOnDataDependentSymNode:
-            return True
-    return bool(a)
-
-
 def definitely_true(a: BoolLikeType) -> bool:
     """
     Returns True only if we can tell that a is True, possibly introducing