Revert CPU part of Commit b99ee45

Author: Nexesenex

CMakeLists.txt

@@ -424,11 +424,6 @@ add_library(ggml
             ggml/src/ggml-cpu/binary-ops.cpp
             ggml/src/ggml-cpu/unary-ops.h
             ggml/src/ggml-cpu/unary-ops.cpp
-            ggml-cpu/simd-mappings.h
-            ggml-cpu/vec.h
-            ggml-cpu/vec.cpp
-            ggml-cpu/ops.h
-            ggml-cpu/ops.cpp
             ggml/src/ggml-backend-reg.cpp
             ggml/include/gguf.h
             ggml/src/gguf.cpp

Makefile

@@ -4,13 +4,13 @@
 
 #include "ggml.h"
 #include "ggml-impl.h"
-
 #include <stdlib.h> // load `stdlib.h` before other headers to work around MinGW bug: https://sourceforge.net/p/mingw-w64/bugs/192/
 //#include <stddef.h>
 #include <stdbool.h>
 #include <string.h> // memcpy
 #include <math.h>   // fabsf
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -69,16 +69,33 @@ struct ggml_compute_params {
 #endif
 
 #if defined(__ARM_FEATURE_SVE)
+#include <arm_sve.h>
 #include <sys/prctl.h>
 #endif
 
+// 16-bit float
+// on Arm, we use __fp16
+// on x86, we use uint16_t
 #if defined(__ARM_NEON)
 
-// ref: https://github.com/ggml-org/llama.cpp/pull/5404
+// if YCM cannot find <arm_neon.h>, make a symbolic link to it, for example:
+//
+//   $ ln -sfn /Library/Developer/CommandLineTools/usr/lib/clang/13.1.6/include/arm_neon.h ./src/
+//
+#include <arm_neon.h>
+
 #ifdef _MSC_VER
+
+typedef uint16_t ggml_fp16_internal_t;
+
 #define ggml_vld1q_u32(w,x,y,z) { ((w) + ((uint64_t)(x) << 32)), ((y) + ((uint64_t)(z) << 32)) }
+
 #else
+
+typedef __fp16 ggml_fp16_internal_t;
+
 #define ggml_vld1q_u32(w,x,y,z) { (w), (x), (y), (z) }
+
 #endif // _MSC_VER
 
 #if !defined(__aarch64__)