Skip to content

Commit bbafd36

Browse files
committed
Don't save traces for saved model
We check compilation elsewhere, adding this option significantly speeds up saved model testing. Roughly 3x for the tf format.
1 parent 794c4b1 commit bbafd36

File tree

64 files changed

+121
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+121
-75
lines changed

keras_nlp/layers/f_net_encoder_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_saved_model(self, save_format, filename):
133133
data = tf.random.uniform(shape=[2, 4, 6])
134134
model(data)
135135
path = os.path.join(self.get_temp_dir(), filename)
136-
model.save(path, save_format=save_format)
136+
model.save(path, save_traces=False, save_format=save_format)
137137
loaded_model = keras.models.load_model(path)
138138

139139
model_output = model(data)

keras_nlp/layers/multi_segment_packer_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def test_saved_model(self, save_format, filename):
178178
outputs = packer(inputs)
179179
model = keras.Model(inputs, outputs)
180180
path = os.path.join(self.get_temp_dir(), filename)
181-
model.save(path, save_format=save_format)
181+
model.save(path, save_traces=False, save_format=save_format)
182182
restored_model = keras.models.load_model(path)
183183
self.assertAllEqual(
184184
model((seq1, seq2)),

keras_nlp/layers/position_embedding_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def test_saved_model(self, save_format, filename):
309309
model(data)
310310

311311
path = os.path.join(self.get_temp_dir(), filename)
312-
model.save(path, save_format=save_format)
312+
model.save(path, save_traces=False, save_format=save_format)
313313
loaded_model = keras.models.load_model(path)
314314

315315
model_output = model.predict(data)

keras_nlp/layers/token_and_position_embedding_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def test_saved_model(self, save_format, filename):
148148
model(data)
149149

150150
path = os.path.join(self.get_temp_dir(), filename)
151-
model.save(path, save_format=save_format)
151+
model.save(path, save_traces=False, save_format=save_format)
152152
loaded_model = keras.models.load_model(path)
153153

154154
model_output = model.predict(data)

keras_nlp/layers/transformer_decoder_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def test_saved_model(self, save_format, filename):
332332
decoder_sequence = tf.random.uniform(shape=[2, 4, 6])
333333
model([decoder_sequence, encoder_sequence])
334334
path = os.path.join(self.get_temp_dir(), filename)
335-
model.save(path, save_format=save_format)
335+
model.save(path, save_traces=False, save_format=save_format)
336336

337337
loaded_model = keras.models.load_model(path)
338338
model_output = model([decoder_sequence, encoder_sequence])
@@ -358,7 +358,7 @@ def test_saved_model_without_cross_attention(self, save_format, filename):
358358
decoder_sequence = tf.random.uniform(shape=[2, 4, 6])
359359
model(decoder_sequence)
360360
path = os.path.join(self.get_temp_dir(), filename)
361-
model.save(path, save_format=save_format)
361+
model.save(path, save_traces=False, save_format=save_format)
362362
loaded_model = keras.models.load_model(path)
363363

364364
model_output = model(decoder_sequence)

keras_nlp/layers/transformer_encoder_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def test_saved_model(self, save_format, filename):
176176
data = tf.random.uniform(shape=[2, 4, 6])
177177
model_output = model(data)
178178
path = os.path.join(self.get_temp_dir(), filename)
179-
model.save(path, save_format=save_format)
179+
model.save(path, save_traces=False, save_format=save_format)
180180

181181
loaded_model = keras.models.load_model(path)
182182
loaded_model_output = loaded_model(data)

keras_nlp/models/albert/albert_backbone_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ def test_error_for_invalid_num_groups(self):
9494
def test_saved_model(self, save_format, filename):
9595
model_output = self.backbone(self.input_batch)
9696
save_path = os.path.join(self.get_temp_dir(), filename)
97-
self.backbone.save(save_path, save_format=save_format)
97+
self.backbone.save(
98+
save_path, save_traces=False, save_format=save_format
99+
)
98100
restored_model = keras.models.load_model(save_path)
99101

100102
# Check we got the real object back.

keras_nlp/models/albert/albert_classifier_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ def test_serialization(self):
126126
def test_saving_model(self, save_format, filename):
127127
model_output = self.classifier.predict(self.raw_batch)
128128
save_path = os.path.join(self.get_temp_dir(), filename)
129-
self.classifier.save(save_path, save_format=save_format)
129+
self.classifier.save(
130+
save_path, save_traces=False, save_format=save_format
131+
)
130132
restored_model = keras.models.load_model(save_path)
131133

132134
# Check we got the real object back

keras_nlp/models/albert/albert_masked_lm_preprocessor_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def test_saved_model(self, save_format, filename):
164164
model = keras.Model(inputs, outputs)
165165

166166
path = os.path.join(self.get_temp_dir(), filename)
167-
model.save(path, save_format=save_format)
167+
model.save(path, save_traces=False, save_format=save_format)
168168

169169
restored_model = keras.models.load_model(path)
170170
outputs = model(input_data)[0]["token_ids"]

keras_nlp/models/albert/albert_masked_lm_test.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ def test_classifier_fit_no_xla(self):
131131
def test_saved_model(self, save_format, filename):
132132
model_output = self.masked_lm.predict(self.raw_batch)
133133
save_path = os.path.join(self.get_temp_dir(), filename)
134-
self.masked_lm.save(save_path, save_format=save_format)
134+
self.masked_lm.save(
135+
save_path, save_traces=False, save_format=save_format
136+
)
135137
restored_model = keras.models.load_model(save_path)
136138

137139
# Check we got the real object back.
138140
self.assertIsInstance(restored_model, AlbertMaskedLM)
139141
# Check that output matches.
140142
restored_output = restored_model.predict(self.raw_batch)
141-
self.assertAllClose(model_output, restored_output)
143+
self.assertAllClose(model_output, restored_output, atol=0.01, rtol=0.01)

0 commit comments

Comments
 (0)