Skip to content

Commit 677bd69

Browse files
pyu10055pyu10055
authored
Fix g3 errors (tensorflow#2311)
* fix g3 errors * revert changes to the comment quotes * more pylint fix * revert quote changes
1 parent d55daa6 commit 677bd69

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

‎tfjs-converter/python/tensorflowjs/converters/converter_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def testConvertKerasModelToTfGraphModel(self):
302302
with open(os.path.join(output_dir, 'model.json'), 'rt') as f:
303303
model_json = json.load(f)
304304
self.assertTrue(model_json['modelTopology'])
305-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
305+
self.assertIsNot(model_json['modelTopology']['versions'], None)
306306
weights_manifest = model_json['weightsManifest']
307307
self.assertEqual(len(weights_manifest), 1)
308308
# Check meta-data in the artifact JSON.

‎tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ def test_convert_saved_model_v1(self):
296296
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
297297
model_json = json.load(f)
298298
self.assertTrue(model_json['modelTopology'])
299-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
299+
self.assertIsNot(model_json['modelTopology']['versions'], None)
300300
weights_manifest = model_json['weightsManifest']
301301
self.assertCountEqual(weights_manifest[0]['paths'],
302302
['group1-shard1of1.bin'])
@@ -330,7 +330,7 @@ def test_convert_saved_model_v1_with_hashtable(self):
330330
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
331331
model_json = json.load(f)
332332
self.assertTrue(model_json['modelTopology'])
333-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
333+
self.assertIsNot(model_json['modelTopology']['versions'], None)
334334
weights_manifest = model_json['weightsManifest']
335335
self.assertEqual(weights_manifest, expected_weights_manifest)
336336
# Check meta-data in the artifact JSON.
@@ -355,7 +355,7 @@ def test_convert_saved_model(self):
355355
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
356356
model_json = json.load(f)
357357
self.assertTrue(model_json['modelTopology'])
358-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
358+
self.assertIsNot(model_json['modelTopology']['versions'], None)
359359
weights_manifest = model_json['weightsManifest']
360360
self.assertCountEqual(weights_manifest[0]['paths'],
361361
['group1-shard1of1.bin'])
@@ -373,7 +373,7 @@ def test_convert_saved_model_with_fused_conv2d(self):
373373
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
374374
model_json = json.load(f)
375375
self.assertTrue(model_json['modelTopology'])
376-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
376+
self.assertIsNot(model_json['modelTopology']['versions'], None)
377377
nodes = model_json['modelTopology']['node']
378378

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

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

460460
prelu_op = None
@@ -489,7 +489,7 @@ def test_convert_saved_model_with_control_flow(self):
489489
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
490490
model_json = json.load(f)
491491
self.assertTrue(model_json['modelTopology'])
492-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
492+
self.assertIsNot(model_json['modelTopology']['versions'], None)
493493
weights_manifest = model_json['weightsManifest']
494494
self.assertCountEqual(weights_manifest[0]['paths'],
495495
['group1-shard1of1.bin'])
@@ -528,7 +528,7 @@ def test_convert_saved_model_skip_op_check(self):
528528
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
529529
model_json = json.load(f)
530530
self.assertTrue(model_json['modelTopology'])
531-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
531+
self.assertIsNot(model_json['modelTopology']['versions'], None)
532532
weights_manifest = model_json['weightsManifest']
533533
self.assertCountEqual(weights_manifest[0]['paths'],
534534
['group1-shard1of1.bin'])
@@ -553,7 +553,7 @@ def test_convert_saved_model_strip_debug_ops(self):
553553
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
554554
model_json = json.load(f)
555555
self.assertTrue(model_json['modelTopology'])
556-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
556+
self.assertIsNot(model_json['modelTopology']['versions'], None)
557557
weights_manifest = model_json['weightsManifest']
558558
self.assertCountEqual(weights_manifest[0]['paths'],
559559
['group1-shard1of1.bin'])
@@ -573,7 +573,7 @@ def test_convert_hub_module_v1(self):
573573
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
574574
model_json = json.load(f)
575575
self.assertTrue(model_json['modelTopology'])
576-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
576+
self.assertIsNot(model_json['modelTopology']['versions'], None)
577577
weights_manifest = model_json['weightsManifest']
578578
self.assertCountEqual(weights_manifest[0]['paths'],
579579
['group1-shard1of1.bin'])
@@ -595,7 +595,7 @@ def test_convert_hub_module_v2(self):
595595
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
596596
model_json = json.load(f)
597597
self.assertTrue(model_json['modelTopology'])
598-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
598+
self.assertIsNot(model_json['modelTopology']['versions'], None)
599599
weights_manifest = model_json['weightsManifest']
600600
self.assertCountEqual(weights_manifest[0]['paths'],
601601
['group1-shard1of1.bin'])
@@ -620,8 +620,7 @@ def test_convert_frozen_model(self):
620620
with open(os.path.join(tfjs_path, 'model.json'), 'rt') as f:
621621
model_json = json.load(f)
622622
self.assertTrue(model_json['modelTopology'])
623-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
624-
weights_manifest = model_json['weightsManifest']
623+
self.assertIsNot(model_json['modelTopology']['versions'], None)
625624
weights_manifest = model_json['weightsManifest']
626625
self.assertCountEqual(weights_manifest[0]['paths'],
627626
['group1-shard1of1.bin'])

‎tfjs-converter/python/test_pip_package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ def testConvertTFFrozenModelWithCommandLineWorks(self):
560560
with open(os.path.join(output_dir, 'model.json'), 'rt') as f:
561561
model_json = json.load(f)
562562
self.assertTrue(model_json['modelTopology'])
563-
self.assertTrue(model_json['modelTopology']['versions'] is not None)
563+
self.assertIsNot(model_json['modelTopology']['versions'], None)
564564
weights_manifest = model_json['weightsManifest']
565565
weights_manifest = model_json['weightsManifest']
566566
self.assertCountEqual(weights_manifest[0]['paths'],

0 commit comments

Comments
 (0)