commit 1f29b806ebd61c56d9ad9b4dd36ea387d0c46cc7
author Marat Dukhan <maratek@google.com> Fri May 15 23:46:39 2020 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Fri May 15 23:47:17 2020 -0700
tree dec9b021a83d2f15a9cb4d1f030131639f243afe
parent 7e4ca400606755cfb86c594bc489c5fec3c2cf26

Refactor CHW micro-kernels

Rename SpCHW -> CHW

PiperOrigin-RevId: 311861144

src/operators/global-average-pooling-ncw.c

diff --git a/src/operators/global-average-pooling-ncw.c b/src/operators/global-average-pooling-ncw.c
index 2f6db07..a18f4ac 100644
--- a/src/operators/global-average-pooling-ncw.c
+++ b/src/operators/global-average-pooling-ncw.c
@@ -62,7 +62,7 @@
   }
 
   status = xnn_status_unsupported_parameter;
-  if (xnn_params.f32.spchw_gavgpool.ukernel == NULL) {
+  if (xnn_params.f32.gavgpool_cw.ukernel == NULL) {
     xnn_log_error(
       "failed to create Global Average Pooling operator: "
       "only selected configurations parameters are supported");
@@ -133,7 +133,7 @@
     .output = output,
     .output_channel_stride = sizeof(float),
     .output_batch_stride = global_average_pooling_op->channels * sizeof(float),
-    .ukernel = xnn_params.f32.spchw_gavgpool.ukernel,
+    .ukernel = xnn_params.f32.gavgpool_cw.ukernel,
     .params.f32 = global_average_pooling_op->f32_gavgpool_params,
   };
 
@@ -142,7 +142,7 @@
     (pthreadpool_task_2d_tile_1d_t) xnn_compute_global_average_pooling_ncw;
   global_average_pooling_op->compute.range[0] = batch_size;
   global_average_pooling_op->compute.range[1] = global_average_pooling_op->channels;
-  global_average_pooling_op->compute.tile[0] = global_average_pooling_op->channels; //xnn_params.f32.spchw_gavgpool.channel_tile;
+  global_average_pooling_op->compute.tile[0] = global_average_pooling_op->channels; //xnn_params.f32.gavgpool_cw.channel_tile;
 
   global_average_pooling_op->state = xnn_run_state_ready;