diff --git a/flake.nix b/flake.nix index 9280e0f..18e5759 100644 --- a/flake.nix +++ b/flake.nix @@ -44,8 +44,6 @@ (system: let overlays = [ - llama-cpp.overlays.default - ik_llama-cpp.overlays.default rust-overlay.overlays.default devshell.overlays.default (final: prev: { @@ -102,43 +100,46 @@ "gfx1103" ]; lib = pkgs.lib; - myOverride = (oldAttrs: { - # speeds up builts by only building for a needed rocmTargets... - cmakeFlags = [ - (lib.cmakeBool "LLAMA_BUILD_SERVER" true) - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) - (lib.cmakeBool "LLAMA_CURL" true) - (lib.cmakeBool "GGML_NATIVE" true) - (lib.cmakeBool "GGML_BLAS" false) - (lib.cmakeBool "GGML_CUDA" false) - (lib.cmakeBool "GGML_HIP" true) # new one ? kinda undocumented ? - (lib.cmakeBool "GGML_HIPBLAS" true) # seems to be depr - (lib.cmakeBool "GGML_METAL" false) - (lib.cmakeBool "GGML_VULKAN" false) - (lib.cmakeBool "GGML_STATIC" false) - (lib.cmakeBool "GGML_FMA" true) - (lib.cmakeBool "GGML_F16C" true) - (lib.cmakeBool "GGML_AVX2" true) - (lib.cmakeBool "GGML_AVX512" false) - (lib.cmakeFeature "CMAKE_HIP_COMPILER" "${pkgs.rocmPackages.llvm.clang}/bin/clang") - (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmTargets)) - (lib.cmakeFeature "AMDGPU_TARGETS" (builtins.concatStringsSep ";" rocmTargets)) - ]; - }); + myOverride = oldAttrs: { + # speeds up builts by only building for a needed rocmTargets... + cmakeFlags = [ + (lib.cmakeBool "LLAMA_BUILD_SERVER" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (lib.cmakeBool "LLAMA_CURL" true) + (lib.cmakeBool "GGML_NATIVE" true) + (lib.cmakeBool "GGML_BLAS" false) + (lib.cmakeBool "GGML_CUDA" false) + (lib.cmakeBool "GGML_HIP" true) # new one ? kinda undocumented ? + (lib.cmakeBool "GGML_HIPBLAS" true) # seems to be depr + (lib.cmakeBool "GGML_METAL" false) + (lib.cmakeBool "GGML_VULKAN" false) + (lib.cmakeBool "GGML_STATIC" false) + (lib.cmakeBool "GGML_FMA" true) + (lib.cmakeBool "GGML_F16C" true) + (lib.cmakeBool "GGML_AVX2" true) + (lib.cmakeBool "GGML_AVX512" false) + (lib.cmakeFeature "CMAKE_HIP_COMPILER" "${pkgs.rocmPackages.llvm.clang}/bin/clang") + (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmTargets)) + (lib.cmakeFeature "AMDGPU_TARGETS" (builtins.concatStringsSep ";" rocmTargets)) + ]; + }; in { packages = (import ./.nix { inherit pkgs lib config; }) // { - myikllamacpp = ik_llama-cpp.packages.${system}.default; - myllamacpp = pkgs.llamaPackages.llama-cpp.overrideDerivation myOverride; + myikllamacpp = ik_llama-cpp.legacyPackages.${system}.llamaPackages.llama-cpp; + myikllamacpp-rocm = ik_llama-cpp.legacyPackages.${system}.llamaPackagesRocm.llama-cpp.overrideDerivation myOverride; + myllamacpp = llama-cpp.legacyPackages.${system}.llamaPackages.llama-cpp; + myllamacpp-rocm = llama-cpp.legacyPackages.${system}.llamaPackagesRocm.llama-cpp.overrideDerivation myOverride; }; devShells.default = pkgs.mkShell { packages = with pkgs; [ customRustToolchain - self.packages.${system}.myllamacpp + # self.packages.${system}.myllamacpp + self.packages.${system}.myikllamacpp-rocm aider-chat bacon binaryen