diff options
| -rw-r--r-- | docs/contributor_guide/contribution_guidelines.dox | 1 | ||||
| -rw-r--r-- | examples/graph_ssd_mobilenet.cpp | 26 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/docs/contributor_guide/contribution_guidelines.dox b/docs/contributor_guide/contribution_guidelines.dox index c795fe7118..487abf482c 100644 --- a/docs/contributor_guide/contribution_guidelines.dox +++ b/docs/contributor_guide/contribution_guidelines.dox @@ -40,6 +40,7 @@ As part of the initiative to use inclusive language, there are certain phrases a \includedoc non_inclusive_language_examples.dox Please also follow this guideline when committing changes to Compute Library. +It is worth mentioning that the term "master" is still used in some comments but only in reference to external code links that Arm has no governance on. Futhermore, starting from next release (22.05), 'master' branch will no longer be used, it will be replaced by 'main'. Please update your clone jobs accordingly. @section S5_1_coding_standards Coding standards and guidelines diff --git a/examples/graph_ssd_mobilenet.cpp b/examples/graph_ssd_mobilenet.cpp index c0859227ab..9fe7f5b454 100644 --- a/examples/graph_ssd_mobilenet.cpp +++ b/examples/graph_ssd_mobilenet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -121,12 +121,12 @@ private: SimpleOption<std::string> *detection_scores_opt{ nullptr }; SimpleOption<std::string> *num_detections_opt{ nullptr }; - ConcatLayer get_node_A_float(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_A_float(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo dwc_pad_stride_info, PadStrideInfo conv_pad_stride_info) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << DepthwiseConvolutionLayer( 3U, 3U, @@ -157,12 +157,12 @@ private: return ConcatLayer(std::move(sg)); } - ConcatLayer get_node_B_float(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_B_float(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo conv_pad_stride_info_1, PadStrideInfo conv_pad_stride_info_2) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << ConvolutionLayer( 1, 1, conv_filt / 2, @@ -193,11 +193,11 @@ private: return ConcatLayer(std::move(sg)); } - ConcatLayer get_node_C_float(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_C_float(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo conv_pad_stride_info) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << ConvolutionLayer( 1U, 1U, conv_filt, get_weights_accessor(data_path, total_path + "w.npy"), @@ -381,13 +381,13 @@ private: detection_ouput << OutputLayer(get_detection_output_accessor(common_params, { input_descriptor.shape })); } - ConcatLayer get_node_A_qasymm(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_A_qasymm(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo dwc_pad_stride_info, PadStrideInfo conv_pad_stride_info, std::pair<QuantizationInfo, QuantizationInfo> depth_quant_info, std::pair<QuantizationInfo, QuantizationInfo> point_quant_info) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << DepthwiseConvolutionLayer( 3U, 3U, @@ -408,13 +408,13 @@ private: return ConcatLayer(std::move(sg)); } - ConcatLayer get_node_B_qasymm(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_B_qasymm(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo conv_pad_stride_info_1x1, PadStrideInfo conv_pad_stride_info_3x3, const std::pair<QuantizationInfo, QuantizationInfo> quant_info_1x1, const std::pair<QuantizationInfo, QuantizationInfo> quant_info_3x3) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << ConvolutionLayer( 1, 1, conv_filt / 2, @@ -435,12 +435,12 @@ private: return ConcatLayer(std::move(sg)); } - ConcatLayer get_node_C_qasymm(IStream &master_graph, const std::string &data_path, std::string &¶m_path, + ConcatLayer get_node_C_qasymm(IStream &main_graph, const std::string &data_path, std::string &¶m_path, unsigned int conv_filt, PadStrideInfo conv_pad_stride_info, const std::pair<QuantizationInfo, QuantizationInfo> quant_info, TensorShape reshape_shape) { const std::string total_path = param_path + "_"; - SubStream sg(master_graph); + SubStream sg(main_graph); sg << ConvolutionLayer( 1U, 1U, conv_filt, get_weights_accessor(data_path, total_path + "w.npy"), diff --git a/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp b/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp index 24aef1296b..4d7f7983f8 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp @@ -142,7 +142,7 @@ struct GemmImplementation<Top, Tret, Nothing> { instantiate(instantiate) { } }; -/* "Master" function implemented for each valid combination of types. +/* "Main" function implemented for each valid combination of types. * Returns a list of GEMM implementation descriptors for processing by the * other functions, ended by an implementation with * method==GemmMethod::DEFAULT. */ |