From db25cec8cb1c74daf89a3ed338279c8be8f4328b Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 3 Jul 2026 22:52:49 +0000
Subject: [PATCH 01/21] ci: add fbgemm-xpu build/test/publish workflow

---
 .github/workflows/ci-fbgemm-xpu.yml | 222 ++++++++++++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 .github/workflows/ci-fbgemm-xpu.yml

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/ci-fbgemm-xpu.yml
new file mode 100644
index 00000000..b8dad786
--- /dev/null
+++ b/.github/workflows/ci-fbgemm-xpu.yml
@@ -0,0 +1,222 @@
+name: ci-fbgemm-xpu
+
+# This workflow builds manylinux fbgemm-xpu wheels. Kernels are SYCL-based 
+# and compiled with the Intel oneAPI compiler (icpx), targeting Intel XPU 
+# architectures.
+#
+# We use the pytorch manylinux builder image
+# (pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1) since it already ships
+# the Intel driver stack and oneAPI toolchain. Using the plain PyPa
+# manylinux container would require setting all of that up ourselves.
+
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+  pull_request:
+    branches:
+      - main
+      - 'release/**'
+  release:
+    types:
+      - published
+
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  PR_OR_SHA: ${{ github.event.pull_request.number || github.sha }}
+  UNIQUE_ID: ${{ github.run_id }}
+
+jobs:
+  # ============================================================================
+  # FBGEMM-XPU JOBS
+  # The following jobs build, test, and publish fbgemm-xpu package
+  # ============================================================================
+  build:
+    strategy:
+      matrix:
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
+    runs-on: ubuntu-24.04
+    env:
+      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
+    container:
+      image: 'pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1'
+    steps:
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: 'Build fbgemm-xpu'
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        uv build --package fbgemm-xpu --index https://download.pytorch.org/whl/xpu -vv
+    - name: 'Repair wheels with auditwheel'
+      run: |
+        uvx auditwheel repair dist/*.whl \
+          --wheel-dir _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }} \
+          --exclude "*" --allow-pure-python-wheel
+    - name: 'Test installing fbgemm-xpu'
+      run: |
+        uv venv
+        uv pip install \
+          _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/*.whl \
+          --index https://download.pytorch.org/whl/xpu -vv
+    - name: 'Test importing fbgemm-xpu'
+      run: |
+        uv run --no-project python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
+    - name: 'Upload wheels'
+      uses: actions/upload-artifact@v7
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels
+        compression-level: 0
+
+  compose:
+    needs: build
+    runs-on: ubuntu-24.04
+    env:
+      WHEELS: fbgemm-xpu-all-wheels
+    steps:
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        pattern: 'fbgemm-xpu-*-wheels-*'
+        path: _all_wheels
+        # The goal is to get the following layout:
+        # _all_wheels/
+        #   fbgemm-xpu-3.14-wheels-xxx-yyy
+        #   fbgemm-xpu-3.13-wheels-xxx-yyy
+        merge-multiple: true
+    - name: 'Install prerequisites'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y tree
+    - name: 'List downloads'
+      run: |
+        tree _all_wheels/
+    - name: 'Form uploads'
+      run: |
+        TO=${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        mkdir _wheels && mkdir _wheels/$TO
+        find _all_wheels/ -name "*-cp[0-9]*-cp[0-9]*-*.whl" \
+          -exec cp {} _wheels/$TO \;
+        # Take "*-none-any.whl" from the oldest python we've built for
+        find "$(ls -d _all_wheels/*/ | sort | head -n 1)" -name "*-none-any.whl" \
+          -exec cp {} _wheels/$TO \;
+    - name: 'List uploads'
+      run: |
+        tree _wheels/
+    - name: 'Upload wheels'
+      uses: actions/upload-artifact@v7
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels/
+        compression-level: 0
+
+  test-fbgemm:
+    needs: build
+    strategy:
+      matrix:
+        # Testing in minimum and maximum supported versions of python.
+        python-version: [ '3.10', '3.14' ]
+        runner: [ 'bmg', 'dg2' ]
+    runs-on: ${{matrix.runner}}
+    container:
+      image: 'ubuntu:24.04'
+      options: --device /dev/dri:/dev/dri -v /dev/dri/by-path:/dev/dri/by-path
+    env:
+      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
+    defaults:
+      run:
+        shell: bash -l {0}  # for conda environment activation
+    steps:
+    - name: 'Install prerequisites'
+      run: |
+        apt-get update
+        apt-get install -y \
+          ca-certificates \
+          curl \
+          git \
+          gpg \
+          software-properties-common \
+          wget
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels/
+    - name: 'Setup Conda'
+      uses: conda-incubator/setup-miniconda@v4
+      with:
+        # conda configuration
+        auto-update-conda: false
+        channels: conda-forge
+        channel-priority: strict
+        conda-remove-defaults: true
+        miniforge-version: latest
+        use-mamba: true
+        # environment configuration
+        activate-environment: test-env
+        python-version: ${{ matrix.python-version }}
+    - name: 'Install Intel drivers'
+      run: |
+        add-apt-repository -y ppa:kobuk-team/intel-graphics
+        apt-get install -y \
+          libze1 \
+          libze-intel-gpu1 \
+          intel-ocloc
+    - name: 'Install pip'
+      run: |
+        conda install pip
+    - name: 'Install fbgemm-xpu'
+      run: |
+        pwd
+        ls -l 
+        ls -l ./_wheels/
+        pwd
+        find ./_wheels/ -name "*.whl"
+        pip install \
+          "$(ls ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu*.whl)[test]" \
+          --extra-index-url https://download.pytorch.org/whl/xpu
+    - name: 'Test gpu'
+      run: |
+        python -c "import torch; print(torch.xpu.is_available())" 
+    - name: 'Test fbgemm-xpu'
+      working-directory: packages/fbgemm-xpu
+      run: |
+        pytest -rsf test/
+
+  publish:
+    needs: [ compose, test-fbgemm ]
+    runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
+    env:
+      WHEELS: fbgemm-xpu-all-wheels
+    steps:
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels
+    - name: 'List wheels'
+      run: |
+        tree _wheels/
+    - name: 'Prepare wheels'
+      run: |
+        rm -rf _publish && mkdir _publish
+        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu-*.whl _publish/
+        ls -al _publish/
+    - name: Publish package distributions to PyPI
+      if: github.event_name == 'release'
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        packages-dir: _publish
+

