Commit 3c2d4dec authored by Ihar Hrachyshka's avatar Ihar Hrachyshka
Browse files

Reapply "llama-cpp: 6670 -> 6729" 

This reverts commit 611fb321.

Also, drop the vulkan build patch that fails to apply and regardless is
no longer needed for a successful build.
parent 13e80126

pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
index b97e7bf9..9cdc62a4 100644

--- a/ggml/src/ggml-vulkan/CMakeLists.txt

+++ b/ggml/src/ggml-vulkan/CMakeLists.txt

@@ -70,11 +70,5 @@ if (Vulkan_FOUND)

         "GGML_VULKAN_INTEGER_DOT_GLSLC_SUPPORT"

     )



-    test_shader_extension_support(

-        "GL_EXT_bfloat16"

-        "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_bfloat16_support.comp"

-        "GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT"

-    )

-

     target_link_libraries(ggml-vulkan PRIVATE Vulkan::Vulkan)

     target_include_directories(ggml-vulkan PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

pkgs/by-name/ll/llama-cpp/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -75,13 +75,13 @@ let 
in

effectiveStdenv.mkDerivation (finalAttrs: {

  pname = "llama-cpp";

  version = "6670";

  version = "6729";



  src = fetchFromGitHub {

    owner = "ggml-org";

    repo = "llama.cpp";

    tag = "b${finalAttrs.version}";

    hash = "sha256-B4Qog7RLcre8KB9N+aVUZSJwlkHIIcCxR8jySoxbXoQ=";

    hash = "sha256-CkPLgzSsiCkSIAp4XetUJszt0+WjPRt+9V9SvRogbVU=";

    leaveDotGit = true;

    postFetch = ''

      git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -89,8 +89,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { 
    '';

  };



  patches = lib.optionals vulkanSupport [ ./disable_bfloat16.patch ];



  nativeBuildInputs = [

    cmake

    ninja