diff --git a/onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc b/onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc index 4db47264e3..9faa9c8a4c 100644 --- a/onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc +++ b/onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc @@ -64,19 +64,28 @@ static void RunTest(const embedlayernorm::OpData& data, if (use_float16) { tester.AddInput("word_embedding", word_embedding_dims, - ToFloat16(data.word_embedding_data)); + ToFloat16(data.word_embedding_data), + /*is_initializer=*/true); tester.AddInput("position_embedding", position_embedding_dims, - ToFloat16(data.position_embedding_data)); + ToFloat16(data.position_embedding_data), + /*is_initializer=*/true); if (!data.has_segment) { tester.AddMissingOptionalInput(); } else { tester.AddInput("segment_embedding", segment_embedding_dims, - ToFloat16(data.segment_embedding_data)); + ToFloat16(data.segment_embedding_data), + /*is_initializer=*/true); } - tester.AddInput("gamma", gamma_dims, ToFloat16(data.gamma_data)); - tester.AddInput("beta", beta_dims, ToFloat16(data.beta_data)); + tester.AddInput("gamma", + gamma_dims, + ToFloat16(data.gamma_data), + /*is_initializer=*/true); + tester.AddInput("beta", + beta_dims, + ToFloat16(data.beta_data), + /*is_initializer=*/true); tester.AddAttribute("epsilon", data.epsilon); if (data.has_mask) { tester.AddInput("mask", mask_dims, data.mask_data); @@ -85,19 +94,22 @@ static void RunTest(const embedlayernorm::OpData& data, } else { tester.AddInput("word_embedding", word_embedding_dims, - data.word_embedding_data); + data.word_embedding_data, + /*is_initializer=*/true); tester.AddInput("position_embedding", position_embedding_dims, - data.position_embedding_data); + data.position_embedding_data, + /*is_initializer=*/true); if (!data.has_segment) { tester.AddMissingOptionalInput(); } else { tester.AddInput("segment_embedding", segment_embedding_dims, - data.segment_embedding_data); + data.segment_embedding_data, + /*is_initializer=*/true); } - tester.AddInput("gamma", gamma_dims, data.gamma_data); - tester.AddInput("beta", beta_dims, data.beta_data); + tester.AddInput("gamma", gamma_dims, data.gamma_data, /*is_initializer=*/true); + tester.AddInput("beta", beta_dims, data.beta_data, /*is_initializer=*/true); tester.AddAttribute("epsilon", data.epsilon); if (data.has_mask) { tester.AddInput("mask", mask_dims, data.mask_data); diff --git a/onnxruntime/test/contrib_ops/qembed_layer_norm_op_test.cc b/onnxruntime/test/contrib_ops/qembed_layer_norm_op_test.cc index 6d0b08fbc2..1a19376ce5 100644 --- a/onnxruntime/test/contrib_ops/qembed_layer_norm_op_test.cc +++ b/onnxruntime/test/contrib_ops/qembed_layer_norm_op_test.cc @@ -13,22 +13,22 @@ namespace test { namespace { static void RunTest(const embedlayernorm::OpData& data, - float accuracy_threshold = 0.25f) { + float accuracy_threshold = 0.25f) { ASSERT_TRUE(data.word_embedding_data.size() % data.hidden_size == 0); ASSERT_TRUE(data.position_embedding_data.size() % data.hidden_size == 0); ASSERT_TRUE(data.segment_embedding_data.size() % data.hidden_size == 0); std::vector input_ids_dims = {data.batch_size, data.sequence_size}; std::vector segment_ids_dims = {data.batch_size, data.sequence_size}; - std::vector word_embedding_dims = { - static_cast(data.word_embedding_data.size() / data.hidden_size), - data.hidden_size}; - std::vector position_embedding_dims = { - static_cast(data.position_embedding_data.size() / data.hidden_size), - data.hidden_size}; - std::vector segment_embedding_dims = { - static_cast(data.segment_embedding_data.size() / data.hidden_size), - data.hidden_size}; + std::vector word_embedding_dims = { + static_cast(data.word_embedding_data.size() / data.hidden_size), + data.hidden_size}; + std::vector position_embedding_dims = { + static_cast(data.position_embedding_data.size() / data.hidden_size), + data.hidden_size}; + std::vector segment_embedding_dims = { + static_cast(data.segment_embedding_data.size() / data.hidden_size), + data.hidden_size}; std::vector gamma_dims = {data.hidden_size}; std::vector beta_dims = {data.hidden_size}; std::vector output_dims = {data.batch_size, data.sequence_size, data.hidden_size}; @@ -80,23 +80,28 @@ static void RunTest(const embedlayernorm::OpData& data, // Quantized initializer inputs: tester.AddInput("word_embedding_data", word_embedding_dims, - word_embedding_data_quant); + word_embedding_data_quant, + /*is_initializer=*/true); tester.AddInput("position_embedding_data", position_embedding_dims, - position_embedding_data_quant); + position_embedding_data_quant, + /*is_initializer=*/true); if (data.has_segment) { tester.AddInput("segment_embedding_data", segment_embedding_dims, - segment_embedding_data_quant); + segment_embedding_data_quant, + /*is_initializer=*/true); } else { tester.AddMissingOptionalInput(); } tester.AddInput("gamma", gamma_dims, - gamma_data_quant); + gamma_data_quant, + /*is_initializer=*/true); tester.AddInput("beta", beta_dims, - beta_data_quant); + beta_data_quant, + /*is_initializer=*/true); if (data.has_mask) { std::vector mask_dims = {data.batch_size, data.sequence_size}; tester.AddInput("mask", mask_dims, data.mask_data); @@ -107,44 +112,54 @@ static void RunTest(const embedlayernorm::OpData& data, // Quantized scales: tester.AddInput("word_embedding_scale", /*dims=*/{}, - {word_embedding_scale}); + {word_embedding_scale}, + /*is_initializer=*/true); tester.AddInput("position_embedding_scale", /*dims=*/{}, - {position_embedding_scale}); + {position_embedding_scale}, + /*is_initializer=*/true); if (data.has_segment) { tester.AddInput("segment_embedding_scale", /*dims=*/{}, - {segment_embedding_scale}); + {segment_embedding_scale}, + /*is_initializer=*/true); } else { tester.AddMissingOptionalInput(); } tester.AddInput("gamma_scale", /*dims=*/{}, - {gamma_scale}); + {gamma_scale}, + /*is_initializer=*/true); tester.AddInput("beta_scale", /*dims=*/{}, - {beta_scale}); + {beta_scale}, + /*is_initializer=*/true); // Quantized zero points: tester.AddInput("word_embedding_zero_point", /*dims=*/{}, - {word_embedding_zero_point}); + {word_embedding_zero_point}, + /*is_initializer=*/true); tester.AddInput("position_embedding_zero_point", /*dims=*/{}, - {position_embedding_zero_point}); + {position_embedding_zero_point}, + /*is_initializer=*/true); if (data.has_segment) { tester.AddInput("segment_embedding_zero_point", /*dims=*/{}, - {segment_embedding_zero_point}); + {segment_embedding_zero_point}, + /*is_initializer=*/true); } else { tester.AddMissingOptionalInput(); } tester.AddInput("gamma_zero_point", /*dims=*/{}, - {gamma_zero_point}); + {gamma_zero_point}, + /*is_initializer=*/true); tester.AddInput("beta_zero_point", /*dims=*/{}, - {beta_zero_point}); + {beta_zero_point}, + /*is_initializer=*/true); // Outputs: tester.AddOutput("output", output_dims, data.output_data); tester.AddOutput("mask_index", mask_index_dims, data.mask_index_data);