Allows cudnn convolution algorithms to proceed when only find one type of algorithm (between with scratch or without scratch).

Remove valid_ and set_is_valid() in dnn::ProfileResult, instead use (algorithm_ != kDefaultAlgorithm) to see if the result is valid.

PiperOrigin-RevId: 163931258

1 files changed, 9 insertions, 10 deletions

diff --git a/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc b/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc
index d553d5a0a6..dc0701b234 100644
--- a/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc
+++ b/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc
@@ -444,17 +444,16 @@ void LaunchFusedConv2DBiasActivationOp<GPUDevice, T>::launch(
         }
       }
     }
-    OP_REQUIRES(
-        ctx,
-        best_result.is_valid() && best_result.algorithm() != kDefaultAlgorithm,
-        errors::NotFound("No algorithm worked!"));
     OP_REQUIRES(ctx,
-                best_result_no_scratch.is_valid() &&
-                    best_result_no_scratch.algorithm() != kDefaultAlgorithm,
-                errors::NotFound("No algorithm without scratch worked!"));
-    algorithm_config.set_algorithm(best_result.algorithm());
-    algorithm_config.set_algorithm_no_scratch(
-        best_result_no_scratch.algorithm());
+                best_result.is_valid() || best_result_no_scratch.is_valid(),
+                errors::NotFound("No algorithm worked!"));
+    if (best_result.is_valid()) {
+      algorithm_config.set_algorithm(best_result.algorithm());
+    }
+    if (best_result_no_scratch.is_valid()) {
+      algorithm_config.set_algorithm_no_scratch(
+          best_result_no_scratch.algorithm());
+    }
     AutoTuneConvBiasActivation::GetInstance()->Insert(conv_parameters,
                                                       algorithm_config);
   }