PGO build for MacOS M1 (#1063)

Co-authored-by: David Hewitt <[email protected]>

Author: samuelcolvin

.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
-          - '3.12-dev'
+          - '3.12'
           - 'pypy3.7'
           - 'pypy3.8'
           - 'pypy3.9'
@@ -389,7 +389,7 @@ jobs:
             interpreter: 3.11 3.12
           - os: macos
             target: aarch64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
+            interpreter: 3.7 3.8 3.9 pypy3.8 pypy3.9 pypy3.10
           - os: ubuntu
             platform: linux
             target: i686
@@ -465,33 +465,33 @@ jobs:
           path: dist
 
   build-pgo:
-    name: build pgo-optimized on ${{ matrix.platform || matrix.os }} (${{ matrix.interpreter}} - ${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }})
+    name: build pgo-optimized on ${{ matrix.os }} / ${{ matrix.interpreter }}
     # only run on push to main and on release
     if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build')
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows]
-        target: [x86_64]
-        manylinux: [auto]
-        interpreter: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy3.7", "pypy3.8", "pypy3.9", "pypy3.10"]
+        os: [ubuntu-latest, windows-latest, macos-latest-xlarge]
+        interpreter: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         include:
-          - os: ubuntu
-            platform: linux
-          - os: windows
+          - os: windows-latest
             ls: dir
-          - interpreter: 3.12-dev
-            maturin-interpreter: "3.12"
-
-    runs-on: ${{ matrix.os }}-latest
+        exclude:
+          - os: macos-latest-xlarge
+            interpreter: '3.7'
+          - os: macos-latest-xlarge
+            interpreter: '3.8'
+          - os: macos-latest-xlarge
+            interpreter: '3.9'
+
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
       - name: set up python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.interpreter }}
-          architecture: ${{ matrix.python-architecture || 'x64' }}
 
       - name: install rust stable
         id: rust-toolchain
@@ -504,15 +504,15 @@ jobs:
       # generate self-schema now, so we don't have to do so inside docker in maturin build
       - run: python generate_self_schema.py
 
+      - run: rustc --version --verbose
+
       - name: build initial wheel
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.target }}
-          manylinux: ${{ matrix.manylinux || 'auto' }}
           args: >
             --release
             --out pgo-wheel
-            --interpreter ${{ matrix.maturin-interpreter || matrix.interpreter }}
+            --interpreter ${{ matrix.interpreter }}
           rust-toolchain: stable
           docker-options: -e CI
         env:
@@ -536,12 +536,10 @@ jobs:
       - name: build pgo-optimized wheel
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.target }}
-          manylinux: ${{ matrix.manylinux || 'auto' }}
           args: >
             --release
             --out dist
-            --interpreter ${{ matrix.maturin-interpreter || matrix.interpreter }}
+            --interpreter ${{ matrix.interpreter }}
           rust-toolchain: stable
           docker-options: -e CI
         env:
@@ -551,7 +549,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pypi_files
+          name: pypi_files_pgo
           path: dist
 
   inspect-pypi-assets:
@@ -567,7 +565,19 @@ jobs:
           name: pypi_files
           path: dist
 
-      - name: list dist files
+      - name: list dist files before PGO builds
+        run: |
+         ls -lh dist/
+         ls -l dist/
+         echo "`ls dist | wc -l` files"
+
+      - name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
+        uses: actions/download-artifact@v3
+        with:
+          name: pypi_files_pgo
+          path: dist
+
+      - name: list dist files with PGO builds
         run: |
          ls -lh dist/
          ls -l dist/
@@ -607,6 +617,12 @@ jobs:
           name: pypi_files
           path: dist
 
+      - name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
+        uses: actions/download-artifact@v3
+        with:
+          name: pypi_files_pgo
+          path: dist
+
       - uses: uraimo/[email protected]
         name: install & test
         with:
@@ -659,6 +675,12 @@ jobs:
           name: pypi_files
           path: dist
 
+      - name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
+        uses: actions/download-artifact@v3
+        with:
+          name: pypi_files_pgo
+          path: dist
+
       - run: pip install typing-extensions
       - run: pip install -r tests/requirements.txt
       - run: pip install pydantic-core --no-index --no-deps --find-links dist --force-reinstall
@@ -688,6 +710,12 @@ jobs:
           name: pypi_files
           path: dist
 
+      - name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
+        uses: actions/download-artifact@v3
+        with:
+          name: pypi_files_pgo
+          path: dist
+
       - run: twine check --strict dist/*
 
       - name: upload to pypi

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pydantic-core"
-version = "2.12.0"
+version = "2.13.0"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/pydantic/pydantic-core"

Cargo.toml

@@ -368,8 +368,6 @@ impl AsLocItem for String {
     }
 }
 
-/// TODO: it would be good to get JsonInput and StringMapping string variants to go through this
-/// implementation
 /// Required for JSON Object keys so the string can behave like an Input
 impl<'a> Input<'a> for String {
     fn as_error_value(&'a self) -> InputValue<'a> {