diff --git a/tfjs-converter/python/tensorflowjs/converters/converter_test.py b/tfjs-converter/python/tensorflowjs/converters/converter_test.py index 06d6aafdd64..fa1fc5fb940 100644 --- a/tfjs-converter/python/tensorflowjs/converters/converter_test.py +++ b/tfjs-converter/python/tensorflowjs/converters/converter_test.py @@ -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. diff --git a/tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py b/tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py index 2b8827030ec..46797d5a586 100644 --- a/tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py +++ b/tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2_test.py @@ -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']) @@ -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. @@ -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']) @@ -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 @@ -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 @@ -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 @@ -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']) @@ -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']) @@ -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']) @@ -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']) @@ -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']) @@ -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']) diff --git a/tfjs-converter/python/test_pip_package.py b/tfjs-converter/python/test_pip_package.py index b97c91fa1db..5a07f3faa48 100644 --- a/tfjs-converter/python/test_pip_package.py +++ b/tfjs-converter/python/test_pip_package.py @@ -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'],