Sort include order for params-init.h and log.h
PiperOrigin-RevId: 276793402
diff --git a/test/argmaxpool-microkernel-tester.h b/test/argmaxpool-microkernel-tester.h
index 39c584f..e84d11a 100644
--- a/test/argmaxpool-microkernel-tester.h
+++ b/test/argmaxpool-microkernel-tester.h
@@ -17,8 +17,8 @@
#include <xnnpack.h>
#include <xnnpack/AlignedAllocator.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class ArgmaxPoolMicrokernelTester {
diff --git a/test/clamp-microkernel-tester.h b/test/clamp-microkernel-tester.h
index d6dc0a2..068be4a 100644
--- a/test/clamp-microkernel-tester.h
+++ b/test/clamp-microkernel-tester.h
@@ -19,8 +19,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class ClampMicrokernelTester {
diff --git a/test/conv-hwc-microkernel-tester.h b/test/conv-hwc-microkernel-tester.h
index 34dc5f1..a8793f0 100644
--- a/test/conv-hwc-microkernel-tester.h
+++ b/test/conv-hwc-microkernel-tester.h
@@ -19,8 +19,8 @@
#include <xnnpack/AlignedAllocator.h>
#include <xnnpack/pack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
#include <xnnpack.h>
diff --git a/test/conv-hwc2spchw-microkernel-tester.h b/test/conv-hwc2spchw-microkernel-tester.h
index 501deb8..03fb017 100644
--- a/test/conv-hwc2spchw-microkernel-tester.h
+++ b/test/conv-hwc2spchw-microkernel-tester.h
@@ -19,8 +19,8 @@
#include <xnnpack/AlignedAllocator.h>
#include <xnnpack/pack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
#include <xnnpack.h>
diff --git a/test/dwconv-spchw-microkernel-tester.h b/test/dwconv-spchw-microkernel-tester.h
index 9787714..d718231 100644
--- a/test/dwconv-spchw-microkernel-tester.h
+++ b/test/dwconv-spchw-microkernel-tester.h
@@ -23,8 +23,8 @@
#include <xnnpack/AlignedAllocator.h>
#include <xnnpack/math.h>
#include <xnnpack/pack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class DWConvSpCHWMicrokernelTester {
diff --git a/test/gavgpool-microkernel-tester.h b/test/gavgpool-microkernel-tester.h
index f50f639..190c3a5 100644
--- a/test/gavgpool-microkernel-tester.h
+++ b/test/gavgpool-microkernel-tester.h
@@ -21,8 +21,8 @@
#include <xnnpack.h>
#include <xnnpack/AlignedAllocator.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
#include <xnnpack/requantization.h>
diff --git a/test/gavgpool-spchw-microkernel-tester.h b/test/gavgpool-spchw-microkernel-tester.h
index 93cb915..113f470 100644
--- a/test/gavgpool-spchw-microkernel-tester.h
+++ b/test/gavgpool-spchw-microkernel-tester.h
@@ -18,8 +18,8 @@
#include <xnnpack.h>
#include <xnnpack/AlignedAllocator.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class GAvgPoolSpCHWMicrokernelTester {
diff --git a/test/hswish-microkernel-tester.h b/test/hswish-microkernel-tester.h
index ec3d35a..c927399 100644
--- a/test/hswish-microkernel-tester.h
+++ b/test/hswish-microkernel-tester.h
@@ -16,8 +16,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class HSwishMicrokernelTester {
diff --git a/test/maxpool-microkernel-tester.h b/test/maxpool-microkernel-tester.h
index c804cf6..94132ed 100644
--- a/test/maxpool-microkernel-tester.h
+++ b/test/maxpool-microkernel-tester.h
@@ -19,8 +19,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class MaxPoolMicrokernelTester {
diff --git a/test/prelu-microkernel-tester.h b/test/prelu-microkernel-tester.h
index abe7412..935ae9b 100644
--- a/test/prelu-microkernel-tester.h
+++ b/test/prelu-microkernel-tester.h
@@ -18,8 +18,8 @@
#include <xnnpack.h>
#include <xnnpack/AlignedAllocator.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class PReLUMicrokernelTester {
diff --git a/test/unpool-microkernel-tester.h b/test/unpool-microkernel-tester.h
index b59eb03..e9a55b0 100644
--- a/test/unpool-microkernel-tester.h
+++ b/test/unpool-microkernel-tester.h
@@ -16,8 +16,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class UnpoolMicrokernelTester {
diff --git a/test/vmul-microkernel-tester.h b/test/vmul-microkernel-tester.h
index 5b30c5b..ebb27da 100644
--- a/test/vmul-microkernel-tester.h
+++ b/test/vmul-microkernel-tester.h
@@ -16,8 +16,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class VMulMicrokernelTester {
diff --git a/test/vmulcaddc-microkernel-tester.h b/test/vmulcaddc-microkernel-tester.h
index 33daf1b..ba4ef7d 100644
--- a/test/vmulcaddc-microkernel-tester.h
+++ b/test/vmulcaddc-microkernel-tester.h
@@ -18,8 +18,8 @@
#include <xnnpack.h>
#include <xnnpack/AlignedAllocator.h>
#include <xnnpack/pack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class VMulCAddCMicrokernelTester {
diff --git a/test/vscale-microkernel-tester.h b/test/vscale-microkernel-tester.h
index 67f561f..9ac98e8 100644
--- a/test/vscale-microkernel-tester.h
+++ b/test/vscale-microkernel-tester.h
@@ -16,8 +16,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class VScaleMicrokernelTester {
diff --git a/test/vsub-microkernel-tester.h b/test/vsub-microkernel-tester.h
index f5ba56a..0a17f6b 100644
--- a/test/vsub-microkernel-tester.h
+++ b/test/vsub-microkernel-tester.h
@@ -16,8 +16,8 @@
#include <vector>
#include <xnnpack.h>
-#include <xnnpack/params.h>
#include <xnnpack/params-init.h>
+#include <xnnpack/params.h>
class VSubMicrokernelTester {