Native namespace packages (PEP 420)

.github/workflows/build_main_documentation.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
           cache-dependency-path: "kit/package-lock.json"
 
       - name: Set up Python

.github/workflows/build_pr_documentation.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
           cache-dependency-path: "kit/package-lock.json"
 
       - name: Set up Python

.github/workflows/test_cli.yml

@@ -1,4 +1,4 @@
-name: Optimum CLI / Python - Test
+name: Optimum CLI / Python - Test - Subpackage (ONNX)
 
 on:
   push:
@@ -11,21 +11,35 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  UV_SYSTEM_PYTHON: 1
+  UV_TORCH_BACKEND: cpu
+  OPTIMUM_ONNX_REF: main
   TRANSFORMERS_IS_CI: true
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-2022]
-        python-version: ["3.9"]
+        python-version: [3.9]
+        runs-on: [ubuntu-22.04, windows-2022]
 
     runs-on: ${{ matrix.runs-on }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout optimum
         uses: actions/checkout@v4
+        with:
+          path: optimum
+          fetch-depth: 0
+
+      - name: checkout optimum-onnx
+        uses: actions/checkout@v4
+        with:
+          repository: huggingface/optimum-onnx
+          ref: ${{ env.OPTIMUM_ONNX_REF }}
+          path: optimum-onnx
+          fetch-depth: 0
 
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -34,10 +48,22 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip
-          pip install --no-cache-dir torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
-          pip install .[tests,exporters]
+          pip install --upgrade pip uv
+          uv pip install ./optimum-onnx[onnxruntime]
+          uv pip install ./optimum[tests]
 
       - name: Test with pytest
         run: |
           pytest tests/cli -vvvv --durations=0
+        working-directory: optimum
+
+      - name: Install dependencies (editable mode)
+        run: |
+          uv pip uninstall optimum-onnx optimum
+          uv pip install -e ./optimum-onnx[onnxruntime]
+          uv pip install -e ./optimum[tests]
+
+      - name: Test with pytest (editable mode)
+        run: |
+          pytest tests/cli -vvvv --durations=0
+        working-directory: optimum

.github/workflows/test_common.yml

@@ -11,6 +11,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  UV_SYSTEM_PYTHON: 1
+  UV_TORCH_BACKEND: cpu
   TRANSFORMERS_IS_CI: true
 
 jobs:
@@ -19,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.9]
-        runs-on: [ubuntu-22.04, windows-2022, macos-14]
+        runs-on: [ubuntu-22.04, macos-14, windows-2022]
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -34,9 +36,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip
-          pip install --no-cache-dir torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
-          pip install .[tests]
+          pip install --upgrade pip uv
+          uv pip install .[tests]
 
       - name: Test with pytest
         run: |

.github/workflows/test_exporters_common.yml

@@ -1,4 +1,4 @@
-name: Exporters Common / Python - Test
+name: Exporters Common / Python - Test - Subpackage (ONNX)
 
 on:
   push:
@@ -11,21 +11,35 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  UV_SYSTEM_PYTHON: 1
+  UV_TORCH_BACKEND: cpu
+  OPTIMUM_ONNX_REF: main
   TRANSFORMERS_IS_CI: true
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-22.04]
         python-version: [3.9]
