update tests and examples

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index b273a1addb9add9d40bec3a054a1ae708702e527..79c7f2442b95a75b385ef288375ff9178f7ffb27 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -20,7 +20,7 @@ target_include_directories(common-ggml PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(gpt-2)
 add_subdirectory(gpt-j)
-add_subdirectory(mnist)
+# add_subdirectory(mnist)
 add_subdirectory(sam)
 add_subdirectory(yolo)
 add_subdirectory(simple)

diff --git a/examples/gpt-2/main-alloc.cpp b/examples/gpt-2/main-alloc.cpp
index ac925da9e7977e73051ff5988a63baeffaa47868..0bde9e1d1ba52d16db00ca6bd423b63dbd0f53c5 100644 (file)
--- a/examples/gpt-2/main-alloc.cpp
+++ b/examples/gpt-2/main-alloc.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/gpt-2/main-backend.cpp b/examples/gpt-2/main-backend.cpp
index 9a4c9abe836505e1cc72405bba11fb05db010c2a..ca1f761aca2e50940fdb701728c1edfecc7ae5c2 100644 (file)
--- a/examples/gpt-2/main-backend.cpp
+++ b/examples/gpt-2/main-backend.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/gpt-2/main-batched.cpp b/examples/gpt-2/main-batched.cpp
index bf6fbe4e6fa43f85e7d48a90a29235e96b253497..4d6ebe829eb584bffbac1ecabf7e8d1859ebf5b3 100644 (file)
--- a/examples/gpt-2/main-batched.cpp
+++ b/examples/gpt-2/main-batched.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/gpt-2/main-ctx.cpp b/examples/gpt-2/main-ctx.cpp
index 01da41a2421f6fa92a77a2d17c03012d480b1d09..50e4033a65a18b3977aba14df412d485328d689e 100644 (file)
--- a/examples/gpt-2/main-ctx.cpp
+++ b/examples/gpt-2/main-ctx.cpp
@@ -1,5 +1,5 @@
 #include "ggml.h"
-
+#include "ggml-cpu.h"
 #include "common.h"
 #include "common-ggml.h"
 

diff --git a/examples/gpt-2/main-sched.cpp b/examples/gpt-2/main-sched.cpp
index f3bbc84ae29be942284072e9e8137f3b9f3aaffa..9f42aca92fb7c8766d578675d636ea7d5520a44d 100644 (file)
--- a/examples/gpt-2/main-sched.cpp
+++ b/examples/gpt-2/main-sched.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/gpt-j/main.cpp b/examples/gpt-j/main.cpp
index 54ff611346907ef5700acac3bb71150e048e656e..2f494e75b4323d894bc6fc13b8268b4c4137c66a 100644 (file)
--- a/examples/gpt-j/main.cpp
+++ b/examples/gpt-j/main.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include "common.h"
 #include "common-ggml.h"

diff --git a/examples/magika/main.cpp b/examples/magika/main.cpp
index 7c22d6cee2d7aeeee86e7ac7559f355f694f2b5b..f129fe5a33d3e292689f674e049c4ee22ba7892b 100644 (file)
--- a/examples/magika/main.cpp
+++ b/examples/magika/main.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/mnist/mnist-common.h b/examples/mnist/mnist-common.h
index f0d248047fde9b2c0393edb289e6bac6e00ab96f..22d59b98926d677fa8e5884b28fe28f09f2f25ed 100644 (file)
--- a/examples/mnist/mnist-common.h
+++ b/examples/mnist/mnist-common.h
@@ -8,6 +8,7 @@
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #define MNIST_NTRAIN          60000
 #define MNIST_NTEST           10000

diff --git a/examples/sam/main.cpp b/examples/sam/main.cpp
index 749be6fa2fe1e71f21e383eb5bfa78cdd40c19fa..eeb7e5cd370ebc40317261854171b7f1d9c92a0d 100644 (file)
--- a/examples/sam/main.cpp
+++ b/examples/sam/main.cpp
@@ -2,6 +2,7 @@
 #define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
 
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 #define STB_IMAGE_IMPLEMENTATION

diff --git a/examples/simple/simple-backend.cpp b/examples/simple/simple-backend.cpp
index d6de2a371b605da06550aab5ee301d61198d8ef5..d9c72cdf17105f06bdd66133ae7263d1f1718209 100644 (file)
--- a/examples/simple/simple-backend.cpp
+++ b/examples/simple/simple-backend.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/examples/simple/simple-ctx.cpp b/examples/simple/simple-ctx.cpp
index 283ec0a72edc626473d1f8d1099a7b1aae235772..fea8f40d599df0b093dd0870627673dce56a03bc 100644 (file)
--- a/examples/simple/simple-ctx.cpp
+++ b/examples/simple/simple-ctx.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <cassert>
 #include <cmath>

diff --git a/examples/yolo/yolov3-tiny.cpp b/examples/yolo/yolov3-tiny.cpp
index 369e9efbcd116f7d1867a1b84b32911452cf854a..06023c3388b2d42aa0ff49944291a1399250be71 100644 (file)
--- a/examples/yolo/yolov3-tiny.cpp
+++ b/examples/yolo/yolov3-tiny.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4a69230e84c975eb8ad1eb5072cf62252f6fad32..f0a3386a050f54f561d42dcc02962652961cfdbf 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -187,11 +187,11 @@ set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_
 #
 # test-opt
 
-set(TEST_TARGET test-opt)
-add_executable(${TEST_TARGET} ${TEST_TARGET}.cpp)
-target_link_libraries(${TEST_TARGET} PRIVATE ggml)
-add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
-set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
+# set(TEST_TARGET test-opt)
+# add_executable(${TEST_TARGET} ${TEST_TARGET}.cpp)
+# target_link_libraries(${TEST_TARGET} PRIVATE ggml)
+# add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
+# set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
 
 #
 # test-quantize-fns
@@ -283,20 +283,20 @@ set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_
 #
 # test2
 
-set(TEST_TARGET test2)
-add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
-target_link_libraries(${TEST_TARGET} PRIVATE ggml)
-add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
-set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
+# set(TEST_TARGET test2)
+# add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
+# target_link_libraries(${TEST_TARGET} PRIVATE ggml)
+# add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
+# set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
 
 #
 # test3
 
-set(TEST_TARGET test3)
-add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
-target_link_libraries(${TEST_TARGET} PRIVATE ggml)
-add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
-set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
+# set(TEST_TARGET test3)
+# add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
+# target_link_libraries(${TEST_TARGET} PRIVATE ggml)
+# add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
+# set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
 
 #
 # test-pool

diff --git a/tests/test-arange.cpp b/tests/test-arange.cpp
index 39d7ad45fae50f2ab74e33624693c8266f8def9b..4b7a98584f60ddc57af628707f91fe2cd3eeab93 100644 (file)
--- a/tests/test-arange.cpp
+++ b/tests/test-arange.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test-blas0.c b/tests/test-blas0.c
index 2050ad2f3fc453937b684fa17c9fc69ad49a5c42..fcdfcb90ddc50b6d5b30e32a0bb0d2ee97be3dfa 100644 (file)
--- a/tests/test-blas0.c
+++ b/tests/test-blas0.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/tests/test-cont.c b/tests/test-cont.c
index bb139e94c7808f3f08aaf47eae1cfe4ff5350492..df04bf893102b03b3382b2ea21b7cb48f0edf411 100644 (file)
--- a/tests/test-cont.c
+++ b/tests/test-cont.c
@@ -1,4 +1,5 @@
 #include "ggml-backend.h"
+#include "ggml-cpu.h"
 #include "ggml.h"
 
 #ifdef GGML_USE_CUDA

diff --git a/tests/test-conv-transpose-1d.cpp b/tests/test-conv-transpose-1d.cpp
index 6f20ce5df0732bf8e8420ed806eace56f2771054..ab2d802843d96533f4b9aedddb8b32b709405b26 100644 (file)
--- a/tests/test-conv-transpose-1d.cpp
+++ b/tests/test-conv-transpose-1d.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test-conv-transpose.c b/tests/test-conv-transpose.c
index da930d3a56d9428db7f47ba332780d65025ff772..acdc85cf8aea762102a6965fac570974e763e64c 100644 (file)
--- a/tests/test-conv-transpose.c
+++ b/tests/test-conv-transpose.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/tests/test-conv1d.cpp b/tests/test-conv1d.cpp
index fe316ab3d3e2622b1e09fbb728318dfc149f3d9c..e30117ffc47b129c6850558f956c92e042d66f52 100644 (file)
--- a/tests/test-conv1d.cpp
+++ b/tests/test-conv1d.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test-conv2d.cpp b/tests/test-conv2d.cpp
index 705492833e34005951cf8c428ff091b8c0cfbd4e..2aa50ebf2478b0d871512dc8ac0b8eedbb4d9e98 100644 (file)
--- a/tests/test-conv2d.cpp
+++ b/tests/test-conv2d.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test-customop.c b/tests/test-customop.c
index c03841fb316d09e1b1659a6bcfd790017f61c6d6..c85cafe1b1e8990972506cab14fd4a4066919e3b 100644 (file)
--- a/tests/test-customop.c
+++ b/tests/test-customop.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/tests/test-dup.c b/tests/test-dup.c
index c0f649a67f0b8f611e6237b22e6c9791cb306e49..ae60515712de0a6eb3947007df50e8966649be13 100644 (file)
--- a/tests/test-dup.c
+++ b/tests/test-dup.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/test-mul-mat.cpp b/tests/test-mul-mat.cpp
index 2b23a6ae4a510f110f4503818ca8a5dbfbe76fc3..578d3e78657f5668c9e31fd754edb99f4a7c20a8 100644 (file)
--- a/tests/test-mul-mat.cpp
+++ b/tests/test-mul-mat.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test-mul-mat0.c b/tests/test-mul-mat0.c
index ebd004b0473baa2b16813ece95b8f4a22bb8224d..5a6453c606ddcc50bdc373a98709c93b1fac6244 100644 (file)
--- a/tests/test-mul-mat0.c
+++ b/tests/test-mul-mat0.c
@@ -1,5 +1,6 @@
 #define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <math.h>
 #include <stdio.h>

diff --git a/tests/test-pool.c b/tests/test-pool.c
index f943dc61de03a26bf59c80bfb6a22b9bde49ff96..a6930c9b434f470fffc01dd6b376d0dc4d42c5ec 100644 (file)
--- a/tests/test-pool.c
+++ b/tests/test-pool.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/tests/test-rel-pos.c b/tests/test-rel-pos.c
index e525e5ca1e6fc398018ea9ab8bc1c0260309c7bf..7cf245a7fccfab83a18d722ac2be5836f268c477 100644 (file)
--- a/tests/test-rel-pos.c
+++ b/tests/test-rel-pos.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/tests/test-timestep_embedding.cpp b/tests/test-timestep_embedding.cpp
index 9a87de31ef75369ae9f65ce37b47b862275779d3..a558659738f39809d33f46170e1637ebe8793b71 100644 (file)
--- a/tests/test-timestep_embedding.cpp
+++ b/tests/test-timestep_embedding.cpp
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 #include "ggml-alloc.h"
 #include "ggml-backend.h"
 

diff --git a/tests/test1.c b/tests/test1.c
index 945eac58257dcdd7377b62bcea62bf3b1b371656..1a2db19c2af82eb5e91ebf6c48e9ea80b8cdd5c7 100644 (file)
--- a/tests/test1.c
+++ b/tests/test1.c
@@ -1,4 +1,5 @@
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/test2.c b/tests/test2.c
index 0b3adb8f35f2b10f8065b599b1433b890aa528a5..76c044f4b4a260bf3fb4650513e1dd9290cc4d34 100644 (file)
--- a/tests/test2.c
+++ b/tests/test2.c
@@ -1,5 +1,6 @@
 #define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
 #include "ggml.h"
+#include "ggml-cpu.h"
 
 #include <math.h>
 #include <stdio.h>