diff options
| author |  Guangda Lai <laigd@google.com> | 2018-09-18 08:30:46 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-18 08:35:03 -0700 |
| commit | 18b47f08b13c628ef87d9a99f7fde743baca5300 (patch) | |
| tree | 1707552187457292ea49cde0a124ed6a73514dc6 /tensorflow/contrib/tensorrt | |
| parent | 25c99131362f034c3bc3805d741f0c4ab9d0cb8b (diff) | |
Automated rollback of commit 19d66a950e2091bb598c6a2d375e14208f5773b2
PiperOrigin-RevId: 213453719
Diffstat (limited to 'tensorflow/contrib/tensorrt')
| -rw-r--r-- | tensorflow/contrib/tensorrt/BUILD | 21 | ||||
| -rw-r--r-- | tensorflow/contrib/tensorrt/test/base_test.py | 6 | ||||
| -rw-r--r-- | tensorflow/contrib/tensorrt/test/tf_trt_integration_test_base.py | 5 |
3 files changed, 10 insertions, 22 deletions
diff --git a/tensorflow/contrib/tensorrt/BUILD b/tensorflow/contrib/tensorrt/BUILD index 4ea7216ef2..9e8979bce4 100644 --- a/tensorflow/contrib/tensorrt/BUILD +++ b/tensorflow/contrib/tensorrt/BUILD @@ -444,6 +444,7 @@ cuda_py_test( cuda_py_tests( name = "tf_trt_integration_test", srcs = [ + "test/base_test.py", "test/batch_matmul_test.py", "test/biasadd_matmul_test.py", "test/binary_tensor_weight_broadcast_test.py", @@ -470,26 +471,6 @@ cuda_py_tests( ], ) -cuda_py_tests( - name = "base_test", - srcs = [ - "test/base_test.py", - ], - additional_deps = [ - ":tf_trt_integration_test_base", - "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", - ], - tags = [ - "manual", - "no_cuda_on_cpu_tap", - "no_gpu", - "no_windows", - "nomac", - "notap", - ], -) - cc_library( name = "utils", srcs = ["convert/utils.cc"], diff --git a/tensorflow/contrib/tensorrt/test/base_test.py b/tensorflow/contrib/tensorrt/test/base_test.py index e9ac833d55..7e9ffb05ab 100644 --- a/tensorflow/contrib/tensorrt/test/base_test.py +++ b/tensorflow/contrib/tensorrt/test/base_test.py @@ -183,6 +183,12 @@ class PartiallyConvertedTestA(trt_test.TfTrtIntegrationTestBase): "my_trt_op_0": ["c0", "c1", "add0", "add1", "mul0", "mul1"] } + def ShouldRunTest(self, run_params): + """Whether to run the test.""" + # Disable the test in fp16 mode since multiple matmul and add ops together + # can cause overflow. + return run_params.precision_mode != "FP16" + class PartiallyConvertedTestB(PartiallyConvertedTestA): diff --git a/tensorflow/contrib/tensorrt/test/tf_trt_integration_test_base.py b/tensorflow/contrib/tensorrt/test/tf_trt_integration_test_base.py index fc647e4eb9..699f79adec 100644 --- a/tensorflow/contrib/tensorrt/test/tf_trt_integration_test_base.py +++ b/tensorflow/contrib/tensorrt/test/tf_trt_integration_test_base.py @@ -179,11 +179,11 @@ class TfTrtIntegrationTestBase(test_util.TensorFlowTestCase): def ExpectedAbsoluteTolerance(self, run_params): """The absolute tolerance to compare floating point results.""" - return 1.e-06 if run_params.precision_mode == "FP32" else 1.e-03 + return 1.e-05 if run_params.precision_mode == "FP32" else 1.e-02 def ExpectedRelativeTolerance(self, run_params): """The relative tolerance to compare floating point results.""" - return 1.e-06 if run_params.precision_mode == "FP32" else 1.e-03 + return 1.e-05 if run_params.precision_mode == "FP32" else 1.e-02 def _GetParamsCached(self): if self._trt_test_params is None: @@ -414,6 +414,7 @@ class TfTrtIntegrationTestBase(test_util.TensorFlowTestCase): if not self.ShouldRunTest(run_params): return assert run_params.precision_mode in PRECISION_MODES + np.random.seed(12345) params = self._GetParamsCached() input_gdef = params.gdef |