Commit: d4f0d564981d14c6c477e17d77c462d3e1e48795 - zirpu (git)

Emergent generative agents

Commit MetaInfo

• Revision: d4f0d564981d14c6c477e17d77c462d3e1e48795 (tree)
• Zeit: 2023-04-26 12:34:01
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Use a llama.cpp with optimizations.

Whoops!

Ändern Zusammenfassung

• modified: flake.lock
• modified: flake.nix

Diff

--- a/flake.lock
+++ b/flake.lock
@@ -33,51 +33,17 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "llama-cpp": {
+    "llama-cpp-lib": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1681924208,
-        "narHash": "sha256-1sCxktrGoo2vUio1b6kJ6Kt5KoQ0lIMkC2I6BGh3Skc=",
-        "owner": "ggerganov",
-        "repo": "llama.cpp",
-        "rev": "884e7d7a2bfd7325b107442d6758983f5886ed3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ggerganov",
-        "repo": "llama.cpp",
-        "type": "github"
-      }
-    },
-    "llama-cpp-lib": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1681925027,
-        "narHash": "sha256-3GwQ3Ox16+VRyK/8JZtKOEMen7ksTakctTY8SEhwopw=",
+        "lastModified": 1682476640,
+        "narHash": "sha256-mLVO3T86AaXg3CXJNEjxjAaUGRhB0+8J1yGRV9LN/8M=",
         "ref": "refs/heads/master",
-        "rev": "c8d9e5ad8efaf9a12d46c90da22c89267ddf6ced",
-        "revCount": 384,
+        "rev": "8a2a3e5098187a70a3949aa8a9351f2f26478d84",
+        "revCount": 440,
         "type": "git",
         "url": "file:///home/simpson/llama.cpp"
       },
@@ -104,27 +70,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1678470307,
-        "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
+        "lastModified": 1682453498,
+        "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1681737997,
-        "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f00994e78cd39e6fc966f0c4103f908e63284780",
+        "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f",
         "type": "github"
       },
       "original": {
@@ -137,9 +87,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "llama-cpp": "llama-cpp",
         "llama-cpp-lib": "llama-cpp-lib",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {

--- a/flake.nix
+++ b/flake.nix
@@ -3,25 +3,23 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    llama-cpp.url = "github:ggerganov/llama.cpp";
     llama-cpp-lib.url = "/home/simpson/llama.cpp";
   };
 
-  outputs = { self, nixpkgs, flake-utils, llama-cpp, llama-cpp-lib }:
+  outputs = { self, nixpkgs, flake-utils, llama-cpp-lib }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
-        llama = llama-cpp.packages.${system}.default;
         llama-lib = llama-cpp-lib.packages.${system}.default;
         llama-cpp-python = pkgs.python310.pkgs.buildPythonPackage rec {
           pname = "llama-cpp-python";
-          version = "0.1.34";
+          version = "0.1.38";
 
           src = pkgs.fetchFromGitHub {
             owner = "abetlen";
             repo = pname;
             rev = "v${version}";
-            sha256 = "sha256-FbIfHqahIdIGWwPEwzG+lE1xTRsbMOn30MF1ETU/HLs=";
+            sha256 = "sha256-/Ykndsp6puFxa+FSHNln9M2frS7/sMMBJSNJ/mU/CSI=";
           };
           format = "setuptools";
 
@@ -60,8 +58,8 @@
             owner = "saharNooby";
             # owner = "iacore";
             repo = "rwkv.cpp";
-            rev = "0a8157d";
-            sha256 = "sha256-1Ef0N2i7JpTcApPlVKdiRILfWmABcXXaXtkFypxzwGg=";
+            rev = "c736ef5411606b529d3a74c139ee111ef1a28bb9";
+            sha256 = "sha256-zJFmuhyY2kT/WVStBpHSnlmwclXZmVoiFvsurCDHW4E=";
             # rev = "ae390c6";
             # sha256 = "sha256-ojDsZgXwd3+E6AGtB/KANGz3Y0W5l9CWGjfhjJEefDQ=";
             fetchSubmodules = true;
@@ -91,23 +89,26 @@
           '';
         };
       in {
-        packages.default = pkgs.stdenv.mkDerivation {
-          name = "zirpu";
-          version = "0.0.1";
+        packages = {
+          inherit rwkv;
+          default = pkgs.stdenv.mkDerivation {
+            name = "zirpu";
+            version = "0.0.1";
 
-          src = ./src;
+            src = ./src;
 
-          buildInputs = [ rwkv ];
+            buildInputs = [ rwkv ];
 
-          patchPhase = ''
-            sed -i -e 's,/usr/bin/env ,${py}/bin/,' *.py
-          '';
+            patchPhase = ''
+              sed -i -e 's,/usr/bin/env ,${py}/bin/,' *.py
+            '';
 
-          installPhase = ''
-            mkdir -p $out/bin/gens/
-            cp *.py $out/bin/
-            cp gens/*.py $out/bin/gens/
-          '';
+            installPhase = ''
+              mkdir -p $out/bin/gens/
+              cp *.py $out/bin/
+              cp gens/*.py $out/bin/gens/
+            '';
+          };
         };
         devShells.default = pkgs.mkShell {
           name = "zirpu-env";