1. 26 Sep, 2025 1 commit
    • Patrick Devine's avatar
      bugfix: restore the current runOptions if loading fails in the CLI (#12402) · b04e46da
      Patrick Devine authored
      There are two bugs when using `/load <model>` for a model that doesn't exist, namely:
        1. it will not restore the current model settings if the current model is a thinking model; and
        2. it will crash is the current model is a non-thinking model
      
      This bug fix saves the current runOptions and then restores them if the model load
      doesn't happen. It also fixes the crash happening for non-thinking models.
      b04e46da
  2. 25 Sep, 2025 4 commits
  3. 24 Sep, 2025 5 commits
    • Grace's avatar
      Grace/deepseek v3 migration (#12385) · fbd82ba5
      Grace authored
      
      
      * init deepseek model file
      
      * temp removal of flash attention implementation
      
      * shapes and proper, can make a pass
      
      * query, key, value have good cosine similarity, but the max diff is a bit high
      
      * Attention block is working! ** with eager for now, have not added the mask line
      
      * Attention block is working! ** with eager for now, have not added the mask line
      
      * working MoE at around 0.95 cosine sim
      
      * added cosine similarity function
      
      * Starting end to end structure
      
      * Trying (and failing) to get rope to work, going to test full thing on tater
      
      * running on tater36... just not the right outputs
      
      * we have the right values for rope... but its still not working?
      
      * chnage Extrapolation Factor to 1
      
      * removed adding residuals twice, removed normalization from shared expert, refactored Norms (Attention, MLP) to be outside the (Attention, MLP) blocks and in the Transformer block instead, add cache setLayer
      
      * Temporary modelfiles for cpu
      
      * change kpass intermediate step to kv, two layer outputs [0,1] look fine
      
      * this calls for 16 chicken nuggets
      
      * whoops
      
      * cleaning up code
      
      * delete stuff we dont need
      
      * getting rid of debug statements for llama cpp
      
      * working with long contexts
      
      * fix long context view error
      
      * reverting some changes I made for files that are not apart of pr
      
      * Added proper tokenizer for deeepseek3
      
      * clean up model and go test
      
      * remove Modelfile
      
      * not passing the tests
      
      * whoops
      
      * how to pass the ci tests
      
      * resolving some of the comments
      
      * rename
      
      * linted and renamed deepseek3 -> deepseek2
      
      * remove name go
      
      * addressed changes - main change was adopting qwen3 naming scheme
      
      * I cannot with linters
      
      * clean up logs
      
      * clean up logs
      
      ---------
      Co-authored-by: default avatarGrace Guo <graceguo@Graces-MBP.localdomain>
      Co-authored-by: default avatarGrace Guo <graceguo@Graces-MacBook-Pro.local>
      Co-authored-by: default avatargraceguo <graceguo@tater36.localdomain>
      fbd82ba5
    • Michael Yang's avatar
      prefer ollama engine for qwen3moe (#12374) · 2e742544
      Michael Yang authored
      2e742544
    • Devon Rifkin's avatar
      Merge pull request #12393 from ollama/drifkin/fix-built-ins · bbb195a6
      Devon Rifkin authored
      harmony: don't sanitize built-ins
      bbb195a6
    • Devon Rifkin's avatar
      harmony: don't sanitize built-ins · fd88cd7c
      Devon Rifkin authored
      In #11910 we started sanitizing function names, but we accidentally were
      modifying built-ins like `browser.open` to `browser_open`. This was
      removing the special prompt rendering for built-ins, but this wasn't
      immediately apparent since the models seem to be reasonably good at
      remembering the built-ins even when presented with these slightly
      renamed version. This fix prevents built-ins from ever being renamed.
      fd88cd7c
    • Michael Yang's avatar
      fix: leaf alt name (#12390) · e1979c57
      Michael Yang authored
      a leaf node with an alternative name gets all its alternatives names
      added into the same branch rather than creating branches themselves
      e1979c57
  4. 23 Sep, 2025 3 commits
  5. 22 Sep, 2025 4 commits
  6. 20 Sep, 2025 2 commits
    • Devon Rifkin's avatar
      Merge pull request #12358 from ollama/drifkin/qwen3-coder-ampersands · 3677842f
      Devon Rifkin authored
      parsers: fix `&`s in qwen3coder parameter values
      3677842f
    • Devon Rifkin's avatar
      parsers: fix `&`s in qwen3coder parameter values · 242df70a
      Devon Rifkin authored
      In <https://github.com/ollama/ollama/issues/12357> we that the model
      will output tool calls such as
      
      ```
      <function=shell>
      <parameter=command>
      pwd && ls -la
      </parameter>
      </function>
      ```
      
      We parse this using the approach of transforming into valid xml and then
      using an xml parser. While we do transform the function and parameter
      names, we weren't escaping the parameter values (which in this example
      are invalid since `pwd && ls -la` contains unescaped ampersands).
      
      This has been fixed by first transforming the tags in the same way, and
      then walking the transformed string and escaping the text in between the
      tags. This also fixes a case where `<` in the middle of a parameter
      value would cause an xml parse failure.
      
      Fixes: #12357
      242df70a
  7. 19 Sep, 2025 1 commit
  8. 18 Sep, 2025 8 commits
  9. 17 Sep, 2025 6 commits
  10. 16 Sep, 2025 5 commits
  11. 15 Sep, 2025 1 commit