From 552af6095cb663c93e31428b58230c38cf87c78a Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 3 Jul 2026 23:18:54 +0000
Subject: [PATCH 02/21] ci: simplify fbgemm-xpu workflow header comment

---
 .github/workflows/ci-fbgemm-xpu.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/ci-fbgemm-xpu.yml
index b8dad786..32161cb6 100644
--- a/.github/workflows/ci-fbgemm-xpu.yml
+++ b/.github/workflows/ci-fbgemm-xpu.yml
@@ -1,8 +1,7 @@
 name: ci-fbgemm-xpu
 
 # This workflow builds manylinux fbgemm-xpu wheels. Kernels are SYCL-based 
-# and compiled with the Intel oneAPI compiler (icpx), targeting Intel XPU 
-# architectures.
+# and compiled with the Intel oneAPI compiler (icpx).
 #
 # We use the pytorch manylinux builder image
 # (pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1) since it already ships

From 9f079489bc067e09195beee3bbe2dd916602494f Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Tue, 14 Jul 2026 17:57:41 +0000
Subject: [PATCH 03/21] Fix checkout steps and add patch steps for fbgemm repo

---
 .github/workflows/ci-fbgemm-xpu.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/ci-fbgemm-xpu.yml
index 32161cb6..b246bb54 100644
--- a/.github/workflows/ci-fbgemm-xpu.yml
+++ b/.github/workflows/ci-fbgemm-xpu.yml
@@ -146,11 +146,23 @@ jobs:
           gpg \
           software-properties-common \
           wget
+        git config --global user.email "nobody@intel.com"
+        git config --global user.name "Nobody"
     - name: 'Download wheels'
       uses: actions/download-artifact@v8
       with:
         name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
         path: _wheels/
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+      with:
+        path: torchlib-xpu
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+      with:
+        repository: pytorch/FBGEMM
+        ref: v1.7.0
+        path: fbgemm
     - name: 'Setup Conda'
       uses: conda-incubator/setup-miniconda@v4
       with:
@@ -187,10 +199,16 @@ jobs:
     - name: 'Test gpu'
       run: |
         python -c "import torch; print(torch.xpu.is_available())" 
+    - name: 'Patch FBGEMM'
+      working-directory: fbgemm
+      run: |
+        # TODO: Apply XPU patches here
+        echo "Patches will be applied here"
     - name: 'Test fbgemm-xpu'
-      working-directory: packages/fbgemm-xpu
+      working-directory: fbgemm
       run: |
-        pytest -rsf test/
+        # TODO: Run pytest commands to run the XPU tests here
+        echo "Instructions to run the tests will be added here"
 
   publish:
     needs: [ compose, test-fbgemm ]

From ac2318971ac0deed52c763d6bce5e1e2bb72313d Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Tue, 14 Jul 2026 20:13:24 +0000
Subject: [PATCH 04/21] Testing runners

---
 .github/workflows/ci-fbgemm-xpu.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/ci-fbgemm-xpu.yml
index b246bb54..80ec5903 100644
--- a/.github/workflows/ci-fbgemm-xpu.yml
+++ b/.github/workflows/ci-fbgemm-xpu.yml
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
-    runs-on: ubuntu-24.04
+    runs-on: rss-ubuntu-2404
     env:
       WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
     container:
@@ -79,7 +79,7 @@ jobs:
 
   compose:
     needs: build
-    runs-on: ubuntu-24.04
+    runs-on: rss-ubuntu-2404
     env:
       WHEELS: fbgemm-xpu-all-wheels
     steps:
@@ -212,7 +212,7 @@ jobs:
 
   publish:
     needs: [ compose, test-fbgemm ]
-    runs-on: ubuntu-24.04
+    runs-on: rss-ubuntu-2404
     permissions:
       id-token: write
     env:

From 2d49531d8e63c5fc21b5f6a099ce135465801754 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Tue, 14 Jul 2026 20:30:43 +0000
Subject: [PATCH 05/21] Update name of the runners

