Copilot and formatting changes

Author: TedThemistokleous

src/onnx/parse_multi_head_attention.cpp

@@ -532,14 +532,13 @@ struct parse_multi_head_attention : op_parser<parse_multi_head_attention>
             make_op("multibroadcast",
                     {{"out_lens", {batch_size, kv_seq_length}}}),
             mask_value_lit);
-        
-        // Gen list of indicies to compare to the exclusive start of right padding
-        std::vector<size_t> indicies_vec(kv_seq_length, 0);
-        std::iota(indicies_vec.begin(), indicies_vec.end(), 0);
-        auto indicies = info.add_literal(migraphx::literal{migraphx::shape{migraphx::shape::int32_type, {kv_seq_length}, {1}}, indicies_vec});
-        auto indicies_bc = info.add_instruction(make_op("multibroadcast", {{"out_lens", {batch_size, kv_seq_length}}}), indicies);
+        // Gen list of indices to compare to the exclusive start of right padding
+        std::vector<size_t> indices_vec(kv_seq_length, 0);
+        std::iota(indices_vec.begin(), indices_vec.end(), 0);
+        auto indices = info.add_literal(migraphx::literal{migraphx::shape{migraphx::shape::int32_type, {kv_seq_length}, {1}}, indices_vec});
+        auto indices_bc = info.add_instruction(make_op("multibroadcast", {{"out_lens", {batch_size, kv_seq_length}}}), indices);
         auto right_mask_bc = info.add_instruction(make_op("multibroadcast", {{"out_lens", {batch_size, kv_seq_length}}}), right_mask);
-        auto in_bool = info.add_instruction(make_op("less"), indicies_bc, right_mask_bc);
+        auto in_bool = info.add_instruction(make_op("less"), indices_bc, right_mask_bc);
         auto where = info.add_instruction(make_op("where"), in_bool, bc_pass, bc_mask);
 
         return info.add_instruction(make_op("convert", {{"target_type", migraphx::shape::int32_type}}), where);
@@ -558,7 +557,7 @@ struct parse_multi_head_attention : op_parser<parse_multi_head_attention>
 
         if((attention.key_pad_mode == key_mask_mode_t::direct_2d_pad) or
            (attention.key_pad_mode == key_mask_mode_t::direct_3d_pad))
-        { // Raw Mask - 0 means mask, 1 means pass through. Apply mask_filter_val to mask indicies
+        { // Raw Mask - 0 means mask, 1 means pass through. Apply mask_filter_val to mask indices
           // and zero otherwise
             // Need to generate from 2 dims or 3 dim cases
             return generate_raw_mask_per_batch(info, mask_index, input_shape, attention);

test/onnx/verify/mha_double_head_bias_asym_mask_scale_test.cpp

@@ -67,7 +67,7 @@ TEST_CASE(mha_double_head_bias_asym_mask_scale_test)
                                  0.818296f};
 
     migraphx::shape mask_shape{migraphx::shape::int32_type, {2, 3}};
-    std::vector<float> mask_data = {0, 0, 1, 1, 1, 1};
+    std::vector<int32_t> mask_data = {0, 0, 1, 1, 1, 1};
 
     migraphx::literal query{q_shape, query_data};
     migraphx::literal key{k_shape, key_data};

test/onnx/verify/mha_double_head_bias_key_padding_mask_test.cpp

@@ -53,7 +53,7 @@ TEST_CASE(mha_double_head_bias_mask_batch1_passthrough_mask_test)
     std::vector<float> bias_data(12, 0.0f);
 
     migraphx::shape mask_shape{migraphx::shape::int32_type, {1, 2}};
-    std::vector<float> mask_data = {1, 1};
+    std::vector<int32_t> mask_data = {1, 1};
 
     migraphx::literal query{q_shape, query_data};
     migraphx::literal key{k_shape, key_data};
@@ -113,7 +113,7 @@ TEST_CASE(mha_double_head_bias_mask_batch1_last_mask_test)
 
     // 0 = mask,1  = pass through
     migraphx::shape mask_shape{migraphx::shape::int32_type, {1, 2}};
-    std::vector<float> mask_data = {1, 0};
+    std::vector<int32_t> mask_data = {1, 0};
 
     migraphx::literal query{q_shape, query_data};
     migraphx::literal key{k_shape, key_data};
@@ -172,7 +172,7 @@ TEST_CASE(mha_double_head_bias_mask_batch1_first_mask_test)
                                     0.85529f};
 
     migraphx::shape mask_shape{migraphx::shape::int32_type, {1, 2}};
-    std::vector<float> mask_data = {0, 1};
+    std::vector<int32_t> mask_data = {0, 1};
 
     migraphx::literal query{q_shape, query_data};
     migraphx::literal key{k_shape, key_data};
@@ -231,7 +231,7 @@ TEST_CASE(mha_double_head_bias_mask_batch1_all_mask_test)
                                     0.84921235f};
 
     migraphx::shape mask_shape{migraphx::shape::int32_type, {1, 2}};
-    std::vector<float> mask_data = {0, 0};
+    std::vector<int32_t> mask_data = {0, 0};
 
     migraphx::literal query{q_shape, query_data};
     migraphx::literal key{k_shape, key_data};