merge master

Author: slaren

examples/CMakeLists.txt

@@ -19,11 +19,11 @@ target_link_libraries(common-ggml PRIVATE ggml)
 target_include_directories(common-ggml PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(gpt-2)
-#add_subdirectory(gpt-j)
+add_subdirectory(gpt-j)
 add_subdirectory(whisper)
 add_subdirectory(mnist)
-#add_subdirectory(gpt-neox)
-#add_subdirectory(dolly-v2)
+add_subdirectory(gpt-neox)
+add_subdirectory(dolly-v2)
 add_subdirectory(replit)
 add_subdirectory(mpt)
 add_subdirectory(starcoder)

include/ggml/ggml.h

@@ -401,10 +401,14 @@ extern "C" {
         GGML_OP_CLAMP,
         GGML_OP_CONV_1D,
         GGML_OP_CONV_2D,
+        GGML_OP_CONV_TRANSPOSE_1D,
         GGML_OP_CONV_TRANSPOSE_2D,
         GGML_OP_POOL_1D,
         GGML_OP_POOL_2D,
 
+        GGML_OP_CONV_1D_STAGE_0,  // internal
+        GGML_OP_CONV_1D_STAGE_1,  // internal
+
         GGML_OP_UPSCALE, // nearest interpolate
 
         GGML_OP_FLASH_ATTN,
@@ -1387,6 +1391,14 @@ extern "C" {
             int                   s,
             int                   d);
 
+    GGML_API struct ggml_tensor * ggml_conv_transpose_1d(
+            struct ggml_context * ctx,
+            struct ggml_tensor  * a,
+            struct ggml_tensor  * b,
+            int                   s0,
+            int                   p0,
+            int                   d0);
+
     GGML_API struct ggml_tensor * ggml_conv_2d(
             struct ggml_context * ctx,
             struct ggml_tensor  * a,

src/ggml-alloc.c

@@ -585,7 +585,3 @@ size_t ggml_allocr_alloc_graph(struct ggml_allocr * alloc, struct ggml_cgraph *
 size_t ggml_allocr_max_size(struct ggml_allocr * alloc) {
     return alloc->max_size;
 }
-
-size_t ggml_allocr_max_size(struct ggml_allocr * alloc) {
-    return alloc->max_size;
-}