---
 .github/workflows/ci-fbgemm-xpu.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/ci-fbgemm-xpu.yml
index 80ec5903..b246bb54 100644
--- a/.github/workflows/ci-fbgemm-xpu.yml
+++ b/.github/workflows/ci-fbgemm-xpu.yml
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
-    runs-on: rss-ubuntu-2404
+    runs-on: ubuntu-24.04
     env:
       WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
     container:
@@ -79,7 +79,7 @@ jobs:
 
   compose:
     needs: build
-    runs-on: rss-ubuntu-2404
+    runs-on: ubuntu-24.04
     env:
       WHEELS: fbgemm-xpu-all-wheels
     steps:
@@ -212,7 +212,7 @@ jobs:
 
   publish:
     needs: [ compose, test-fbgemm ]
-    runs-on: rss-ubuntu-2404
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
     env:

From f392d21200e2521a2866165f942a8ffe04c66f31 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Wed, 15 Jul 2026 22:53:08 +0000
Subject: [PATCH 06/21] Update maintainers info

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 packages/fbgemm-xpu/pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/fbgemm-xpu/pyproject.toml b/packages/fbgemm-xpu/pyproject.toml
index 5ee2ee8d..9c221a55 100644
--- a/packages/fbgemm-xpu/pyproject.toml
+++ b/packages/fbgemm-xpu/pyproject.toml
@@ -14,6 +14,9 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }
 authors = [
+    { name = "Intel Corp." }
+]
+maintainers = [
     { name = "Alberto Gallegos Muro", email = "alberto.gallegos.muro@intel.com" },
     { name = "Felipe Leza Alvarez", email = "felipe.leza.alvarez@intel.com" },
     { name = "Manuel Santana Castolo", email = "manuel.santana.castolo@intel.com" },

From c68f5e28f61433d7e0491d7ea9fe8507730eaf65 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 17 Jul 2026 19:38:17 +0000
Subject: [PATCH 07/21] ci(fbgemm-xpu): rename workflow file to fbgemm-ci.yml
 and update path triggers

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/{ci-fbgemm-xpu.yml => fbgemm-ci.yml} | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
 rename .github/workflows/{ci-fbgemm-xpu.yml => fbgemm-ci.yml} (97%)

diff --git a/.github/workflows/ci-fbgemm-xpu.yml b/.github/workflows/fbgemm-ci.yml
similarity index 97%
rename from .github/workflows/ci-fbgemm-xpu.yml
rename to .github/workflows/fbgemm-ci.yml
index b246bb54..f050e40a 100644
--- a/.github/workflows/ci-fbgemm-xpu.yml
+++ b/.github/workflows/fbgemm-ci.yml
@@ -1,4 +1,4 @@
-name: ci-fbgemm-xpu
+name: FBGEMM CI
 
 # This workflow builds manylinux fbgemm-xpu wheels. Kernels are SYCL-based 
 # and compiled with the Intel oneAPI compiler (icpx).
@@ -13,10 +13,16 @@ on:
     branches:
       - main
       - 'release/**'
+    paths:
+      - 'packages/fbgemm-xpu/**'
+      - '.github/workflows/fbgemm-ci.yml'
   pull_request:
     branches:
       - main
       - 'release/**'
+    paths:
+      - 'packages/fbgemm-xpu/**'
+      - '.github/workflows/fbgemm-ci.yml'
   release:
     types:
       - published

From 89da01d4ba8356e69f991d22059b3e0b6e0c866e Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Tue, 21 Jul 2026 21:24:41 +0000
Subject: [PATCH 08/21] ci: temporary disable dg2 runner

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/fbgemm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fbgemm-ci.yml b/.github/workflows/fbgemm-ci.yml
index f050e40a..ca950f0a 100644
--- a/.github/workflows/fbgemm-ci.yml
+++ b/.github/workflows/fbgemm-ci.yml
@@ -131,7 +131,7 @@ jobs:
       matrix:
         # Testing in minimum and maximum supported versions of python.
         python-version: [ '3.10', '3.14' ]
-        runner: [ 'bmg', 'dg2' ]
+        runner: [ 'bmg' ]
     runs-on: ${{matrix.runner}}
     container:
       image: 'ubuntu:24.04'

From 20830948318153bf24fc7d6115ababe8ce28b11a Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 21:50:12 +0000
Subject: [PATCH 09/21] ci: integrate fbgemm-xpu test job into main CI workflow

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/ci.yml | 207 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06ff2232..85461074 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -338,3 +338,210 @@ jobs:
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         packages-dir: _publish
+  
+  # ============================================================================
+  # FBGEMM-XPU JOBS
+  # The following jobs build, test, and publish fbgemm-xpu package
+  # ============================================================================
+  build-fbgemm:
+    strategy:
+      matrix:
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
+    runs-on: ubuntu-24.04
+    env:
+      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
+    container:
+      image: 'pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1'
+    steps:
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: 'Build fbgemm-xpu'
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        uv build --package fbgemm-xpu --index https://download.pytorch.org/whl/xpu -vv
+    - name: 'Repair wheels with auditwheel'
+      run: |
+        uvx auditwheel repair dist/*.whl \
+          --wheel-dir _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }} \
+          --exclude "*" --allow-pure-python-wheel
+    - name: 'Test installing fbgemm-xpu'
+      run: |
+        uv venv
+        uv pip install \
+          _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/*.whl \
+          --index https://download.pytorch.org/whl/xpu -vv
+    - name: 'Test importing fbgemm-xpu'
+      run: |
+        uv run --no-project python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
+    - name: 'Upload wheels'
+      uses: actions/upload-artifact@v7
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels
+        compression-level: 0
+
+  compose-fbgemm:
+    needs: build-fbgemm
+    runs-on: ubuntu-24.04
+    env:
+      WHEELS: fbgemm-xpu-all-wheels
+    steps:
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        pattern: 'fbgemm-xpu-*-wheels-*'
+        path: _all_wheels
+        # The goal is to get the following layout:
+        # _all_wheels/
+        #   fbgemm-xpu-3.14-wheels-xxx-yyy
+        #   fbgemm-xpu-3.13-wheels-xxx-yyy
+        merge-multiple: true
+    - name: 'Install prerequisites'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y tree
+    - name: 'List downloads'
+      run: |
+        tree _all_wheels/
+    - name: 'Form uploads'
+      run: |
+        TO=${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        mkdir _wheels && mkdir _wheels/$TO
+        find _all_wheels/ -name "*-cp[0-9]*-cp[0-9]*-*.whl" \
+          -exec cp {} _wheels/$TO \;
+        # Take "*-none-any.whl" from the oldest python we've built for
+        find "$(ls -d _all_wheels/*/ | sort | head -n 1)" -name "*-none-any.whl" \
+          -exec cp {} _wheels/$TO \;
+    - name: 'List uploads'
+      run: |
+        tree _wheels/
+    - name: 'Upload wheels'
+      uses: actions/upload-artifact@v7
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels/
+        compression-level: 0
+
+  test-fbgemm:
+    needs: [ build-fbgemm, identify-changes ]
+    if: needs.identify-changes.outputs.fbgemm-xpu == 'true'
+    strategy:
+      matrix:
+        # Testing in minimum and maximum supported versions of python.
+        python-version: [ '3.10', '3.14' ]
+        runner: [ 'bmg' ]
+    runs-on: ${{matrix.runner}}
+    container:
+      image: 'ubuntu:24.04'
+      options: --device /dev/dri:/dev/dri -v /dev/dri/by-path:/dev/dri/by-path
+    env:
+      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
+    defaults:
+      run:
+        shell: bash -l {0}  # for conda environment activation
+    steps:
+    - name: 'Install prerequisites'
+      run: |
+        apt-get update
+        apt-get install -y \
+          ca-certificates \
+          curl \
+          git \
+          gpg \
+          software-properties-common \
+          wget
+        git config --global user.email "nobody@intel.com"
+        git config --global user.name "Nobody"
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels/
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+      with:
+        path: torchlib-xpu
+    - name: 'Checkout'
+      uses: actions/checkout@v7
+      with:
+        repository: pytorch/FBGEMM
+        ref: v1.7.0
+        path: fbgemm
+    - name: 'Setup Conda'
+      uses: conda-incubator/setup-miniconda@v4
+      with:
+        # conda configuration
+        auto-update-conda: false
+        channels: conda-forge
+        channel-priority: strict
+        conda-remove-defaults: true
+        miniforge-version: latest
+        use-mamba: true
+        # environment configuration
+        activate-environment: test-env
+        python-version: ${{ matrix.python-version }}
+    - name: 'Install Intel drivers'
+      run: |
+        add-apt-repository -y ppa:kobuk-team/intel-graphics
+        apt-get install -y \
+          libze1 \
+          libze-intel-gpu1 \
+          intel-ocloc
+    - name: 'Install pip'
+      run: |
+        conda install pip
+    - name: 'Install fbgemm-xpu'
+      run: |
+        pwd
+        ls -l 
+        ls -l ./_wheels/
+        pwd
+        find ./_wheels/ -name "*.whl"
+        pip install \
+          "$(ls ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu*.whl)[test]" \
+          --extra-index-url https://download.pytorch.org/whl/xpu
+    - name: 'Test gpu'
+      run: |
+        python -c "import torch; print(torch.xpu.is_available())" 
+    - name: 'Patch FBGEMM'
+      working-directory: fbgemm
+      run: |
+        # TODO: Apply XPU patches here
+        echo "Patches will be applied here"
+    - name: 'Test fbgemm-xpu'
+      working-directory: fbgemm
+      run: |
+        # TODO: Run pytest commands to run the XPU tests here
+        echo "Instructions to run the tests will be added here"
+
+  publish-fbgemm:
+    needs: [ compose-fbgemm, test-fbgemm ]
+    runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
+    env:
+      WHEELS: fbgemm-xpu-all-wheels
+    steps:
+    - name: 'Download wheels'
+      uses: actions/download-artifact@v8
+      with:
+        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
+        path: _wheels
+    - name: 'List wheels'
+      run: |
+        tree _wheels/
+    - name: 'Prepare wheels'
+      run: |
+        rm -rf _publish && mkdir _publish
+        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu-*.whl _publish/
+        ls -al _publish/
+    - name: Publish package distributions to PyPI
+      if: github.event_name == 'release'
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        packages-dir: _publish
+

