Commit Graph

76 Commits

Author SHA1 Message Date
abysssol
78389c563c
ollama: only set updateScript for ollama, not ollama-{rocm,cuda} (#345375) 2024-10-02 19:39:18 -04:00
Pol Dellaiera
a4676ca192 ollama: 0.3.11 -> 0.3.12 2024-09-28 18:34:11 +02:00
abysssol
9a3eba01c5 ollama: only set updateScript for ollama, not ollama-{rocm,cuda} 2024-09-26 14:26:02 -04:00
Pol Dellaiera
5fea7ad909
ollama: fix rocm build (#344236) 2024-09-24 23:15:39 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Adam Stephens
194b237e42
ollama: fix rocm build
upstream added this extra cp, but it fails because it has already copied over the required symlinks. since we provide our own runtime anyway, i'm not sure what value this has regardless.

+ for dep in $(ldd "${BUILD_DIR}/bin/ollama_llama_server" | grep "=>" | cut -f2 -d= | cut -f2 -d' ' | grep -v "${GOARCH}/rocm${ROCM_VARIANT}" | grep -e rocm -e amdgpu -e libtinfo -e libnuma -e libelf)
+ cp -a /nix/store/d7wl4hnydqbqc2j1qg29sybpc614wkz8-rocm-path/lib/libhipblas.so.2 /nix/store/d7wl4hnydqbqc2j1qg29sybpc614wkz8-rocm-path/lib/libhipblas.so.2.0 ../../dist/linux-amd64//../linux-amd64-rocm/lib/ollama
++ readlink -f /nix/store/d7wl4hnydqbqc2j1qg29sybpc614wkz8-rocm-path/lib/libhipblas.so.2
+ '[' /nix/store/2c04lrnax0x0jcdrdins3wykm1lb1360-hipblas-6.0.2/lib/libhipblas.so.2.0 '!=' /nix/store/d7wl4hnydqbqc2j1qg29sybpc614wkz8-rocm-path/lib/libhipblas.so.2 ']'
++ readlink -f /nix/store/d7wl4hnydqbqc2j1qg29sybpc614wkz8-rocm-path/lib/libhipblas.so.2
+ cp /nix/store/2c04lrnax0x0jcdrdins3wykm1lb1360-hipblas-6.0.2/lib/libhipblas.so.2.0 ../../dist/linux-amd64//../linux-amd64-rocm/lib/ollama
cp: '/nix/store/2c04lrnax0x0jcdrdins3wykm1lb1360-hipblas-6.0.2/lib/libhipblas.so.2.0' and '../../dist/linux-amd64//../linux-amd64-rocm/lib/ollama/libhipblas.so.2.0' are the same file
2024-09-24 11:43:54 -04:00
Adam Stephens
4a150a2dd2
ollama: 0.3.10 -> 0.3.11 2024-09-19 09:27:19 -04:00
Adam Stephens
0c0ef784a3
ollama: add updateScript 2024-09-19 09:26:49 -04:00
abysssol
d6f49d6068 ollama: add cuda libs to wrapper's LD_LIBRARY_PATH 2024-09-18 23:12:04 -04:00
abysssol
d43a626213 ollama: reformat bash where patches are applied 2024-09-18 13:35:50 -04:00
abysssol
b3a96e6a9f ollama: move goBuild environment variables to env 2024-09-18 13:34:11 -04:00
Adam Stephens
4b87112848
ollama: add cuda-merged to buildInputs 2024-09-15 14:56:36 -04:00
edef
5db909d427 ollama: apply llama.cpp patches in postPatch
This removes the absurd mechanism introduced to jam them into the
patches attribute, along with the pointless busywork of updating
the list of patches and their hashes on every release.
2024-09-12 07:27:07 +00:00
edef
0eb5526b69 ollama: don't build llama.cpp twice
buildGoModules runs preBuild hooks in the module download fixed-output
derivation, so llama.cpp got built and immediately discarded, to then
immediately be built again for the actual Go build.
2024-09-12 06:26:09 +00:00
abysssol
e7929df5a0 ollama: 0.3.9 -> 0.3.10
changelog: https://github.com/ollama/ollama/releases/tag/v0.3.10
diff: https://github.com/ollama/ollama/compare/v0.3.9...v0.3.10
2024-09-08 21:50:55 -04:00
abysssol
21064e2260 ollama: 0.3.5 -> 0.3.9
changelog 0.3.6: https://github.com/ollama/ollama/releases/tag/v0.3.6
changelog 0.3.7: https://github.com/ollama/ollama/releases/tag/v0.3.7
changelog 0.3.8: https://github.com/ollama/ollama/releases/tag/v0.3.8
changelog 0.3.9: https://github.com/ollama/ollama/releases/tag/v0.3.9
diff: https://github.com/ollama/ollama/compare/v0.3.5...v0.3.9
2024-09-01 14:58:10 -04:00
abysssol
57ce70f361 ollama: only run service test on linux
Darwin currently attempts to build the nixos test, but is unable to,
which causes the whole `passthru.tests` on darwin to fail.
2024-08-13 09:37:35 -04:00
R. Ryantm
5ed7840129 ollama: 0.3.4 -> 0.3.5 2024-08-13 03:13:00 +00:00
superherointj
363da96864
Merge pull request #332492 from znaniye/pr-331959
odin: dev-2024-07 -> 0-unstable-2024-08-05
2024-08-08 16:34:32 -03:00
Pol Dellaiera
fcaf39b0e7
ollama: 0.3.1 -> 0.3.4
diff: https://github.com/ollama/ollama/compare/v0.3.1..v0.3.4
changelog: https://github.com/ollama/ollama/releases/tag/v0.3.4
2024-08-08 14:55:14 +02:00
znaniye
d556733f07 ols: 0-unstable-2024-07-01 -> 0-unstable-2024-08-05 2024-08-05 16:52:13 -03:00
abysssol
ab2c4b7afb ollama: update hash for 0.3.1
it appears that upstream ollama changed the `v0.3.1` tag
2024-08-02 09:49:23 -04:00
abysssol
4fecea8f12 ollama: 0.3.0 -> 0.3.1
changelog: https://github.com/ollama/ollama/releases/tag/v0.3.1
diff: https://github.com/ollama/ollama/compare/v0.3.0...v0.3.1
2024-07-30 06:35:18 -04:00
redyf
1f28e85a3f ollama: 0.2.8 -> 0.3.0 2024-07-26 00:53:07 -04:00
Pol Dellaiera
96b9e395c4
ollama: replace variable with with keyword 2024-07-24 09:04:07 +02:00
Pol Dellaiera
91704c4b25
ollama: move the assert after the top level parameters 2024-07-24 09:04:07 +02:00
Pol Dellaiera
bdfde18037
ollama: reformat with nixfmt-rfc-style 2024-07-24 09:04:07 +02:00
Pol Dellaiera
a22838c965
ollama: 0.2.7 -> 0.2.8
changelog: https://github.com/ollama/ollama/releases/tag/v0.2.8
diff: https://github.com/ollama/ollama/compare/v0.2.7..v0.2.8
2024-07-24 09:04:07 +02:00
Redyf
d7d275085c ollama: 0.2.5 -> 0.2.7 2024-07-18 22:36:45 -03:00
Pol Dellaiera
28d8f79a66
Merge pull request #327505 from redyf/update-ollama
ollama: 0.2.1 -> 0.2.5
2024-07-16 21:15:01 +02:00
Pol Dellaiera
dfef8af6e9
Merge pull request #326939 from abysssol/ollama-split-test
nixos/ollama: split cuda and rocm from service test
2024-07-16 21:02:07 +02:00
Redyf
a87e36b0dc ollama: 0.2.1 -> 0.2.5 2024-07-15 20:03:11 -03:00
abysssol
aa8e02582d nixos/ollama: split cuda and rocm from service test
Cuda and rocm are platform specific, only working on linux.
Also, ofborg won't run any of the service test at all because
cuda is unfreely licensed.
2024-07-14 22:01:56 -04:00
abysssol
110aaf74c4
Merge pull request #326860 from redyf/update-ollama
ollama: 0.1.48 -> 0.2.1
2024-07-14 14:37:07 +00:00
Redyf
abed3337f7 ollama: 0.1.48 -> 0.2.1 2024-07-13 15:19:14 -03:00
Thiago Kenji Okada
e505595836
Merge pull request #326036 from spitulax/odinfmt
ols: include `odinfmt` in derivation
2024-07-12 16:40:31 +01:00
Bintang Adiputra Pratama
29577a69a1
ols: include odinfmt in derivation 2024-07-10 15:02:54 +07:00
Kirill Radzikhovskyy
558596e235 ollama: unpin buildGoModule 2024-07-10 10:58:00 +10:00
R. Ryantm
7a1be81f82 ols: 0-unstable-2024-06-18 -> 0-unstable-2024-07-01 2024-07-06 15:57:13 +00:00
Yuxuan Shui
46356c6145 ollama: fix cuda support
Fixes: 82018339bd
2024-07-04 17:53:42 +01:00
Someone
d5491008d9
Merge pull request #323056 from SomeoneSerge/fix/cudaPackages/outputSpecified
cudaPackages: make getOutput work again
2024-07-03 19:19:51 +00:00
abysssol
9b72ff7182 ollama: 0.1.47 -> 0.1.48
changelog: https://github.com/ollama/ollama/releases/tag/v0.1.48
2024-07-03 05:15:47 -04:00
abysssol
2e750d417d ollama: add necessary /lib suffix to fix rocm 2024-07-02 22:52:49 -04:00
Someone Serge
82018339bd treewide: cuda: use propagatedBuildInputs, lib.getOutput 2024-07-02 01:47:19 +00:00
abysssol
559cffd864 ollama: add rocmPath to LD_LIBRARY_PATH in wrapper
Pr #323249 removed `rocmPath` from `LD_LIBRARY_PATH`, but the comment
> since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly

makes me think I already tested this and that it doesn't work
2024-07-01 19:24:35 -04:00
abysssol
9f910d23b4 ollama: switch to autoAddDriverRunpath
`linuxPackages.nvidia_x11` is a driver, and isn't intended to be directly linked like a library.
`autoAddDriverRunpath` should be able to make ollama work without it.
2024-07-01 04:50:20 -04:00
Redyf
3473971240 ollama: 0.1.45 -> 0.1.47
changelog: https://github.com/ollama/ollama/releases/tag/v0.1.46
changelog: https://github.com/ollama/ollama/releases/tag/v0.1.47
2024-06-27 14:43:46 -04:00
R. Ryantm
adf24f8b90 ols: 0-unstable-2024-06-13 -> 0-unstable-2024-06-18 2024-06-24 01:40:26 +00:00
abysssol
00c876544e ollama: refactor wrapper options 2024-06-22 13:14:04 -04:00
abysssol
e9d30832b7 ollama: 0.1.44 -> 0.1.45
changelog: https://github.com/ollama/ollama/releases/tag/v0.1.45
2024-06-20 21:54:53 -04:00