diff --git a/experimental/builder/include/ck_tile/builder/conv_signature.hpp b/experimental/builder/include/ck_tile/builder/conv_signature.hpp index c9e9857ae7..055d781909 100644 --- a/experimental/builder/include/ck_tile/builder/conv_signature.hpp +++ b/experimental/builder/include/ck_tile/builder/conv_signature.hpp @@ -10,8 +10,8 @@ namespace ck_tile::builder { // Layouts for grouped convolutions. enum class GroupConvLayout { - CHANNELS_LAST, // Channels-last NHWGC_GKYXC_NHWGK - CHANNELS_FIRST // Channels-first NGCHW_GKCYX_NGKHW + CHANNELS_LAST, // Channels-last NHWGC_GKYXC_NHWGK + CHANNELS_FIRST // Channels-first NGCHW_GKCYX_NGKHW }; // Spatial dimensionalities of grouped convolutions. @@ -27,20 +27,20 @@ concept ConvDataType = (T == DataType::FP32) || (T == DataType::FP16) || (T == D // Direction of the convolution operation. enum class ConvDirection { - Forward, - BackwardData, - BackwardWeight + FORWARD, + BACKWARD_DATA, + BACKWARD_WEIGHT }; // Elementwise operation to fuse to convolution. enum class ElementwiseOperation { - Bias, - BiasClamp, - Bilinear, - Clamp, - Scale, - PassThrough + BIAS, + BIAS_CLAMP, + BILINEAR, + CLAMP, + SCALE, + PASS_THROUGH }; // Operational signature of a convolution. diff --git a/experimental/builder/test/test_conv_builder.cpp b/experimental/builder/test/test_conv_builder.cpp index 9d72eca7e2..425ef09dc7 100644 --- a/experimental/builder/test/test_conv_builder.cpp +++ b/experimental/builder/test/test_conv_builder.cpp @@ -12,7 +12,7 @@ using P = ckb::BlockGemmPipelineVersion; struct ConvSignature { int spatial_dim = 2; - ckb::ConvDirection direction = ckb::ConvDirection::Forward; + ckb::ConvDirection direction = ckb::ConvDirection::FORWARD; ckb::GroupConvLayout layout = ckb::GroupConvLayout::CHANNELS_LAST; ckb::DataType data_type = ckb::DataType::FP16; }; diff --git a/experimental/builder/test/test_conv_grp_fwd_2d.cpp b/experimental/builder/test/test_conv_grp_fwd_2d.cpp index 591abba130..bd5edad53a 100644 --- a/experimental/builder/test/test_conv_grp_fwd_2d.cpp +++ b/experimental/builder/test/test_conv_grp_fwd_2d.cpp @@ -12,7 +12,7 @@ using P = ckb::BlockGemmPipelineVersion; struct ConvSignature { int spatial_dim = 2; - ckb::ConvDirection direction = ckb::ConvDirection::Forward; + ckb::ConvDirection direction = ckb::ConvDirection::FORWARD; ckb::GroupConvLayout layout = ckb::GroupConvLayout::CHANNELS_LAST; ckb::DataType data_type = ckb::DataType::FP16; }; diff --git a/experimental/builder/test/test_conv_grp_fwd_3d.cpp b/experimental/builder/test/test_conv_grp_fwd_3d.cpp index 322b3f0ee5..cb97ad25e7 100644 --- a/experimental/builder/test/test_conv_grp_fwd_3d.cpp +++ b/experimental/builder/test/test_conv_grp_fwd_3d.cpp @@ -12,7 +12,7 @@ using P = ckb::BlockGemmPipelineVersion; struct ConvSignature { int spatial_dim = 3; - ckb::ConvDirection direction = ckb::ConvDirection::Forward; + ckb::ConvDirection direction = ckb::ConvDirection::FORWARD; ckb::GroupConvLayout layout = ckb::GroupConvLayout::CHANNELS_LAST; ckb::DataType data_type = ckb::DataType::BF16; }; diff --git a/experimental/builder/test/test_conv_instances.cpp b/experimental/builder/test/test_conv_instances.cpp index b86e33fbae..3a614ad297 100644 --- a/experimental/builder/test/test_conv_instances.cpp +++ b/experimental/builder/test/test_conv_instances.cpp @@ -18,7 +18,7 @@ using P = ckb::BlockGemmPipelineVersion; struct ConvSignature { int spatial_dim = 2; - ckb::ConvDirection direction = ckb::ConvDirection::Forward; + ckb::ConvDirection direction = ckb::ConvDirection::FORWARD; ckb::GroupConvLayout layout = ckb::GroupConvLayout::CHANNELS_LAST; ckb::DataType data_type = ckb::DataType::FP16; };