From 8fc402908c9aa72dcee870f882d05dce10e9ba3e Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 22:37:00 +0000
Subject: [PATCH 10/21] remove fbgemm-ci.yml file

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/fbgemm-ci.yml | 245 --------------------------------
 1 file changed, 245 deletions(-)
 delete mode 100644 .github/workflows/fbgemm-ci.yml

diff --git a/.github/workflows/fbgemm-ci.yml b/.github/workflows/fbgemm-ci.yml
deleted file mode 100644
index ca950f0a..00000000
--- a/.github/workflows/fbgemm-ci.yml
+++ /dev/null
@@ -1,245 +0,0 @@
-name: FBGEMM CI
-
-# This workflow builds manylinux fbgemm-xpu wheels. Kernels are SYCL-based 
-# and compiled with the Intel oneAPI compiler (icpx).
-#
-# We use the pytorch manylinux builder image
-# (pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1) since it already ships
-# the Intel driver stack and oneAPI toolchain. Using the plain PyPa
-# manylinux container would require setting all of that up ourselves.
-
-on:
-  push:
-    branches:
-      - main
-      - 'release/**'
-    paths:
-      - 'packages/fbgemm-xpu/**'
-      - '.github/workflows/fbgemm-ci.yml'
-  pull_request:
-    branches:
-      - main
-      - 'release/**'
-    paths:
-      - 'packages/fbgemm-xpu/**'
-      - '.github/workflows/fbgemm-ci.yml'
-  release:
-    types:
-      - published
-
-permissions: read-all
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  PR_OR_SHA: ${{ github.event.pull_request.number || github.sha }}
-  UNIQUE_ID: ${{ github.run_id }}
-
-jobs:
-  # ============================================================================
-  # FBGEMM-XPU JOBS
-  # The following jobs build, test, and publish fbgemm-xpu package
-  # ============================================================================
-  build:
-    strategy:
-      matrix:
-        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
-    runs-on: ubuntu-24.04
-    env:
-      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
-    container:
-      image: 'pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1'
-    steps:
-    - name: 'Checkout'
-      uses: actions/checkout@v7
-    - name: Install uv
-      uses: astral-sh/setup-uv@v7
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: 'Build fbgemm-xpu'
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        uv build --package fbgemm-xpu --index https://download.pytorch.org/whl/xpu -vv
-    - name: 'Repair wheels with auditwheel'
-      run: |
-        uvx auditwheel repair dist/*.whl \
-          --wheel-dir _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }} \
-          --exclude "*" --allow-pure-python-wheel
-    - name: 'Test installing fbgemm-xpu'
-      run: |
-        uv venv
-        uv pip install \
-          _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/*.whl \
-          --index https://download.pytorch.org/whl/xpu -vv
-    - name: 'Test importing fbgemm-xpu'
-      run: |
-        uv run --no-project python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
-    - name: 'Upload wheels'
-      uses: actions/upload-artifact@v7
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels
-        compression-level: 0
-
-  compose:
-    needs: build
-    runs-on: ubuntu-24.04
-    env:
-      WHEELS: fbgemm-xpu-all-wheels
-    steps:
-    - name: 'Download wheels'
-      uses: actions/download-artifact@v8
-      with:
-        pattern: 'fbgemm-xpu-*-wheels-*'
-        path: _all_wheels
-        # The goal is to get the following layout:
-        # _all_wheels/
-        #   fbgemm-xpu-3.14-wheels-xxx-yyy
-        #   fbgemm-xpu-3.13-wheels-xxx-yyy
-        merge-multiple: true
-    - name: 'Install prerequisites'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y tree
-    - name: 'List downloads'
-      run: |
-        tree _all_wheels/
-    - name: 'Form uploads'
-      run: |
-        TO=${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        mkdir _wheels && mkdir _wheels/$TO
-        find _all_wheels/ -name "*-cp[0-9]*-cp[0-9]*-*.whl" \
-          -exec cp {} _wheels/$TO \;
-        # Take "*-none-any.whl" from the oldest python we've built for
-        find "$(ls -d _all_wheels/*/ | sort | head -n 1)" -name "*-none-any.whl" \
-          -exec cp {} _wheels/$TO \;
-    - name: 'List uploads'
-      run: |
-        tree _wheels/
-    - name: 'Upload wheels'
-      uses: actions/upload-artifact@v7
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels/
-        compression-level: 0
-
-  test-fbgemm:
-    needs: build
-    strategy:
-      matrix:
-        # Testing in minimum and maximum supported versions of python.
-        python-version: [ '3.10', '3.14' ]
-        runner: [ 'bmg' ]
-    runs-on: ${{matrix.runner}}
-    container:
-      image: 'ubuntu:24.04'
-      options: --device /dev/dri:/dev/dri -v /dev/dri/by-path:/dev/dri/by-path
-    env:
-      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
-    defaults:
-      run:
-        shell: bash -l {0}  # for conda environment activation
-    steps:
-    - name: 'Install prerequisites'
-      run: |
-        apt-get update
-        apt-get install -y \
-          ca-certificates \
-          curl \
-          git \
-          gpg \
-          software-properties-common \
-          wget
-        git config --global user.email "nobody@intel.com"
-        git config --global user.name "Nobody"
-    - name: 'Download wheels'
-      uses: actions/download-artifact@v8
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels/
-    - name: 'Checkout'
-      uses: actions/checkout@v7
-      with:
-        path: torchlib-xpu
-    - name: 'Checkout'
-      uses: actions/checkout@v7
-      with:
-        repository: pytorch/FBGEMM
-        ref: v1.7.0
-        path: fbgemm
-    - name: 'Setup Conda'
-      uses: conda-incubator/setup-miniconda@v4
-      with:
-        # conda configuration
-        auto-update-conda: false
-        channels: conda-forge
-        channel-priority: strict
-        conda-remove-defaults: true
-        miniforge-version: latest
-        use-mamba: true
-        # environment configuration
-        activate-environment: test-env
-        python-version: ${{ matrix.python-version }}
-    - name: 'Install Intel drivers'
-      run: |
-        add-apt-repository -y ppa:kobuk-team/intel-graphics
-        apt-get install -y \
-          libze1 \
-          libze-intel-gpu1 \
-          intel-ocloc
-    - name: 'Install pip'
-      run: |
-        conda install pip
-    - name: 'Install fbgemm-xpu'
-      run: |
-        pwd
-        ls -l 
-        ls -l ./_wheels/
-        pwd
-        find ./_wheels/ -name "*.whl"
-        pip install \
-          "$(ls ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu*.whl)[test]" \
-          --extra-index-url https://download.pytorch.org/whl/xpu
-    - name: 'Test gpu'
-      run: |
-        python -c "import torch; print(torch.xpu.is_available())" 
-    - name: 'Patch FBGEMM'
-      working-directory: fbgemm
-      run: |
-        # TODO: Apply XPU patches here
-        echo "Patches will be applied here"
-    - name: 'Test fbgemm-xpu'
-      working-directory: fbgemm
-      run: |
-        # TODO: Run pytest commands to run the XPU tests here
-        echo "Instructions to run the tests will be added here"
-
-  publish:
-    needs: [ compose, test-fbgemm ]
-    runs-on: ubuntu-24.04
-    permissions:
-      id-token: write
-    env:
-      WHEELS: fbgemm-xpu-all-wheels
-    steps:
-    - name: 'Download wheels'
-      uses: actions/download-artifact@v8
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels
-    - name: 'List wheels'
-      run: |
-        tree _wheels/
-    - name: 'Prepare wheels'
-      run: |
-        rm -rf _publish && mkdir _publish
-        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu-*.whl _publish/
-        ls -al _publish/
-    - name: Publish package distributions to PyPI
-      if: github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        packages-dir: _publish
-

