Fix build error and disable AVX2

Author: horasal

ggml/src/ggml-common.h

@@ -1118,7 +1118,7 @@ GGML_TABLE_BEGIN(int8_t, kvalues_mxfp4, 16)
 GGML_TABLE_END()
 
 // 16^(-1)
-#define MXFP6_SCALER 0.0625f
+#define MXFP6_E3M2_SCALER 0.0625f
 GGML_TABLE_BEGIN(int16_t, kvalues_mxfp6_e3m2, 64)
     0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28,
     32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224,
@@ -1129,7 +1129,7 @@ GGML_TABLE_BEGIN(int16_t, kvalues_mxfp6_e3m2, 64)
 GGML_TABLE_END()
 
 // 8^(-1)
-#define MXFP6_SCALER 0.125f
+#define MXFP6_E2M3_SCALER 0.125f
 GGML_TABLE_BEGIN(int16_t, kvalues_mxfp6_e2m3, 64)
     0, 1, 2, 3, 4, 5, 6, 7,
     8, 9, 10, 11, 12, 13, 14, 15,

ggml/src/ggml-cpu/arch/x86/quants.c

@@ -860,7 +860,7 @@ void ggml_vec_dot_mxfp6_e3m2_q8_0(int n, float * GGML_RESTRICT s, size_t bs, con
         int ib = 0;
         float sumf = 0;
 
-    #if defined __AVX2__
+    #if 0//defined __AVX2__
         __m256 accum_ps = _mm256_setzero_ps();
 
         for (; ib + 1 < nb; ib += 2) {
@@ -987,7 +987,7 @@ void ggml_vec_dot_mxfp6_e2m3_q8_0(int n, float * GGML_RESTRICT s, size_t bs, con
         int ib = 0;
         float sumf = 0;
 
-    #if defined __AVX2__
+    #if 0 //defined __AVX2__
         __m256 accum_ps = _mm256_setzero_ps();
 
         for (; ib + 1 < nb; ib += 2) {

ggml/src/ggml-cpu/ops.cpp

@@ -1248,6 +1248,7 @@ void ggml_compute_forward_acc(
         case GGML_TYPE_Q5_1:
         case GGML_TYPE_Q8_0:
         case GGML_TYPE_Q8_1:
+        case GGML_TYPE_MXFP4:
         case GGML_TYPE_MXFP6_E3M2:
         case GGML_TYPE_MXFP6_E2M3:
         case GGML_TYPE_Q2_K:
@@ -4145,6 +4146,7 @@ void ggml_compute_forward_out_prod(
         case GGML_TYPE_Q5_0:
         case GGML_TYPE_Q5_1:
         case GGML_TYPE_Q8_0:
+        case GGML_TYPE_MXFP4:
         case GGML_TYPE_MXFP6_E3M2:
         case GGML_TYPE_MXFP6_E2M3:
         case GGML_TYPE_Q2_K:
@@ -4421,6 +4423,7 @@ void ggml_compute_forward_set(
         case GGML_TYPE_Q5_1:
         case GGML_TYPE_Q8_0:
         case GGML_TYPE_Q8_1:
+        case GGML_TYPE_MXFP4:
         case GGML_TYPE_MXFP6_E3M2:
         case GGML_TYPE_MXFP6_E2M3:
         case GGML_TYPE_Q2_K:
@@ -4684,6 +4687,7 @@ void ggml_compute_forward_get_rows(
         case GGML_TYPE_Q5_1:
         case GGML_TYPE_Q8_0:
         case GGML_TYPE_Q8_1:
+        case GGML_TYPE_MXFP4:
         case GGML_TYPE_MXFP6_E3M2:
         case GGML_TYPE_MXFP6_E2M3:
         case GGML_TYPE_Q2_K:
@@ -5409,6 +5413,7 @@ void ggml_compute_forward_clamp(
         case GGML_TYPE_Q5_1:
         case GGML_TYPE_Q8_0:
         case GGML_TYPE_Q8_1:
+        case GGML_TYPE_MXFP4:
         case GGML_TYPE_MXFP6_E3M2:
         case GGML_TYPE_MXFP6_E2M3:
         case GGML_TYPE_Q2_K: