Skip to content

fix g3 lint error #2502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2019
Merged

fix g3 lint error #2502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aba909
fix g3 lint error
pyu10055 Dec 5, 2019
aad1b04
Merge branch 'master' into fix_g3_errors
pyu10055 Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,12 @@ def test_convert_saved_model_with_fused_conv2d(self):

fusedOp = None
for node in nodes:
self.assertTrue(not 'BatchNorm' in node['op'])
self.assertTrue(not 'Relu' in node['op'])
self.assertTrue(not 'BiasAdd' in node['op'])
self.assertNotIn('BatchNorm', node['op'])
self.assertNotIn('Relu', node['op'])
self.assertNotIn('BiasAdd', node['op'])
if node['op'] == '_FusedConv2D':
fusedOp = node
self.assertTrue(fusedOp is not None)
self.assertIsNot(fusedOp, None)
self.assertEqual(
base64.b64decode(fusedOp['attr']['fused_ops']['list']['s'][0]),
b'BiasAdd')
Expand Down Expand Up @@ -476,12 +476,12 @@ def test_convert_saved_model_with_fused_matmul(self):
nodes = model_json['modelTopology']['node']
fusedOp = None
for node in nodes:
self.assertTrue(node['op'] != 'MatMul')
self.assertTrue(not 'Relu' in node['op'])
self.assertTrue(not 'BiasAdd' in node['op'])
self.assertNotEqual(node['op'], 'MatMul')
self.assertNotIn('Relu', node['op'])
self.assertNotIn('BiasAdd', node['op'])
if node['op'] == graph_rewrite_util.FUSED_MATMUL:
fusedOp = node
self.assertTrue(fusedOp is not None)
self.assertIsNot(fusedOp, None)
self.assertIsNot(fusedOp['attr']['transpose_a'], None)
self.assertIsNot(fusedOp['attr']['transpose_b'], None)
self.assertEqual(
Expand Down Expand Up @@ -524,12 +524,12 @@ def test_convert_saved_model_with_fused_depthwise_conv2d(self):

fusedOp = None
for node in nodes:
self.assertTrue(not 'BatchNorm' in node['op'])
self.assertTrue(not 'Relu' in node['op'])
self.assertTrue(not 'BiasAdd' in node['op'])
self.assertNotIn('BatchNorm', node['op'])
self.assertNotIn('Relu', node['op'])
self.assertNotIn('BiasAdd', node['op'])
if node['op'] == graph_rewrite_util.FUSED_DEPTHWISE_CONV2D:
fusedOp = node
self.assertTrue(fusedOp is not None)
self.assertIsNot(fusedOp, None)
self.assertIsNot(fusedOp['attr']['dilations'], None)
self.assertIsNot(fusedOp['attr']['strides'], None)
self.assertEqual(
Expand Down Expand Up @@ -581,8 +581,8 @@ def test_convert_saved_model_with_prelu(self):
if node['op'] == graph_rewrite_util.FUSED_DEPTHWISE_CONV2D:
depthwise_fused_op = node
self.assertTrue(prelu_op is None)
self.assertTrue(fused_op is not None)
self.assertTrue(depthwise_fused_op is not None)
self.assertIsNot(fused_op, None)
self.assertIsNot(depthwise_fused_op, None)

fused_ops = list(map(base64.b64decode,
fused_op['attr']['fused_ops']['list']['s']))
Expand Down