Commit Graph

  • 63b804dcd5
    Merge f3af048e63a942fa80a70899361b21de98aa4f4d into 021dcf089d77292976ee7655eca424dd0b53b8f4 Bruno Cabral 2025-03-18 20:41:30 +08:00
  • 6584b12cc7
    Merge a255f0b65bfa1c1115c190e9a02173e9e5c6b3c1 into 021dcf089d77292976ee7655eca424dd0b53b8f4 samanamd 2025-03-18 20:40:18 +08:00
  • fc02ebc7ba
    Merge a7dd24e6c92fd31bca9ab18e4c02637881d01d89 into 021dcf089d77292976ee7655eca424dd0b53b8f4 湛露先生 2025-03-18 11:28:22 +00:00
  • a7dd24e6c9
    Fix dockerfile. zhanluxianshen 2025-03-18 19:27:36 +08:00
  • 5fcb7f4ad0
    Merge 4c3f2fb72b25a6fbe7bd06d0ab8f20d6645f3e9a into 021dcf089d77292976ee7655eca424dd0b53b8f4 zoupingshi 2025-03-18 12:11:26 +01:00
  • d7c858e774
    Merge 444a67cffa54436164ac44a110db9ebc9a2603be into 021dcf089d77292976ee7655eca424dd0b53b8f4 Charles Holtzkampf 2025-03-18 10:20:39 +00:00
  • 952fdfb84c
    Merge 7a8c8c4c885bc53850656116d5fe76eced2fccca into 021dcf089d77292976ee7655eca424dd0b53b8f4 Mateusz Drab 2025-03-18 00:10:49 -07:00
  • e9f6ed32ff
    Merge 31bf8b6fd9d0a974e7f06d47eecfff058527f4d2 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Hichem Fantar 2025-03-18 12:50:42 +07:00
  • ccb1d54f52
    Merge 0749160a245e653ac9d4095e7f6c1833a813ffbb into 021dcf089d77292976ee7655eca424dd0b53b8f4 Xavier Rey-Robert @ IBM 2025-03-18 06:30:33 +01:00
  • 122448b083
    Merge 00fec899e985cefb256ddfb441009248633178c5 into 021dcf089d77292976ee7655eca424dd0b53b8f4 湛露先生 2025-03-18 05:27:05 +00:00
  • 00fec899e9
    examples clean , code optimize zhanluxianshen 2025-03-18 13:25:30 +08:00
  • a956331f9f
    Merge e0d4d84a4a73f08776d92d04ff174e1e97fdf295 into 021dcf089d77292976ee7655eca424dd0b53b8f4 copeland3300 2025-03-18 05:04:17 +00:00
  • e0d4d84a4a
    Added useful args to linux command copeland3300 2025-03-18 01:03:39 -04:00
  • 098e490f5c
    Merge c75b428249af016a49d1bcea261945999202fd6c into 021dcf089d77292976ee7655eca424dd0b53b8f4 Patrick Devine 2025-03-17 21:50:24 -07:00
  • c75b428249 fix: fixes a memory leak in bfloat16 package pdevine/bfloat16 Patrick Devine 2025-03-17 21:46:12 -07:00
  • 78e13ddb5a
    Merge 55226cf13dafcd9c7fcc1facf6738f3f9dd8b357 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Eugene Kamenev 2025-03-18 12:12:07 +08:00
  • c454945faa
    Merge 63aea29a6fd27513ef2103c199c7417f18a7fb70 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Grzegorz Wierzowiecki 2025-03-18 11:45:52 +08:00
  • 421cc3e80c
    Merge c26ae9597da58955a8718ae83def67d83df2236b into 021dcf089d77292976ee7655eca424dd0b53b8f4 Asutorufa 2025-03-18 11:45:35 +08:00
  • 0cad9d281f
    Merge 781585d9bd3816c52c9319a8fff45bc7a6863e46 into 021dcf089d77292976ee7655eca424dd0b53b8f4 royjhan 2025-03-18 10:22:19 +07:00
  • 6255ff8c61
    Merge ea32c913b2ece53e32723d157e67c92d3c25474d into 021dcf089d77292976ee7655eca424dd0b53b8f4 Alex Rozgo 2025-03-17 20:20:31 -07:00
  • c78bb4604e
    Merge 253b3c7a2562355ae77edd4c862d2c1901b36f63 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Parth Sareen 2025-03-18 03:17:08 +00:00
  • 253b3c7a25 remove errors from sample, add tests parth/sample-greedy-fallback ParthSareen 2025-03-17 23:16:42 -04:00
  • 71692630d4
    Merge ff5334c823c80f8460e8aee196faa9155fdc7a9c into 021dcf089d77292976ee7655eca424dd0b53b8f4 Christian Neff 2025-03-18 03:19:18 +01:00
  • 9b7ed75b11
    Merge d1ee29a1d4563491ffad83c2498d28f766342a14 into 021dcf089d77292976ee7655eca424dd0b53b8f4 maurice 2025-03-18 09:41:42 +08:00
  • 0f86549cb5
    Merge 848e8a858b6369a21f93c791b5f9dd4139b8c110 into 021dcf089d77292976ee7655eca424dd0b53b8f4 R0CKSTAR 2025-03-18 09:39:24 +08:00
  • 5e151461fd
    Merge 3704eca232a3b83746796ee9667875d8a256e27f into 021dcf089d77292976ee7655eca424dd0b53b8f4 Vincent RAMPAL 2025-03-18 09:30:42 +08:00
  • c774cec157
    Merge 544dbeae62d40c4eb08495706aa98f77d2ad6717 into 021dcf089d77292976ee7655eca424dd0b53b8f4 湛露先生 2025-03-18 09:08:33 +08:00
  • bd45438a3f
    Merge ab6cd8d00bb0b1b8377c6d9f94e8c34ece6516e6 into 021dcf089d77292976ee7655eca424dd0b53b8f4 湛露先生 2025-03-18 09:08:32 +08:00
  • 4ae3f279cd
    Merge 368934e12694774f8eaa7409ce832a12e23db633 into 021dcf089d77292976ee7655eca424dd0b53b8f4 湛露先生 2025-03-18 09:08:30 +08:00
  • 049407e7bc
    Merge ee64de7a7312b30b5d3efa23a160f49d867e2357 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Jordan McCallum 2025-03-17 17:56:37 -07:00
  • 587fa82928
    Merge 6ff6166d9f9d73c88a285a3b15470bca1943c2b7 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Wind 2025-03-18 09:47:35 +09:00
  • df54680264
    Merge 2069f0a83e45c4bb9a78f79146d41c97b076b249 into 021dcf089d77292976ee7655eca424dd0b53b8f4 frob 2025-03-17 16:56:04 -07:00
  • 360df2b4b9
    Merge 02b53a1af40694337ec371f56359fdadfbcd2047 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Nicholas Lee 2025-03-18 08:49:05 +09:00
  • f94155fba2 do not add both consolidated and parts to model brucemacd/jomorganca/mistral Bruce MacDonald 2025-03-17 16:33:43 -07:00
  • 0553520b3a
    Merge ddb6dc81c26721a08453f1db7f2727076e97dabc into 021dcf089d77292976ee7655eca424dd0b53b8f4 alexhegit 2025-03-18 00:24:26 +01:00
  • 957c30ad00
    Merge 7b3c3135de4b4dcabe24666521229bba3b532d31 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Daniel Hiltgen 2025-03-18 00:18:47 +01:00
  • 7890998927
    Merge c7c751647dc5c0e0012a127bf2bab1923ed41bad into 021dcf089d77292976ee7655eca424dd0b53b8f4 Bruce MacDonald 2025-03-17 19:05:00 -04:00
  • 4dde9e2588
    Merge 03c1be1b9c522474e4418c0b804c3276469fbb81 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Joshua F 2025-03-18 09:03:12 +10:00
  • 3e0a20a583
    Merge c4f15629b46f1afbc11d67e6464edeaf08ac6aee into 021dcf089d77292976ee7655eca424dd0b53b8f4 boxjan 2025-03-18 09:03:12 +10:00
  • fcdaa00825
    test.yaml artificial-intelligence-ui 2025-03-17 18:59:42 -04:00
  • 6cd5a83e61
    Merge 34f6d98cf7c1ebf2bb6705ee35ee0fbcf4b04c32 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Clinton Renton 2025-03-17 22:57:50 +00:00
  • 34f6d98cf7
    Merge branch 'ollama:main' into ollama-first-pr Clinton Renton 2025-03-18 08:57:48 +10:00
  • 2a0c1776be
    Merge 22f2f6e2291265a3f750c72ff6021e422415af89 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Bruce MacDonald 2025-03-17 18:54:48 -04:00
  • 104c34009d
    Merge c8f346dc46f6d2269e2dc57ae037ac9b03e80ea2 into 021dcf089d77292976ee7655eca424dd0b53b8f4 Daniel Hiltgen 2025-03-17 18:48:10 -04:00
  • 910d47bed8
    Merge 8170b0345de6aa78c679c9eae303fbf745f5bd7f into 021dcf089d77292976ee7655eca424dd0b53b8f4 MaciejMogilany 2025-03-17 22:45:53 +00:00
  • cf8c1b258f
    Merge 40c004d73898a3126b6b0185abc66eeee97c26de into 021dcf089d77292976ee7655eca424dd0b53b8f4 Alejandro Mongua 2025-03-18 08:42:14 +10:00
  • a4d9728988
    Merge 15225bd99ddd98d69514cff88e9bbbac548abba8 into 021dcf089d77292976ee7655eca424dd0b53b8f4 pacien 2025-03-17 22:41:47 +00:00
  • 130ccac98d
    Merge 200a3d90a9c0c28ae1187ecbbee1eae700db2a85 into 021dcf089d77292976ee7655eca424dd0b53b8f4 frob 2025-03-17 23:41:41 +01:00
  • 021dcf089d
    Merge pull request #9824 from ollama/mxyng/sched main v0.6.2-rc0 v0.6.2 Michael Yang 2025-03-17 15:41:37 -07:00
  • bf24498b1e ollamarunner: Check for minBatch of context space when shifting Jesse Gross 2025-03-17 12:03:06 -07:00
  • 626997a788 ollamarunner: Check for minBatch of context space when shifting Jesse Gross 2025-03-17 12:03:06 -07:00
  • 95e271d98f
    runner: remove cache prompt flag from ollama runner (#9826) Bruce MacDonald 2025-03-17 15:11:15 -07:00
  • 40c004d738 Tool calls processed independently of the content type Alejandro Mongua 2025-03-17 16:36:59 -05:00
  • b20d4fa57b
    Merge 986491d42c45903681f45820e61ffe8ec7aceba6 into 364629b8d6e004309ea348cb0375810967c160b8 Dorin-Andrei Geman 2025-03-17 14:29:07 -07:00
  • 8e541505db
    Merge 5044576079361d92bdc0dbc9b224cd90341fe74e into 364629b8d6e004309ea348cb0375810967c160b8 Ashok Gelal 2025-03-17 14:29:07 -07:00
  • 1c73054d33
    Merge 4462ecb418c3313b717be584253e8a8de30f3d6e into 364629b8d6e004309ea348cb0375810967c160b8 Johnny 2025-03-17 14:29:07 -07:00
  • 88e9a89e3e
    Merge a674d8544570e390315749d2d57e9e9b78182ce0 into 364629b8d6e004309ea348cb0375810967c160b8 tej 2025-03-17 14:29:07 -07:00
  • 9cf1dcbdd6
    Merge bf422973509d053d21abff3a22b462a934f55547 into 364629b8d6e004309ea348cb0375810967c160b8 frob 2025-03-17 14:29:07 -07:00
  • a6f5a7be9e
    Merge 6e967c49bfc19f1b91d2451eca994f0d397bbaa4 into 364629b8d6e004309ea348cb0375810967c160b8 巴斯.zznQ 2025-03-17 14:29:07 -07:00
  • 7088aed094
    Merge bc46d0f2ddba1bbd2846024ef5f090c17f587daf into 364629b8d6e004309ea348cb0375810967c160b8 Bruce MacDonald 2025-03-17 14:27:40 -07:00
  • 485f4ebbe3
    Merge adf63185f22b7abf9ab92797fbc8a6c3c881da84 into 364629b8d6e004309ea348cb0375810967c160b8 cocochick 2025-03-17 14:27:40 -07:00
  • 347533cdde
    Merge 86fd1bb275dfcfd9ae51f82e1763a8b29d57784f into 364629b8d6e004309ea348cb0375810967c160b8 Daniel Hiltgen 2025-03-17 13:48:21 -07:00
  • 8b32e53401 Fix template processing for tool calls in /v1/chat/completions endpoint Alejandro Mongua 2025-03-17 15:44:16 -05:00
  • c62c4c6024
    Merge eaa1ddce9291abc7ad72c37cfd6f0139dd453509 into 364629b8d6e004309ea348cb0375810967c160b8 its-so-fluffy 2025-03-17 20:42:40 +00:00
  • eaa1ddce92 unnecessary error logs Ludovic Bouvier-Johnston 2025-03-17 16:42:23 -04:00
  • 231184afd8 Merge remote-tracking branch 'ollamateam/main' into rocm-wsl-support-conflicts Ludovic Bouvier-Johnston 2025-03-17 16:39:00 -04:00
  • 9dab7e1580
    Merge e5e1dedccd11e253d24b22c60a78e589551f60e3 into 364629b8d6e004309ea348cb0375810967c160b8 frob 2025-03-17 21:37:11 +01:00
  • 126024ba1b
    Merge 9c23f11850e4df183ed92750306c30ef0e480e13 into 364629b8d6e004309ea348cb0375810967c160b8 Bruce MacDonald 2025-03-17 21:34:12 +01:00
  • 364629b8d6
    ml/backend/ggml: allocate memory with malloc when loading model (#9822) Jeffrey Morgan 2025-03-17 16:32:40 -04:00
  • 586557eb5a sample: add greedy sample as fallback ParthSareen 2025-03-13 13:55:00 -04:00
  • fe25abed03 add build as gitignore Ludovic Bouvier-Johnston 2025-03-17 15:16:54 -04:00
  • 22f2f6e229 llm: set done reason at server level brucemacd/done-reason Bruce MacDonald 2025-03-17 12:01:44 -07:00
  • c6c8984921 runner: remove cache prompt flag from ollama runner Bruce MacDonald 2025-03-17 11:28:35 -07:00
  • 823794d744
    Merge 4aa7e5ed79a8069fd88e09f40499d7f1c122c8e8 into 108fe021657ea1f7a012299f424d673e86512df2 Vadim Grinco 2025-03-17 19:26:43 +01:00
  • 108fe02165
    sample: make mutations in transforms explicit (#9743) Parth Sareen 2025-03-17 11:24:18 -07:00
  • 8025781dce wip jmorganca/mistral jmorganca 2025-03-16 21:58:21 -04:00
  • afb34b0e60 wip jmorganca 2025-03-16 13:30:12 -04:00
  • 191b1b1eb3 model: support for mistral-small in the ollama runner Bruce MacDonald 2025-03-14 16:56:32 -07:00
  • 45aa2dbe57 ml/backend/ggml: allocate memory with malloc when loading model jmorganca 2025-03-17 09:10:07 -07:00
  • c8f346dc46 Add MLX Backend POC Daniel Hiltgen 2025-03-12 11:15:18 -07:00
  • 4561fff36e conditionally enable parallel pipelines Michael Yang 2025-03-14 14:01:13 -07:00
  • 7b3c3135de Row Order model definitions Daniel Hiltgen 2025-01-31 08:07:15 -08:00
  • 50b5962042
    Add support for ROCm gfx1151 (#9773) Daniel Hiltgen 2025-03-17 09:33:57 -07:00
  • 0b9a51904d
    Merge 2872e89de06eae2c27150219f9af2a1f37345d82 into e27e4a3c1b9cb3a34178d5476debf805910e990a Th3On3 2025-03-17 23:45:45 +09:00
  • 245b8715b7
    Merge 5895266ccba0c6a5481375d18bb7cbe82da50d5a into e27e4a3c1b9cb3a34178d5476debf805910e990a Seth Landry 2025-03-17 20:55:31 +08:00
  • 226c33152a
    Merge fcfbb06f1bd3f9bda2641d9e7c34e83a5e73d257 into e27e4a3c1b9cb3a34178d5476debf805910e990a Michael Yang 2025-03-17 08:38:58 +01:00
  • f211db67b9
    Merge a473cc5e2344004f8f92ab448d627d53a1acb927 into e27e4a3c1b9cb3a34178d5476debf805910e990a Lars Erik Jordet 2025-03-17 09:21:24 +05:30
  • f577ba525b fix audio caitianchi 2025-03-17 11:39:35 +08:00
  • e27e4a3c1b
    readme: add screenpipe to community integrations (#9786) Louis Beaumont 2025-03-16 18:56:42 -07:00
  • 9e11fff307
    Merge branch 'main' into patch-1 Jeffrey Morgan 2025-03-16 21:56:02 -04:00
  • 088514bbd4
    readme: add Ellama to list of community integrations (#9800) zeo 2025-03-17 06:54:43 +05:00
  • 60817f6631 readme: add Ellama to list of integrations zeozeozeo 2025-03-17 03:45:25 +05:00
  • 5dd5ba2487
    Merge 07dae7b4a394da5546ccce9ac13a1533556aefc6 into 2c8b4846437747bd23e7a176f83011e39ec2128b JingWoo 2025-03-17 00:07:30 +08:00
  • dd26ee3464
    Merge b0467096266d06bd1fc20418356353861e4f4b1a into 2c8b4846437747bd23e7a176f83011e39ec2128b Adrien 2025-03-17 00:07:20 +08:00
  • 151ffcde4d
    Merge 4729c37ae7bd25f9e0716f80e055b6c557caf9e7 into 2c8b4846437747bd23e7a176f83011e39ec2128b Jo Liss 2025-03-16 16:56:25 +03:00
  • 1c8269cec0
    Merge 11eecdde8624ed27e97cbbeb507ebaad2f162429 into 2c8b4846437747bd23e7a176f83011e39ec2128b Parth Sareen 2025-03-16 16:55:25 +03:00
  • 7b250efd82
    Merge 937722a2af152d3b2a3f3198e7f5e60128f94328 into 2c8b4846437747bd23e7a176f83011e39ec2128b Dionisie Stratulat 2025-03-16 14:26:48 +01:00
  • 4aa7e5ed79 Merge ollama/ollama main into vulkan Vadim Grinco 2025-03-16 12:29:30 +01:00
  • 640f0bb250 Pulled new upstream code for ggml-bulkan backend Vadim Grinco 2025-03-16 12:22:22 +01:00
  • c2e440879a Applied 04-disable-mmap-vulkan.patch Vadim Grinco 2025-03-16 10:52:49 +01:00