From 266b54d12c5c5dae6334fc8a614271af67462102 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 22:41:21 +0000
Subject: [PATCH 11/21] update fbgemm steps

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/ci.yml | 128 +++------------------------------------
 1 file changed, 7 insertions(+), 121 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85461074..91f21b90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -310,122 +310,6 @@ jobs:
         fi
         pytest -rsf -k "${known_failures}" test/
 
-  publish:
-    needs: [ compose, test-torchcodec ]
-    if: ${{ !(failure() || cancelled()) }}
-    runs-on: ubuntu-24.04
-    permissions:
-      id-token: write    
-    env:
-      WHEELS: torchlib-all-wheels
-    steps:
-    - name: 'Download wheels'
-      uses: actions/download-artifact@v8
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels
-    - name: 'List wheels'
-      run: |
-        tree _wheels/
-    - name: 'Prepare wheels'
-      run: |
-        rm -rf _publish && mkdir _publish
-        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchcodec_xpu-*.whl _publish/
-        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchlib_xpu-*.whl _publish/
-        ls -al _publish/
-    - name: Publish package distributions to PyPI
-      if: github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        packages-dir: _publish
-  
-  # ============================================================================
-  # FBGEMM-XPU JOBS
-  # The following jobs build, test, and publish fbgemm-xpu package
-  # ============================================================================
-  build-fbgemm:
-    strategy:
-      matrix:
-        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
-    runs-on: ubuntu-24.04
-    env:
-      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
-    container:
-      image: 'pytorch/manylinux2_28-builder:xpu-v2.12.0-rc1'
-    steps:
-    - name: 'Checkout'
-      uses: actions/checkout@v7
-    - name: Install uv
-      uses: astral-sh/setup-uv@v7
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: 'Build fbgemm-xpu'
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        uv build --package fbgemm-xpu --index https://download.pytorch.org/whl/xpu -vv
-    - name: 'Repair wheels with auditwheel'
-      run: |
-        uvx auditwheel repair dist/*.whl \
-          --wheel-dir _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }} \
-          --exclude "*" --allow-pure-python-wheel
-    - name: 'Test installing fbgemm-xpu'
-      run: |
-        uv venv
-        uv pip install \
-          _wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/*.whl \
-          --index https://download.pytorch.org/whl/xpu -vv
-    - name: 'Test importing fbgemm-xpu'
-      run: |
-        uv run --no-project python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
-    - name: 'Upload wheels'
-      uses: actions/upload-artifact@v7
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels
-        compression-level: 0
-
-  compose-fbgemm:
-    needs: build-fbgemm
-    runs-on: ubuntu-24.04
-    env:
-      WHEELS: fbgemm-xpu-all-wheels
-    steps:
-    - name: 'Download wheels'
-      uses: actions/download-artifact@v8
-      with:
-        pattern: 'fbgemm-xpu-*-wheels-*'
-        path: _all_wheels
-        # The goal is to get the following layout:
-        # _all_wheels/
-        #   fbgemm-xpu-3.14-wheels-xxx-yyy
-        #   fbgemm-xpu-3.13-wheels-xxx-yyy
-        merge-multiple: true
-    - name: 'Install prerequisites'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y tree
-    - name: 'List downloads'
-      run: |
-        tree _all_wheels/
-    - name: 'Form uploads'
-      run: |
-        TO=${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        mkdir _wheels && mkdir _wheels/$TO
-        find _all_wheels/ -name "*-cp[0-9]*-cp[0-9]*-*.whl" \
-          -exec cp {} _wheels/$TO \;
-        # Take "*-none-any.whl" from the oldest python we've built for
-        find "$(ls -d _all_wheels/*/ | sort | head -n 1)" -name "*-none-any.whl" \
-          -exec cp {} _wheels/$TO \;
-    - name: 'List uploads'
-      run: |
-        tree _wheels/
-    - name: 'Upload wheels'
-      uses: actions/upload-artifact@v7
-      with:
-        name: ${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}
-        path: _wheels/
-        compression-level: 0
-
   test-fbgemm:
     needs: [ build-fbgemm, identify-changes ]
     if: needs.identify-changes.outputs.fbgemm-xpu == 'true'
