Revert "Disable add instances functions for disabled data types"

This reverts commit 728b8695.

library/src/tensor_operation_instance/gpu/column_to_image/device_column_to_image_nhwc_1d_instance.cpp

@@ -11,41 +11,49 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
-void add_device_column_to_image_nwc_1d_bf16_instances(
+void add_device_column_to_image_nhwc_1d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, BF16, BF16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_column_to_image_bf16_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
-void add_device_column_to_image_nwc_1d_f16_instances(
+void add_device_column_to_image_nhwc_1d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, F16, F16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_column_to_image_f16_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
-void add_device_column_to_image_nwc_1d_f32_instances(
+void add_device_column_to_image_nhwc_1d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, F32, F32, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_column_to_image_f32_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
-void add_device_column_to_image_nwc_1d_i8_instances(
+void add_device_column_to_image_nhwc_1d_i8_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, int8_t, int8_t, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_column_to_image_i8_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device

library/src/tensor_operation_instance/gpu/column_to_image/device_column_to_image_nhwc_2d_instance.cpp

@@ -11,42 +11,50 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
 void add_device_column_to_image_nhwc_2d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, BF16, BF16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_column_to_image_bf16_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
 void add_device_column_to_image_nhwc_2d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, F16, F16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_column_to_image_f16_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
 void add_device_column_to_image_nhwc_2d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, F32, F32, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_column_to_image_f32_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
 void add_device_column_to_image_nhwc_2d_i8_instances(
     std::vector<
         std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, int8_t, int8_t, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_column_to_image_i8_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device

library/src/tensor_operation_instance/gpu/column_to_image/device_column_to_image_nhwc_3d_instance.cpp

@@ -11,42 +11,50 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
-void add_device_column_to_image_ndhwc_3d_bf16_instances(
+void add_device_column_to_image_nhwc_3d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, BF16, BF16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_column_to_image_bf16_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
-void add_device_column_to_image_ndhwc_3d_f16_instances(
+void add_device_column_to_image_nhwc_3d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, F16, F16, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_column_to_image_f16_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
-void add_device_column_to_image_ndhwc_3d_f32_instances(
+void add_device_column_to_image_nhwc_3d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, F32, F32, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_column_to_image_f32_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
-void add_device_column_to_image_ndhwc_3d_i8_instances(
+void add_device_column_to_image_nhwc_3d_i8_instances(
     std::vector<
         std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, int8_t, int8_t, ColumnToImage>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_column_to_image_i8_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device

library/src/tensor_operation_instance/gpu/image_to_column/device_image_to_column_nhwc_1d_instance.cpp

@@ -11,41 +11,49 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
-void add_device_image_to_column_nwc_1d_bf16_instances(
+void add_device_image_to_column_nhwc_1d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, BF16, BF16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_image_to_column_bf16_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
-void add_device_image_to_column_nwc_1d_f16_instances(
+void add_device_image_to_column_nhwc_1d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, F16, F16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_image_to_column_f16_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
-void add_device_image_to_column_nwc_1d_f32_instances(
+void add_device_image_to_column_nhwc_1d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, F32, F32, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_image_to_column_f32_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
-void add_device_image_to_column_nwc_1d_i8_instances(
+void add_device_image_to_column_nhwc_1d_i8_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<1, GNWC, int8_t, int8_t, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_image_to_column_i8_instances<1, GNWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device

library/src/tensor_operation_instance/gpu/image_to_column/device_image_to_column_nhwc_2d_instance.cpp

@@ -11,42 +11,50 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
 void add_device_image_to_column_nhwc_2d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, BF16, BF16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_image_to_column_bf16_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
 void add_device_image_to_column_nhwc_2d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, F16, F16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_image_to_column_f16_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
 void add_device_image_to_column_nhwc_2d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, F32, F32, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_image_to_column_f32_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
 void add_device_image_to_column_nhwc_2d_i8_instances(
     std::vector<
         std::unique_ptr<DeviceConvTensorRearrange<2, GNHWC, int8_t, int8_t, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_image_to_column_i8_instances<2, GNHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device

library/src/tensor_operation_instance/gpu/image_to_column/device_image_to_column_nhwc_3d_instance.cpp

@@ -11,42 +11,50 @@ namespace instance {
 
 using namespace ck::conv_tensor_rearrange_op;
 
-#ifdef CK_ENABLE_BF16
-void add_device_image_to_column_ndhwc_3d_bf16_instances(
+void add_device_image_to_column_nhwc_3d_bf16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, BF16, BF16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_BF16
     add_device_operation_instances(instances, device_image_to_column_bf16_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP16
-void add_device_image_to_column_ndhwc_3d_f16_instances(
+void add_device_image_to_column_nhwc_3d_f16_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, F16, F16, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP16
     add_device_operation_instances(instances, device_image_to_column_f16_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_FP32
-void add_device_image_to_column_ndhwc_3d_f32_instances(
+void add_device_image_to_column_nhwc_3d_f32_instances(
     std::vector<std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, F32, F32, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_FP32
     add_device_operation_instances(instances, device_image_to_column_f32_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
-#ifdef CK_ENABLE_INT8
-void add_device_image_to_column_ndhwc_3d_i8_instances(
+void add_device_image_to_column_nhwc_3d_i8_instances(
     std::vector<
         std::unique_ptr<DeviceConvTensorRearrange<3, GNDHWC, int8_t, int8_t, ImageToColumn>>>&
         instances)
 {
+#ifdef CK_ENABLE_INT8
     add_device_operation_instances(instances, device_image_to_column_i8_instances<3, GNDHWC>{});
-}
+#else
+    ignore = instances;
 #endif
+}
 
 } // namespace instance
 } // namespace device