+        runs-on: [ubuntu-22.04, windows-2022]
 
     runs-on: ${{ matrix.runs-on }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout optimum
         uses: actions/checkout@v4
+        with:
+          path: optimum
+          fetch-depth: 0
+
+      - name: checkout optimum-onnx
+        uses: actions/checkout@v4
+        with:
+          repository: huggingface/optimum-onnx
+          ref: ${{ env.OPTIMUM_ONNX_REF }}
+          path: optimum-onnx
+          fetch-depth: 0
 
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -34,11 +48,22 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip
-          pip install --no-cache-dir torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
-          pip install optimum-onnx@git+https://github.com/huggingface/optimum-onnx.git
-          pip install .[tests]
+          pip install --upgrade pip uv
+          uv pip install ./optimum-onnx
+          uv pip install ./optimum[tests]
 
       - name: Test with pytest
         run: |
           pytest tests/exporters/common -vvvv --durations=0 -n auto
+        working-directory: optimum
+
+      - name: Install dependencies (editable mode)
+        run: |
+          uv pip uninstall optimum-onnx optimum
+          uv pip install -e ./optimum-onnx
+          uv pip install -e ./optimum[tests]
+
+      - name: Test with pytest (editable mode)
+        run: |
+          pytest tests/exporters/common -vvvv --durations=0 -n auto
+        working-directory: optimum

.github/workflows/test_pipelines.yml

@@ -1,4 +1,4 @@
-name: Optimum Pipelines / Python - Test
+name: Optimum Pipelines / Python - Test - Subpackage (ONNX)
 
 on:
   push:
@@ -12,7 +12,8 @@ concurrency:
 
 env:
   UV_SYSTEM_PYTHON: 1
-  UV_TORCH_BACKEND: auto
+  UV_TORCH_BACKEND: cpu
+  OPTIMUM_ONNX_REF: main
   TRANSFORMERS_IS_CI: true
 
 jobs:
@@ -21,13 +22,24 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.9]
-        runs-on: [ubuntu-22.04]
+        runs-on: [ubuntu-22.04, windows-2022]
 
     runs-on: ${{ matrix.runs-on }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout optimum
         uses: actions/checkout@v4
+        with:
+          path: optimum
+          fetch-depth: 0
+
+      - name: checkout optimum-onnx
+        uses: actions/checkout@v4
+        with:
+          repository: huggingface/optimum-onnx
+          ref: ${{ env.OPTIMUM_ONNX_REF }}
+          path: optimum-onnx
+          fetch-depth: 0
 
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -37,9 +49,21 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip uv
-          uv pip install --no-cache-dir optimum-onnx[onnxruntime]@git+https://github.com/huggingface/optimum-onnx.git
-          uv pip install --no-cache-dir .[tests]
+          uv pip install ./optimum-onnx[onnxruntime]
+          uv pip install ./optimum[tests]
 
       - name: Test with pytest
         run: |
           pytest tests/pipelines -vvvv --durations=0
+        working-directory: optimum
+
+      - name: Install dependencies (editable mode)
+        run: |
+          uv pip uninstall optimum-onnx optimum
+          uv pip install -e ./optimum-onnx[onnxruntime]
+          uv pip install -e ./optimum[tests]
+
+      - name: Test with pytest (editable mode)
+        run: |
+          pytest tests/pipelines -vvvv --durations=0
+        working-directory: optimum

.github/workflows/test_utils.yml

@@ -11,17 +11,20 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  UV_SYSTEM_PYTHON: 1
+  UV_TORCH_BACKEND: cpu
   TRANSFORMERS_IS_CI: true
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-2022]
-        python-version: ["3.9"]
+        python-version: [3.9]
+        runs-on: [ubuntu-22.04, macos-14, windows-2022]
+
+    runs-on: ${{ matrix.runs-on }}
 
-    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -33,10 +36,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip
-          pip install --no-cache-dir torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
-          pip install .[tests]
+          pip install --upgrade pip uv
+          uv pip install .[tests]
 
       - name: Tests needing datasets
         run: |
-          pytest tests/utils -n auto -vvvv --durations=0
+          pytest tests/utils -n auto -vvvv --durations=0

optimum/commands/env.py

@@ -19,7 +19,7 @@
 from transformers.utils import is_tf_available, is_torch_available
 
 from ..version import __version__ as version
-from . import BaseOptimumCLICommand, CommandInfo
+from .base import BaseOptimumCLICommand, CommandInfo
 
 
 class EnvironmentCommand(BaseOptimumCLICommand):

optimum/commands/export/base.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 """optimum.exporters command-line interface base classes."""
 
-from .. import BaseOptimumCLICommand, CommandInfo
+from ..base import BaseOptimumCLICommand, CommandInfo
 
 
 class ExportCommand(BaseOptimumCLICommand):