Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flake.nix: rewrite #4605

Merged
merged 23 commits into from
Dec 29, 2023
Merged

flake.nix: rewrite #4605

merged 23 commits into from
Dec 29, 2023

Commits on Dec 26, 2023

  1. flake.lock: update to hotfix CUDA::cuda_driver 

    Required to support ggerganov#4606
    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    d3e73df View commit details
    Browse the repository at this point in the history

  2. flake.nix: rewrite 

    1. Split into separate files per output.

2. Added overlays, so that this flake can be integrated into others.
   The names in the overlay are `llama-cpp`, `llama-cpp-opencl`,
   `llama-cpp-cuda`, and `llama-cpp-rocm` so that they fit into the
   broader set of Nix packages from [nixpkgs](https://github.com/nixos/nixpkgs).

3. Use [callPackage](https://summer.nixos.org/blog/callpackage-a-tool-for-the-lazy/)
   rather than `with pkgs;` so that there's dependency injection rather
   than dependency lookup.

4. Add a description and meta information for each package.
   The description includes a bit about what's trying to accelerate each one.

5. Use specific CUDA packages instead of cudatoolkit on the advice of SomeoneSerge.

6. Format with `serokell/nixfmt` for a consistent style.

7. Update `flake.lock` with the latest goods.
    @philiptaron @SomeoneSerge
    philiptaron authored and SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    8364cf4 View commit details
    Browse the repository at this point in the history

  3. flake.nix: use finalPackage instead of passing it manually

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0607e24 View commit details
    Browse the repository at this point in the history

  4. nix: unclutter darwin support

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    eab1c12 View commit details
    Browse the repository at this point in the history

  5. nix: pass most darwin frameworks unconditionally 

    ...for simplicity
    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0259941 View commit details
    Browse the repository at this point in the history

  6. *.nix: nixfmt 

    nix shell github:piegamesde/nixfmt/rfc101-style --command \
    nixfmt flake.nix .devops/nix/*.nix
    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0fa62c1 View commit details
    Browse the repository at this point in the history

  7. flake.nix: add maintainers

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    69c56bc View commit details
    Browse the repository at this point in the history

  8. nix: move meta down to follow Nixpkgs style more closely

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    a07407c View commit details
    Browse the repository at this point in the history

  9. nix: add missing meta attributes 

    nix: clarify the interpretation of meta.maintainers

nix: clarify the meaning of "broken" and "badPlatforms"

nix: passthru: expose the use* flags for inspection

E.g.:

```
❯ nix eval .#cuda.useCuda
true
```
    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    04bc417 View commit details
    Browse the repository at this point in the history

  10. flake.nix: avoid re-evaluating nixpkgs too many times

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    d08690a View commit details
    Browse the repository at this point in the history

  11. flake.nix: use flake-parts

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    a28c9ac View commit details
    Browse the repository at this point in the history

  12. nix: migrate to pname+version

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    a629371 View commit details
    Browse the repository at this point in the history

  13. flake.nix: overlay: expose both the namespace and the default attribute

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    e3b1ba2 View commit details
    Browse the repository at this point in the history

  14. ci: add the (Nix) flakestry workflow

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    12d4a68 View commit details
    Browse the repository at this point in the history

  15. nix: cmakeFlags: explicit OFF bools

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    a16f589 View commit details
    Browse the repository at this point in the history

  16. nix: cuda: reduce runtime closure

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    dd0e12c View commit details
    Browse the repository at this point in the history

  17. nix: fewer rebuilds

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    4522c47 View commit details
    Browse the repository at this point in the history

  18. nix: respect config.cudaCapabilities

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    ae6bebc View commit details
    Browse the repository at this point in the history

  19. nix: add the impure driver's location to the DT_RUNPATHs

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    1efbc6b View commit details
    Browse the repository at this point in the history

  20. nix: clean sources more thoroughly 

    ...this way outPaths change less frequently,
and so there are fewer rebuilds
    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    82e48e2 View commit details
    Browse the repository at this point in the history

  21. nix: explicit mpi support

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    7bd8d8c View commit details
    Browse the repository at this point in the history

  22. nix: explicit jetson support

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    d0adab6 View commit details
    Browse the repository at this point in the history

  23. flake.nix: darwin: only expose the default

    @SomeoneSerge
    SomeoneSerge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    3f7003b View commit details
    Browse the repository at this point in the history