@@ -518,13 +402,14 @@ jobs:
         # TODO: Run pytest commands to run the XPU tests here
         echo "Instructions to run the tests will be added here"
 
-  publish-fbgemm:
-    needs: [ compose-fbgemm, test-fbgemm ]
+  publish:
+    needs: [ compose, test-torchcodec, test-fbgemm ]
+    if: ${{ !(failure() || cancelled()) }}
     runs-on: ubuntu-24.04
     permissions:
-      id-token: write
+      id-token: write    
     env:
-      WHEELS: fbgemm-xpu-all-wheels
+      WHEELS: torchlib-all-wheels
     steps:
     - name: 'Download wheels'
       uses: actions/download-artifact@v8
@@ -537,11 +422,12 @@ jobs:
     - name: 'Prepare wheels'
       run: |
         rm -rf _publish && mkdir _publish
+        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchcodec_xpu-*.whl _publish/
         cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu-*.whl _publish/
+        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchlib_xpu-*.whl _publish/
         ls -al _publish/
     - name: Publish package distributions to PyPI
       if: github.event_name == 'release'
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         packages-dir: _publish
-

From f8f988e195fa0c12cd6be727c35f336299e1fff6 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 22:46:27 +0000
Subject: [PATCH 12/21] Update documentation

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 packages/fbgemm-xpu/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fbgemm-xpu/README.md b/packages/fbgemm-xpu/README.md
index c894b6e9..575356a5 100644
--- a/packages/fbgemm-xpu/README.md
+++ b/packages/fbgemm-xpu/README.md
@@ -64,7 +64,7 @@ python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
 
 Environment variables will be added as new FBGEMM operators are integrated into this project.
 
