-
Notifications
You must be signed in to change notification settings - Fork 10.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* style: format with nixfmt/rfc101-style * build(nix): Package gguf-py * build(nix): Refactor to new scope for gguf-py * build(nix): Exclude gguf-py from devShells * build(nix): Refactor gguf-py derivation to take in exact deps * build(nix): Enable pytestCheckHook and pythonImportsCheck for gguf-py * build(python): Package python scripts with pyproject.toml * chore: Cleanup * dev(nix): Break up python/C devShells * build(python): Relax pytorch version constraint Nix has an older version * chore: Move cmake to nativeBuildInputs for devShell * fmt: Reconcile formatting with rebase * style: nix fmt * cleanup: Remove unncessary __init__.py * chore: Suggestions from review - Filter out non-source files from llama-scripts flake derivation - Clean up unused closure - Remove scripts devShell * revert: Bad changes * dev: Simplify devShells, restore the -extra devShell * build(nix): Add pyyaml for gguf-py * chore: Remove some unused bindings * dev: Add tiktoken to -extra devShells
- Loading branch information
Showing
9 changed files
with
346 additions
and
257 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,52 @@ | ||
{ inputs, ... }: | ||
|
||
{ | ||
perSystem = | ||
{ config, lib, ... }: | ||
{ | ||
config, | ||
lib, | ||
system, | ||
... | ||
}: | ||
{ | ||
devShells = | ||
lib.concatMapAttrs | ||
(name: package: { | ||
${name} = package.passthru.shell; | ||
${name + "-extra"} = package.passthru.shell-extra; | ||
}) | ||
config.packages; | ||
let | ||
pkgs = import inputs.nixpkgs { inherit system; }; | ||
stdenv = pkgs.stdenv; | ||
scripts = config.packages.python-scripts; | ||
in | ||
lib.pipe (config.packages) [ | ||
(lib.concatMapAttrs ( | ||
name: package: { | ||
${name} = pkgs.mkShell { | ||
name = "${name}"; | ||
inputsFrom = [ package ]; | ||
shellHook = '' | ||
echo "Entering ${name} devShell" | ||
''; | ||
}; | ||
"${name}-extra" = | ||
if (name == "python-scripts") then | ||
null | ||
else | ||
pkgs.mkShell { | ||
name = "${name}-extra"; | ||
inputsFrom = [ | ||
package | ||
scripts | ||
]; | ||
# Extra packages that *may* be used by some scripts | ||
packages = [ | ||
pkgs.python3Packages.tiktoken | ||
]; | ||
shellHook = '' | ||
echo "Entering ${name} devShell" | ||
addToSearchPath "LD_LIBRARY_PATH" "${lib.getLib stdenv.cc.cc}/lib" | ||
''; | ||
}; | ||
} | ||
)) | ||
(lib.filterAttrs (name: value: value != null)) | ||
]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
{ | ||
lib, | ||
llamaVersion, | ||
numpy, | ||
tqdm, | ||
sentencepiece, | ||
pyyaml, | ||
poetry-core, | ||
buildPythonPackage, | ||
pytestCheckHook, | ||
}: | ||
|
||
buildPythonPackage { | ||
pname = "gguf"; | ||
version = llamaVersion; | ||
pyproject = true; | ||
nativeBuildInputs = [ poetry-core ]; | ||
propagatedBuildInputs = [ | ||
numpy | ||
tqdm | ||
sentencepiece | ||
pyyaml | ||
]; | ||
src = lib.cleanSource ../../gguf-py; | ||
pythonImportsCheck = [ | ||
"numpy" | ||
"gguf" | ||
]; | ||
nativeCheckInputs = [ pytestCheckHook ]; | ||
doCheck = true; | ||
meta = with lib; { | ||
description = "Python package for writing binary files in the GGUF format"; | ||
license = licenses.mit; | ||
maintainers = [ maintainers.ditsuke ]; | ||
}; | ||
} |
Oops, something went wrong.