Merge remote-tracking branch 'upstream/main' into riedgar-ms/model-metrics-01

Author: riedgar-ms

.github/workflows/pypi_upload.yml

@@ -43,10 +43,22 @@ jobs:
       matrix:
         include: ${{ fromJson(needs.generate-wheels-matrix.outputs.include) }}
     runs-on: ${{ matrix.os }}
+    
+    env:
+      CIBW_BUILD_VERBOSITY: 1
+      CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y"
+      CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"'
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
 
+      - name: Install Rust
+        shell: bash
+        run: |
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Set up QEMU
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v2
@@ -75,36 +87,48 @@ jobs:
         with:
           python-version: '3.11'
 
+      - name: Install Rust
+        shell: bash
+        run: |
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+      - name: Run cargo check
+        shell: bash
+        run: |
+          cargo --version
+
       - name: Build sdist (pep517)
         run: |
           python -m pip install build
           python -m build --sdist
+
       - name: Upload sdist
         uses: actions/upload-artifact@v3
         with:
           name: sdist_files
           path: dist/*.tar.gz
 
-  publish_wheels:
-    permissions:
-      id-token: write
-    name: Publish wheels on pypi
-    needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags')
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: bdist_files
-          path: dist
+  # publish_wheels:
+  #   permissions:
+  #     id-token: write
+  #   name: Publish wheels on pypi
+  #   needs: [build_wheels, build_sdist]
+  #   runs-on: ubuntu-latest
+  #   if: startsWith(github.ref, 'refs/tags')
+  #   steps:
+  #     - uses: actions/download-artifact@v3
+  #       with:
+  #         name: bdist_files
+  #         path: dist
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: sdist_files
-          path: dist
+  #     - uses: actions/download-artifact@v3
+  #       with:
+  #         name: sdist_files
+  #         path: dist
 
-      - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
+  #     - name: Publish package to PyPI
+  #       uses: pypa/gh-action-pypi-publish@release/v1
+  #       with:
+  #         user: __token__
+  #         password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/workflow-pr-gate.yml

@@ -68,7 +68,8 @@ jobs:
           # - "transformers_mistral_7b" See Issue 713
           - "hfllama7b"
           - "hfllama_mistral_7b"
-          - "phi3cpu-mini-4k-instruct"
+          - "transformers_phi3cpu_mini_4k_instruct"
+          - "hfllama_phi3cpu_mini_4k_instruct"
     with:
       os: Large_Linux
       python-version: "3.12"
@@ -108,7 +109,8 @@ jobs:
           # - "transformers_mistral_7b" See Issue 713
           - "hfllama7b"
           - "hfllama_mistral_7b"
-          - "phi3cpu-mini-4k-instruct"
+          - "transformers_phi3cpu_mini_4k_instruct"
+          - "hfllama_phi3cpu_mini_4k_instruct"
     uses: ./.github/workflows/action_plain_unit_tests.yml
     with:
       os: Large_Linux
@@ -152,7 +154,8 @@ jobs:
           # - "transformers_mistral_7b" See Issue 713
           - "hfllama7b"
           - "hfllama_mistral_7b"
-          # - "phi3cpu-mini-4k-instruct" Gives trouble on MacOS
+          # - "transformers_phi3cpu_mini_4k_instruct" Gives trouble on MacOS
+          - "hfllama_phi3cpu_mini_4k_instruct"
     uses: ./.github/workflows/action_plain_unit_tests.yml
     with:
       os: macos-12
@@ -171,7 +174,8 @@ jobs:
           # - "transformers_mistral_7b" See Issue 713
           - "hfllama7b"
           - "hfllama_mistral_7b"
-          - "phi3cpu-mini-4k-instruct"
+          - "transformers_phi3cpu_mini_4k_instruct"
+          - "hfllama_phi3cpu_mini_4k_instruct"
     uses: ./.github/workflows/action_plain_unit_tests.yml
     with:
       os: Large_Windows

setup.py

@@ -1,3 +1,17 @@
+import sys
+
+# Check if 'setup.py' is run directly with 'build'
+# TODO: Consider generalizing this check further?
+if __name__ == "__main__":
+    if len(sys.argv) >= 2 and sys.argv[1] == "build":
+        raise SystemExit(
+            "Error: Direct invocation of 'setup.py build' is not recommended."
+            "Please use 'pip' to build and install this package, like so:\n"
+            "  pip install . (for the current directory)\n"
+            "  pip install -e . (for an editable install)\n"
+            "  pip wheel . --no-deps (to build a wheel)"
+        )
+
 import os
 import re
 import codecs

tests/conftest.py

@@ -12,10 +12,14 @@
     "phi2cpu": dict(
         name="transformers:microsoft/phi-2", kwargs={"trust_remote_code": True}
     ),
-    "phi3cpu-mini-4k-instruct": dict(
+    "transformers_phi3cpu_mini_4k_instruct": dict(
         name="transformers:microsoft/Phi-3-mini-4k-instruct",
         kwargs={"trust_remote_code": True},
     ),
+    "hfllama_phi3cpu_mini_4k_instruct": dict(
+        name="huggingface_hubllama:microsoft/Phi-3-mini-4k-instruct-gguf:Phi-3-mini-4k-instruct-q4.gguf",
+        kwargs={"verbose": True, "n_ctx": 4096},
+    ),
     "hfllama7b": dict(
         name="huggingface_hubllama:TheBloke/Llama-2-7B-GGUF:llama-2-7b.Q5_K_M.gguf",
         kwargs={"verbose": True, "n_ctx": 4096},