-## Known limitations
+## Known limitations 
 
 Known limitations will be documented as new FBGEMM operators are integrated into this project.
 

From 606c4a8b3bdce182ee91bd5c504c98e379b04da0 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 22:54:20 +0000
Subject: [PATCH 13/21] Fix test steps

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91f21b90..37082fc1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -311,7 +311,7 @@ jobs:
         pytest -rsf -k "${known_failures}" test/
 
   test-fbgemm:
-    needs: [ build-fbgemm, identify-changes ]
+    needs: [ build, identify-changes ]
     if: needs.identify-changes.outputs.fbgemm-xpu == 'true'
     strategy:
       matrix:

From ecdebd551d09a519a08428e1523f14e2dd3c6589 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 23:33:17 +0000
Subject: [PATCH 14/21] ci: update fbgemm-xpu test job

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/ci.yml                  | 1 -
 packages/fbgemm-xpu/README.md             | 2 +-
 packages/fbgemm-xpu/test/patches/.gitkeep | 0
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 packages/fbgemm-xpu/test/patches/.gitkeep

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37082fc1..f522ced5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -423,7 +423,6 @@ jobs:
       run: |
         rm -rf _publish && mkdir _publish
         cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchcodec_xpu-*.whl _publish/
-        cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu-*.whl _publish/
         cp ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/torchlib_xpu-*.whl _publish/
         ls -al _publish/
     - name: Publish package distributions to PyPI
diff --git a/packages/fbgemm-xpu/README.md b/packages/fbgemm-xpu/README.md
index 575356a5..c894b6e9 100644
--- a/packages/fbgemm-xpu/README.md
+++ b/packages/fbgemm-xpu/README.md
@@ -64,7 +64,7 @@ python -c "import fbgemm_xpu; print(fbgemm_xpu.__version__)"
 
 Environment variables will be added as new FBGEMM operators are integrated into this project.
 
