From b20f6ca9e26d90db4e97acf30d9f58f9be737d7a Mon Sep 17 00:00:00 2001 From: Ping Yu <4018+pyu10055@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:00:05 -0800 Subject: [PATCH 1/2] more g3 sync fixes --- .../python/tensorflowjs/converters/converter_test.py | 2 +- .../python/tensorflowjs/converters/generate_test_model.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tfjs-converter/python/tensorflowjs/converters/converter_test.py b/tfjs-converter/python/tensorflowjs/converters/converter_test.py index 749d7621c58..c8e4bf53e36 100644 --- a/tfjs-converter/python/tensorflowjs/converters/converter_test.py +++ b/tfjs-converter/python/tensorflowjs/converters/converter_test.py @@ -502,7 +502,7 @@ def testConvertTfKerasNestedSequentialSavedAsSavedModel(self): model = self._createNestedSequentialModel() old_model_json = json.loads(model.to_json()) old_weights = model.get_weights() - tf.keras.models.save_model(model, self._tmp_dir) + tf.keras.models.save_model(model, self._tmp_dir, save_format='tf') # Convert the keras SavedModel to tfjs format. tfjs_output_dir = os.path.join(self._tmp_dir, 'tfjs') diff --git a/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py b/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py index 03e21867945..9880dbc255a 100644 --- a/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py +++ b/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py @@ -24,9 +24,6 @@ import tensorflow.compat.v2 as tf -tf.enable_eager_execution() - - def parse_args(): parser = argparse.ArgumentParser( 'Generates saved model artifacts for testing.') From a62779f1aef71eca115f2ed2c139c3dd8b6f3cfa Mon Sep 17 00:00:00 2001 From: Ping Yu <4018+pyu10055@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:12:42 -0800 Subject: [PATCH 2/2] more fixes --- tfjs-converter/python/tensorflowjs/converters/converter.py | 2 +- .../python/tensorflowjs/converters/generate_test_model.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tfjs-converter/python/tensorflowjs/converters/converter.py b/tfjs-converter/python/tensorflowjs/converters/converter.py index fb519b33eaf..79fa720eb9d 100644 --- a/tfjs-converter/python/tensorflowjs/converters/converter.py +++ b/tfjs-converter/python/tensorflowjs/converters/converter.py @@ -263,7 +263,7 @@ def dispatch_tensorflowjs_to_keras_saved_model_conversion( with tf.Graph().as_default(), tf.compat.v1.Session(): model = keras_tfjs_loader.load_keras_model(config_json_path) tf.keras.models.save_model( - model, keras_saved_model_path) + model, keras_saved_model_path, save_format='tf') def dispatch_tensorflowjs_to_tensorflowjs_conversion( diff --git a/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py b/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py index 9880dbc255a..ab8e990fc91 100644 --- a/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py +++ b/tfjs-converter/python/tensorflowjs/converters/generate_test_model.py @@ -48,7 +48,7 @@ def main(_): model.add(tf.keras.layers.Dense(1, activation='sigmoid')) model.save(os.path.join(args.output_path)) elif args.model_type == 'tf_saved_model': - class TimesThreePlusOne(tf.train.Checkpoint): + class TimesThreePlusOne(tf.Module): @tf.function(input_signature=[ tf.TensorSpec(shape=None, dtype=tf.float32)])