Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Marlin moe integration #266

Closed
wants to merge 48 commits into from
Closed

Marlin moe integration #266

wants to merge 48 commits into from

Commits on May 17, 2024

  1. Start working on linking the elements together

    @ElizaWszola
    ElizaWszola committed May 17, 2024
    1 Configuration menu
    Copy the full SHA
    15d0f20 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Runs to completion

    @ElizaWszola
    ElizaWszola committed May 21, 2024
    1 Configuration menu
    Copy the full SHA
    60c097c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Commit before moving things around in the kernel

    @ElizaWszola
    ElizaWszola committed May 22, 2024
    Configuration menu
    Copy the full SHA
    42750bc View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Fix shared memory issue

    @ElizaWszola
    ElizaWszola committed May 23, 2024
    1 Configuration menu
    Copy the full SHA
    b312ad5 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Fused marlin moe in model executor

    @ElizaWszola
    ElizaWszola committed May 24, 2024
    1 Configuration menu
    Copy the full SHA
    289cc8c View commit details
    Browse the repository at this point in the history

  2. Various small fixes

    @ElizaWszola
    ElizaWszola committed May 24, 2024
    1 Configuration menu
    Copy the full SHA
    f7b106e View commit details
    Browse the repository at this point in the history

  3. quantize outside fused_marlin_moe function

    @ElizaWszola
    ElizaWszola committed May 24, 2024
    1 Configuration menu
    Copy the full SHA
    6765bde View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Test shapes

    @ElizaWszola
    ElizaWszola committed May 27, 2024
    1 Configuration menu
    Copy the full SHA
    0886f76 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Better test, some passing

    @ElizaWszola
    ElizaWszola committed May 28, 2024
    1 Configuration menu
    Copy the full SHA
    8ee85dd View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Working expert chunks

    @ElizaWszola
    ElizaWszola committed Jun 3, 2024
    1 Configuration menu
    Copy the full SHA
    cb4dbaa View commit details
    Browse the repository at this point in the history

  2. working

    @ElizaWszola
    ElizaWszola committed Jun 3, 2024
    1 Configuration menu
    Copy the full SHA
    cd4410f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Combined kernel with fused op, scores

    @ElizaWszola
    ElizaWszola committed Jun 11, 2024
    1 Configuration menu
    Copy the full SHA
    e9ee483 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Debugging

    @ElizaWszola
    ElizaWszola committed Jun 12, 2024
    1 Configuration menu
    Copy the full SHA
    c839319 View commit details
    Browse the repository at this point in the history

  2. Rand for everything

    @ElizaWszola
    ElizaWszola committed Jun 12, 2024
    1 Configuration menu
    Copy the full SHA
    5ac5ba6 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Working A copy

    @ElizaWszola
    ElizaWszola committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7a9f453 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. cleanup

    @ElizaWszola
    ElizaWszola committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c412ab8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into marlin-moe-integration

    @ElizaWszola
    ElizaWszola committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2d4ac6a View commit details
    Browse the repository at this point in the history

  3. Try to fix pybind11 builds after merge

    @ElizaWszola
    ElizaWszola committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ffd5f64 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Continue work on bindings

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    a22272a View commit details
    Browse the repository at this point in the history

  2. impl

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    d2cba06 View commit details
    Browse the repository at this point in the history

  3. typo fix

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    4b5a9f1 View commit details
    Browse the repository at this point in the history

  4. all links but maxdiff (must fix assertions)

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    0991c74 View commit details
    Browse the repository at this point in the history

  5. it works

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9dd97b5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into marlin-moe-integration

    @ElizaWszola
    ElizaWszola committed Jun 17, 2024
    4 Configuration menu
    Copy the full SHA
    c62bc7f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. lots of debugging

    @ElizaWszola
    ElizaWszola committed Jun 24, 2024
    4 Configuration menu
    Copy the full SHA
    e65c195 View commit details
    Browse the repository at this point in the history

  2. Fixed types, it's working!

    @ElizaWszola
    ElizaWszola committed Jun 24, 2024
    4 Configuration menu
    Copy the full SHA
    5f1ebdb View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Cleanup

    @ElizaWszola
    ElizaWszola committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    836d627 View commit details
    Browse the repository at this point in the history

  2. Tiny cleanups

    @ElizaWszola
    ElizaWszola committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    d3665fa View commit details
    Browse the repository at this point in the history

  3. Some renaming

    @ElizaWszola
    ElizaWszola committed Jun 25, 2024
    4 Configuration menu
    Copy the full SHA
    4bcfde6 View commit details
    Browse the repository at this point in the history

  4. Renaming, Bill's feedback

    @ElizaWszola
    ElizaWszola committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    7701ee7 View commit details
    Browse the repository at this point in the history

  5. Format

    @ElizaWszola
    ElizaWszola committed Jun 25, 2024
    3 Configuration menu
    Copy the full SHA
    b9fdda3 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. add act_order to marlin moe

    @ElizaWszola
    ElizaWszola committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1b05843 View commit details
    Browse the repository at this point in the history

  2. Tensor constness, factor common fused_moe parts into smaller functions

    @ElizaWszola
    ElizaWszola committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    8adcb26 View commit details
    Browse the repository at this point in the history

  3. Spelling

    @ElizaWszola
    ElizaWszola committed Jun 26, 2024
    4 Configuration menu
    Copy the full SHA
    6a3ef46 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. single marlin test should still be disabled

    @ElizaWszola
    ElizaWszola committed Jun 27, 2024
    4 Configuration menu
    Copy the full SHA
    c676bea View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Pass unit tests

    @ElizaWszola
    ElizaWszola committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    53c8ff7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. integrate with model

    @ElizaWszola
    ElizaWszola committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0fd62c8 View commit details
    Browse the repository at this point in the history

  2. cleanups

    @ElizaWszola
    ElizaWszola committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    458c83f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'marlin-moe-act_order' into marlin-moe-integration

    @ElizaWszola
    ElizaWszola committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    400e35a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'main' into marlin-moe-integration

    @ElizaWszola
    ElizaWszola committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    a0d7f77 View commit details
    Browse the repository at this point in the history

  2. format

    @ElizaWszola
    ElizaWszola committed Jul 4, 2024
    1 Configuration menu
    Copy the full SHA
    f629593 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge branch 'main' into marlin-moe-integration

    @ElizaWszola
    ElizaWszola committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c8b79f3 View commit details
    Browse the repository at this point in the history

  2. Start work on integrating with refactored mixtral code

    @ElizaWszola
    ElizaWszola committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e405879 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Runs to completion, but produces garbage

    @ElizaWszola
    ElizaWszola committed Jul 12, 2024
    2 Configuration menu
    Copy the full SHA
    cda9a0f View commit details
    Browse the repository at this point in the history

  2. it works!

    @ElizaWszola
    ElizaWszola committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    c469b74 View commit details
    Browse the repository at this point in the history

  3. Cleanup, format, minor fixes

    @ElizaWszola
    ElizaWszola committed Jul 12, 2024
    2 Configuration menu
    Copy the full SHA
    d8b455f View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. more efficient m blocking, a couple small fixes

    @ElizaWszola
    ElizaWszola committed Jul 23, 2024
    2 Configuration menu
    Copy the full SHA
    7504696 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Multi-GPU works, but could make it faster

    @ElizaWszola
    ElizaWszola committed Jul 31, 2024
    2 Configuration menu
    Copy the full SHA
    3641692 View commit details
    Browse the repository at this point in the history