-## Known limitations 
+## Known limitations
 
 Known limitations will be documented as new FBGEMM operators are integrated into this project.
 
diff --git a/packages/fbgemm-xpu/test/patches/.gitkeep b/packages/fbgemm-xpu/test/patches/.gitkeep
new file mode 100644
index 00000000..e69de29b

From e214fb2001889f3db0a90fe82041900618d7800d Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Thu, 23 Jul 2026 23:53:08 +0000
Subject: [PATCH 15/21] fbgemm-xpu: move patches dir to match torchcodec layout

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 packages/fbgemm-xpu/{test => }/patches/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/fbgemm-xpu/{test => }/patches/.gitkeep (100%)

diff --git a/packages/fbgemm-xpu/test/patches/.gitkeep b/packages/fbgemm-xpu/patches/.gitkeep
similarity index 100%
rename from packages/fbgemm-xpu/test/patches/.gitkeep
rename to packages/fbgemm-xpu/patches/.gitkeep

From f876165f8604c35215f791787e5d8c6ff95798ee Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 24 Jul 2026 18:24:58 +0000
Subject: [PATCH 16/21] Fix wheels path

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f522ced5..5ae33c2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -323,7 +323,7 @@ jobs:
       image: 'ubuntu:24.04'
       options: --device /dev/dri:/dev/dri -v /dev/dri/by-path:/dev/dri/by-path
     env:
-      WHEELS: fbgemm-xpu-${{ matrix.python-version }}-wheels
+      WHEELS: torchlib-${{ matrix.python-version }}-wheels
     defaults:
       run:
         shell: bash -l {0}  # for conda environment activation

From ca7d97c46113fd68286f84f3ec8145e15c199fa4 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 24 Jul 2026 18:39:14 +0000
Subject: [PATCH 17/21] Testing the torchcodec-xpu ci

---
 packages/torchcodec-xpu/patches/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 packages/torchcodec-xpu/patches/.gitkeep

diff --git a/packages/torchcodec-xpu/patches/.gitkeep b/packages/torchcodec-xpu/patches/.gitkeep
new file mode 100644
index 00000000..e69de29b

From b6064cb39f29887b69d3370afce522667c60ffd0 Mon Sep 17 00:00:00 2001
From: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
Date: Fri, 24 Jul 2026 19:52:53 +0000
Subject: [PATCH 18/21] Remove  unused file

Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com>
---
 packages/torchcodec-xpu/patches/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 packages/torchcodec-xpu/patches/.gitkeep

diff --git a/packages/torchcodec-xpu/patches/.gitkeep b/packages/torchcodec-xpu/patches/.gitkeep
deleted file mode 100644
index e69de29b..00000000

From ac2b05384ba63fb3e7d694bf058cc139076906da Mon Sep 17 00:00:00 2001
From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Date: Mon, 27 Jul 2026 14:51:21 -0700
Subject: [PATCH 19/21] Update pyproject.toml

---
 packages/fbgemm-xpu/pyproject.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/fbgemm-xpu/pyproject.toml b/packages/fbgemm-xpu/pyproject.toml
index 9c221a55..5ee2ee8d 100644
--- a/packages/fbgemm-xpu/pyproject.toml
+++ b/packages/fbgemm-xpu/pyproject.toml
@@ -14,9 +14,6 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }
 authors = [
-    { name = "Intel Corp." }
-]
-maintainers = [
     { name = "Alberto Gallegos Muro", email = "alberto.gallegos.muro@intel.com" },
     { name = "Felipe Leza Alvarez", email = "felipe.leza.alvarez@intel.com" },
     { name = "Manuel Santana Castolo", email = "manuel.santana.castolo@intel.com" },

From b4732db8ceff7063b20e7ce919dc91ed7eaac976 Mon Sep 17 00:00:00 2001
From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Date: Mon, 27 Jul 2026 14:51:58 -0700
Subject: [PATCH 20/21] Remove debug commands

---
 .github/workflows/ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ae33c2e..bbcd1fe0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -380,11 +380,6 @@ jobs:
         conda install pip
     - name: 'Install fbgemm-xpu'
       run: |
-        pwd
-        ls -l 
-        ls -l ./_wheels/
-        pwd
-        find ./_wheels/ -name "*.whl"
         pip install \
           "$(ls ./_wheels/${{ env.WHEELS }}-${{ env.PR_OR_SHA }}-${{ env.UNIQUE_ID }}/fbgemm_xpu*.whl)[test]" \
           --extra-index-url https://download.pytorch.org/whl/xpu

From 936fa1bf6cbe3b5270abca2db8ded2113de75f57 Mon Sep 17 00:00:00 2001
From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Date: Mon, 27 Jul 2026 15:12:40 -0700
Subject: [PATCH 21/21] Use fbgemm 1.8.0

Co-authored-by: Alberto <109159606+aagalleg@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbcd1fe0..e41c27f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -353,7 +353,7 @@ jobs:
       uses: actions/checkout@v7
       with:
         repository: pytorch/FBGEMM
-        ref: v1.7.0
+        ref: v1.8.0
         path: fbgemm
     - name: 'Setup Conda'
       uses: conda-incubator/setup-miniconda@v4