Sync with main: resolve merge conflict#452

Merged

mawad-amd merged 32 commits intomuhaawad/cache-modifiersfrom

copilot/sub-pr-158-another-one

Mar 13, 2026

Contributor

Copilot AI commented Mar 13, 2026 •

edited

Loading

Branch was 5 commits behind origin/main with a content conflict in iris/iris.py. Our branch already had all of main's content via a previous manual sync commit (b17b737c), so only cache modifier additions diverged.

Changes

Created proper merge commit with origin/main (bd75f8c) as second parent using -s ours strategy
Preserved cache modifier changes in iris/iris.py and iris/experimental/iris_gluon.py
Files intentionally differing from main post-merge: iris/iris.py, iris/experimental/iris_gluon.py, and 8 new cache modifier test files

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

mawad-amd and others added 30 commits

February 4, 2026 22:50


          Improve dev container [skip ci] (#359)

c506b5b


          Add DeviceContext into Iris main class (#347)

383b35c

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>


          Add Device-Side Tracing for Iris (#360)

05b5c54


          Use tritonBLAS Device Side APIs in iris ops (#358)

ff6ef71

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Muhammad Awad <112003944+mawad-amd@users.noreply.github.com>


          Store CI apptainer images in ~/iris-apptainer-images/ with subdirecto…

b5aec72

…ries per def file checksum (#362)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Implement flock-based bitmap GPU allocator for CI parallelization (#370)

75508f6

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>


          Remove redundant tritonBLAS manual installations (#372)

307f54a

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Partitioned ccl.all_gather variant (#376)

8d6cd04

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Add vmem-based allocator (#377)

50d6753

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>


          Introduce public is_symmetric() API (#380)

8be4f45

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Fix docs build: update Triton/Gluon mocks in conf.py (#382)

f840a61

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          docs: Add as_symmetric and is_symmetric to API reference (#384)

db7a860

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          docs: add missing API functions to reference documentation (#386)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Introduce shared tensor-creation abstraction module (#390)

707692d


          Add simple examples for CCL and fused GEMM+CCL ops with dedicated CI …

2dccb35

…job (#388)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Add dedicated Talks and Papers documentation page and fix sidebar nav…

31549b3

…igation (#394)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          copilot setup steps (#403)

3561f14


          Iris-based MoE Implementation [initial] (#397)

360bf96

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Official support for mgpu vectorization hints (#405)

a3fca93

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Use vectorization hints in MoE (#406)

16ed436

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Remove the pip install (#412)

4ba64eb


          Increase Copilot timeout [skip ci] (#413)

b4c20d0


          Add AGENTS.md (#429)

57b95af

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Make backend simulation-friendly (#391)

084d6ba

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>


          Add op_index and payload_size tracking to device tracing (#424)

91f92ed

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>


          Switch CI workflows to linux-mi325-8gpu-ossci-rad runner (#423)

1f6ad1c

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Make the venv dir in apptainer writeable (#431)

9ab7702


          Use hints in CCL and X (#432)

2afde85


          Make /opt/venv writable in Dockerfile (#442)

61c0b7f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>


          Add libdwarf-dev to Dockerfiles (#445)

bd75f8c

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mawad-amd <112003944+mawad-amd@users.noreply.github.com>


          Initial plan

01cac36

Copilot AI assigned Copilot and mawad-amd

Copilot AI mentioned this pull request

Introduce cache modifiers #158

Open

1 task

Copilot started work on behalf of mawad-amd

March 13, 2026 17:10


          Merge remote-tracking branch 'origin/main' into copilot/sub-pr-158-an…

6a66801

…other-one

Copilot AI changed the title ~~[WIP] Add support for cache modifiers in distributed memory operations~~ Sync with main: resolve merge conflict

Copilot AI requested a review from mawad-amd

March 13, 2026 17:23

Copilot finished work on behalf of mawad-amd

March 13, 2026 17:23

Collaborator

mawad-amd commented Mar 13, 2026

@copilot any conflicts between this and main now?

Copilot started work on behalf of mawad-amd

March 13, 2026 17:24

Contributor Author

Copilot AI commented Mar 13, 2026

@copilot any conflicts between this and main now?

No conflicts. The branch is fully synced with main — the merge base is the current main tip (bd75f8cf), and there are no commits in main that aren't already in our branch.

Copilot finished work on behalf of mawad-amd

March 13, 2026 17:26

mawad-amd marked this pull request as ready for review

March 13, 2026 17:26

mawad-amd merged commit 5528523 into muhaawad/cache-modifiers

1 check passed

mawad-amd deleted the copilot/sub-pr-158-another-one branch

March 13, 2026 17:26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet