From 8d6b9300838328d53edb7633afd3728c593c2659e00a476b5db7858d1258ab20 Mon Sep 17 00:00:00 2001 From: Eyad Issa Date: Thu, 18 Jul 2024 12:13:25 +0000 Subject: [PATCH 1/3] =?UTF-8?q?-=20Update=20to=20version=200.2.6:=20=20=20?= =?UTF-8?q?*=20New=20models:=20Math=CE=A3tral=20is=20a=207B=20model=20desi?= =?UTF-8?q?gned=20for=20math=20=20=20=20=20reasoning=20and=20scientific=20?= =?UTF-8?q?discovery=20by=20Mistral=20AI.=20=20=20*=20Fixed=20issue=20wher?= =?UTF-8?q?e=20uppercase=20roles=20such=20as=20USER=20would=20no=20longer?= =?UTF-8?q?=20=20=20=20=20work=20in=20the=20chat=20endpoints=20=20=20*=20F?= =?UTF-8?q?ixed=20issue=20where=20empty=20system=20message=20would=20be=20?= =?UTF-8?q?included=20in=20the=20=20=20=20=20prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ollama?expand=0&rev=33 --- _service | 2 +- _servicedata | 2 +- ollama-0.2.5.obscpio | 3 --- ollama-0.2.6.obscpio | 3 +++ ollama.changes | 11 +++++++++++ ollama.obsinfo | 6 +++--- ollama.spec | 21 ++++++++++----------- vendor.tar.zstd | 4 ++-- 8 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 ollama-0.2.5.obscpio create mode 100644 ollama-0.2.6.obscpio diff --git a/_service b/_service index c1ea1fa..846db95 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/ollama/ollama.git git - v0.2.5 + v0.2.6 @PARENT_TAG@ v(.*) enable diff --git a/_servicedata b/_servicedata index ce1c968..e9fa81a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/ollama/ollama.git - f7ee0123008dbdb3fd5954438d12196951b58b78 \ No newline at end of file + b2554455572b28c0e18423d6fe6896cf7137dbd6 \ No newline at end of file diff --git a/ollama-0.2.5.obscpio b/ollama-0.2.5.obscpio deleted file mode 100644 index 77a32dd..0000000 --- a/ollama-0.2.5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a19afdb4bd732dd717c5a97dc8baed30939f4cd74395c304876ef837d041d6f -size 161660942 diff --git a/ollama-0.2.6.obscpio b/ollama-0.2.6.obscpio new file mode 100644 index 0000000..1266c77 --- /dev/null +++ b/ollama-0.2.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:391fad97bacee37e8fab00273fd5d5a0a20912fd47c51907131ee1f274c7d2bf +size 161902606 diff --git a/ollama.changes b/ollama.changes index ff029f2..0ddbbf4 100644 --- a/ollama.changes +++ b/ollama.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 18 12:11:08 UTC 2024 - Eyad Issa + +- Update to version 0.2.6: + * New models: MathΣtral is a 7B model designed for math + reasoning and scientific discovery by Mistral AI. + * Fixed issue where uppercase roles such as USER would no longer + work in the chat endpoints + * Fixed issue where empty system message would be included in the + prompt + ------------------------------------------------------------------- Sun Jul 14 17:48:36 UTC 2024 - eyadlorenzo@gmail.com diff --git a/ollama.obsinfo b/ollama.obsinfo index f4b72f3..05ebd4d 100644 --- a/ollama.obsinfo +++ b/ollama.obsinfo @@ -1,4 +1,4 @@ name: ollama -version: 0.2.5 -mtime: 1720908480 -commit: f7ee0123008dbdb3fd5954438d12196951b58b78 +version: 0.2.6 +mtime: 1721255711 +commit: b2554455572b28c0e18423d6fe6896cf7137dbd6 diff --git a/ollama.spec b/ollama.spec index 9dfadf4..f42a529 100644 --- a/ollama.spec +++ b/ollama.spec @@ -17,7 +17,7 @@ Name: ollama -Version: 0.2.5 +Version: 0.2.6 Release: 0 Summary: Tool for running AI models on-premise License: MIT @@ -28,17 +28,16 @@ Source2: ollama.service Source3: %{name}-user.conf Patch0: enable-lto.patch BuildRequires: cmake >= 3.24 +BuildRequires: git +BuildRequires: sysuser-tools +BuildRequires: zstd +BuildRequires: golang(API) >= 1.22 +%sysusers_requires %if 0%{?sle_version} == 150600 BuildRequires: gcc12-c++ %else BuildRequires: gcc-c++ >= 11.4.0 %endif -BuildRequires: git -BuildRequires: sysuser-tools -BuildRequires: zstd -BuildRequires: golang(API) >= 1.22 - -%{sysusers_requires} %description Ollama is a tool for running AI models on one's own hardware. @@ -73,10 +72,10 @@ go build . install -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name} install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-user.conf -install -d %{buildroot}/var/lib/%{name} +install -d %{buildroot}%{_localstatedir}/lib/%{name} -mkdir -p "%buildroot/%_docdir/%name" -cp -Ra docs/* "%buildroot/%_docdir/%name" +mkdir -p "%{buildroot}/%{_docdir}/%{name}" +cp -Ra docs/* "%{buildroot}/%{_docdir}/%{name}" %pre -f %{name}.pre %service_add_pre %{name}.service @@ -97,6 +96,6 @@ cp -Ra docs/* "%buildroot/%_docdir/%name" %{_bindir}/%{name} %{_unitdir}/%{name}.service %{_sysusersdir}/%{name}-user.conf -%attr(-, ollama, ollama) /var/lib/%{name} +%attr(-, ollama, ollama) %{_localstatedir}/lib/%{name} %changelog diff --git a/vendor.tar.zstd b/vendor.tar.zstd index aa4d859..37a1bf5 100644 --- a/vendor.tar.zstd +++ b/vendor.tar.zstd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a7dde5a5d4e0794b5a9b5e7dd865559a6625ef387a90d2843581d008a9c5af2 -size 5355013 +oid sha256:b9dabb1b28321cce2672e5b37eb792e904715539dad5ecabc0eee92d6b0b10e1 +size 5355343 From 3e72c81bf145bbc1b32e367eb7d6323922b8519ed9fdf0502b7361a58e99d61e Mon Sep 17 00:00:00 2001 From: Eyad Issa Date: Thu, 18 Jul 2024 12:28:24 +0000 Subject: [PATCH 2/3] - Added %check section - Use -v when building OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ollama?expand=0&rev=34 --- ollama.changes | 5 ++++- ollama.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ollama.changes b/ollama.changes index 0ddbbf4..3db94e0 100644 --- a/ollama.changes +++ b/ollama.changes @@ -1,5 +1,8 @@ ------------------------------------------------------------------- -Thu Jul 18 12:11:08 UTC 2024 - Eyad Issa +Thu Jul 18 12:27:54 UTC 2024 - Eyad Issa + +- Added %check section +- Use -v when building - Update to version 0.2.6: * New models: MathΣtral is a 7B model designed for math diff --git a/ollama.spec b/ollama.spec index f42a529..642dd45 100644 --- a/ollama.spec +++ b/ollama.spec @@ -66,7 +66,7 @@ export GOFLAGS="-mod=vendor" export OLLAMA_SKIP_PATCHING=1 go generate ./... -go build . +go build -v . %install install -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name} @@ -77,6 +77,9 @@ install -d %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p "%{buildroot}/%{_docdir}/%{name}" cp -Ra docs/* "%{buildroot}/%{_docdir}/%{name}" +%check +go test ./... + %pre -f %{name}.pre %service_add_pre %{name}.service From 44981711f927bc33c62acf2b976ec9649376b3b2a7115eb9c979efbff9043a7d Mon Sep 17 00:00:00 2001 From: Eyad Issa Date: Thu, 18 Jul 2024 13:09:42 +0000 Subject: [PATCH 3/3] - Fixed issue with shared libraries OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ollama?expand=0&rev=35 --- enable-lto.patch | 2 +- ollama.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/enable-lto.patch b/enable-lto.patch index c018f14..f06c89f 100644 --- a/enable-lto.patch +++ b/enable-lto.patch @@ -22,7 +22,7 @@ index db2c6c3..8194cd9 100755 # -DGGML_AVX512_VNNI -- 2021 Intel Alder Lake COMMON_CPU_DEFS="-DBUILD_SHARED_LIBS=off -DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_OPENMP=off" -+ COMMON_CPU_DEFS="-DGGML_LTO=on -DCMAKE_BUILD_TYPE=Release" ++ COMMON_CPU_DEFS="${COMMON_CPU_DEFS} -DGGML_LTO=on -DCMAKE_BUILD_TYPE=Release" if [ -z "${OLLAMA_CPU_TARGET}" -o "${OLLAMA_CPU_TARGET}" = "cpu" ]; then # # CPU first for the default library, set up as lowest common denominator for maximum compatibility (including Rosetta) diff --git a/ollama.changes b/ollama.changes index 3db94e0..2824a0b 100644 --- a/ollama.changes +++ b/ollama.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 18 13:09:10 UTC 2024 - Eyad Issa + +- Fixed issue with shared libraries + ------------------------------------------------------------------- Thu Jul 18 12:27:54 UTC 2024 - Eyad Issa