Skip to content

Fix g3 errors #2311

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 5 commits into from
Nov 1, 2019
Merged

Fix g3 errors #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c5acdc
fix g3 errors
pyu10055 Nov 1, 2019
017bfd8
revert changes to the comment quotes
pyu10055 Nov 1, 2019
f03f929
more pylint fix
pyu10055 Nov 1, 2019
1acb611
revert quote changes
pyu10055 Nov 1, 2019
f386cf2
merged master
pyu10055 Nov 1, 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
2 changes: 1 addition & 1 deletion tfjs-converter/python/tensorflowjs/converters/converter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def testConvertKerasModelToTfGraphModel(self):
with open(os.path.join(output_dir, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertEqual(len(weights_manifest), 1)
# Check meta-data in the artifact JSON.
Expand Down
25 changes: 12 additions & 13 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 @@ -296,7 +296,7 @@ def test_convert_saved_model_v1(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand Down Expand Up @@ -330,7 +330,7 @@ def test_convert_saved_model_v1_with_hashtable(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertEqual(weights_manifest, expected_weights_manifest)
# Check meta-data in the artifact JSON.
Expand All @@ -355,7 +355,7 @@ def test_convert_saved_model(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand All @@ -373,7 +373,7 @@ def test_convert_saved_model_with_fused_conv2d(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
nodes = model_json['modelTopology']['node']

fusedOp = None
Expand Down Expand Up @@ -414,7 +414,7 @@ def test_convert_saved_model_with_prelu(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
nodes = model_json['modelTopology']['node']

prelu_op = None
Expand Down Expand Up @@ -454,7 +454,7 @@ def test_convert_saved_model_with_unfusable_prelu(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
nodes = model_json['modelTopology']['node']

prelu_op = None
Expand Down Expand Up @@ -489,7 +489,7 @@ def test_convert_saved_model_with_control_flow(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand Down Expand Up @@ -528,7 +528,7 @@ def test_convert_saved_model_skip_op_check(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand All @@ -553,7 +553,7 @@ def test_convert_saved_model_strip_debug_ops(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand All @@ -573,7 +573,7 @@ def test_convert_hub_module_v1(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand All @@ -595,7 +595,7 @@ def test_convert_hub_module_v2(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand All @@ -620,8 +620,7 @@ def test_convert_frozen_model(self):
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
weights_manifest = model_json['weightsManifest']
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
['group1-shard1of1.bin'])
Expand Down
2 changes: 1 addition & 1 deletion tfjs-converter/python/test_pip_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ def testConvertTFFrozenModelWithCommandLineWorks(self):
with open(os.path.join(output_dir, 'model.json'), 'rt') as f:
model_json = json.load(f)
self.assertTrue(model_json['modelTopology'])
self.assertTrue(model_json['modelTopology']['versions'] is not None)
self.assertIsNot(model_json['modelTopology']['versions'], None)
weights_manifest = model_json['weightsManifest']
weights_manifest = model_json['weightsManifest']
self.assertCountEqual(weights_manifest[0]['paths'],
Expand Down