Skip to content

Commit d7edfaf

Browse files
committed
Merge branch 'main' into feat/marimo_logging
2 parents 05a6fa0 + 8d63c79 commit d7edfaf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3126
-3192
lines changed

.github/workflows/action_gpu_basic_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Ensure NVIDIA SDK available
4444
run: |
4545
sudo apt-get -y install cuda-toolkit
46-
echo "/usr/local/cuda-12.5/bin" >> $GITHUB_PATH
46+
echo "/usr/local/cuda-12.6/bin" >> $GITHUB_PATH
4747
- name: Install dependencies
4848
shell: bash
4949
run: |

.github/workflows/action_plain_basic_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
shell: bash
4949
run: |
5050
pytest --cov=guidance --cov-report=xml --cov-report=term-missing \
51-
--selected_model ${{ inputs.model }} \
52-
./tests/unit ./tests/model_integration ./tests/model_specific
51+
--selected_model ${{ inputs.model }} \
52+
./tests/unit ./tests/model_integration ./tests/model_specific
5353
- name: Upload coverage reports to Codecov
5454
uses: codecov/codecov-action@v4
5555
with:

.github/workflows/ci_tests.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Ensure NVIDIA SDK available
4848
run: |
4949
sudo apt-get -y install cuda-toolkit
50-
echo "/usr/local/cuda-12.5/bin" >> $GITHUB_PATH
50+
echo "/usr/local/cuda-12.6/bin" >> $GITHUB_PATH
5151
- name: Install dependencies
5252
run: |
5353
python -m pip install --upgrade pip
@@ -75,10 +75,10 @@ jobs:
7575
env:
7676
HF_TOKEN: ${{ secrets.HF_TOKEN }}
7777
# Configure endpoints for Azure OpenAI
78-
AZUREAI_CHAT_ENDPOINT: ${{ secrets.AZUREAI_CHAT_ENDPOINT }}
79-
AZUREAI_CHAT_MODEL: ${{ secrets.AZUREAI_CHAT_MODEL }}
80-
AZUREAI_COMPLETION_ENDPOINT: ${{ secrets.AZUREAI_COMPLETION_ENDPOINT }}
81-
AZUREAI_COMPLETION_MODEL: ${{ secrets.AZUREAI_COMPLETION_MODEL }}
78+
AZUREAI_CHAT_ENDPOINT: ${{ vars.AZUREAI_CHAT_ENDPOINT }}
79+
AZUREAI_CHAT_MODEL: ${{ vars.AZUREAI_CHAT_MODEL }}
80+
AZUREAI_COMPLETION_ENDPOINT: ${{ vars.AZUREAI_COMPLETION_ENDPOINT }}
81+
AZUREAI_COMPLETION_MODEL: ${{ vars.AZUREAI_COMPLETION_MODEL }}
8282
# Configure endpoints for Azure AI Studio
8383
AZURE_AI_STUDIO_PHI3_ENDPOINT: ${{ vars.AZURE_AI_STUDIO_PHI3_ENDPOINT }}
8484
AZURE_AI_STUDIO_PHI3_DEPLOYMENT: ${{ vars.AZURE_AI_STUDIO_PHI3_DEPLOYMENT }}
@@ -132,7 +132,7 @@ jobs:
132132
- name: Ensure NVIDIA SDK available
133133
run: |
134134
sudo apt-get -y install cuda-toolkit
135-
echo "/usr/local/cuda-12.5/bin" >> $GITHUB_PATH
135+
echo "/usr/local/cuda-12.6/bin" >> $GITHUB_PATH
136136
- name: Install dependencies
137137
shell: bash
138138
run: |
@@ -150,6 +150,9 @@ jobs:
150150
run: |
151151
pip install accelerate
152152
pip uninstall -y llama-cpp-python
153+
echo "======================"
154+
nvcc --version
155+
echo "======================"
153156
CMAKE_ARGS="-DGGML_CUDA=on" pip install "llama-cpp-python!=0.2.58,!=0.2.75"
154157
- name: Check GPU available
155158
run: |

.github/workflows/notebook_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Ensure NVIDIA SDK available
5151
run: |
5252
sudo apt-get -y install cuda-toolkit
53-
echo "/usr/local/cuda-12.5/bin" >> $GITHUB_PATH
53+
echo "/usr/local/cuda-12.6/bin" >> $GITHUB_PATH
5454
- name: Install dependencies
5555
run: |
5656
python -m pip install --upgrade pip
@@ -78,10 +78,10 @@ jobs:
7878
env:
7979
HF_TOKEN: ${{ secrets.HF_TOKEN }}
8080
# Configure endpoints for Azure OpenAI
81-
AZUREAI_CHAT_ENDPOINT: ${{ secrets.AZUREAI_CHAT_ENDPOINT }}
82-
AZUREAI_CHAT_MODEL: ${{ secrets.AZUREAI_CHAT_MODEL }}
83-
AZUREAI_COMPLETION_ENDPOINT: ${{ secrets.AZUREAI_COMPLETION_ENDPOINT }}
84-
AZUREAI_COMPLETION_MODEL: ${{ secrets.AZUREAI_COMPLETION_MODEL }}
81+
AZUREAI_CHAT_ENDPOINT: ${{ vars.AZUREAI_CHAT_ENDPOINT }}
82+
AZUREAI_CHAT_MODEL: ${{ vars.AZUREAI_CHAT_MODEL }}
83+
AZUREAI_COMPLETION_ENDPOINT: ${{ vars.AZUREAI_COMPLETION_ENDPOINT }}
84+
AZUREAI_COMPLETION_MODEL: ${{ vars.AZUREAI_COMPLETION_MODEL }}
8585
# Configure endpoints for Azure AI Studio
8686
AZURE_AI_STUDIO_PHI3_ENDPOINT: ${{ vars.AZURE_AI_STUDIO_PHI3_ENDPOINT }}
8787
AZURE_AI_STUDIO_PHI3_DEPLOYMENT: ${{ vars.AZURE_AI_STUDIO_PHI3_DEPLOYMENT }}

.github/workflows/pypi_upload.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
runs-on: ubuntu-latest
1717
outputs:
1818
include: ${{ steps.set-matrix.outputs.include }}
19+
20+
env:
21+
CIBW_SKIP: pp*
22+
1923
steps:
2024
- uses: actions/checkout@v4
2125
- name: Install cibuildwheel
@@ -50,6 +54,7 @@ jobs:
5054
CIBW_BUILD_VERBOSITY: 1
5155
CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y"
5256
CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"'
57+
CIBW_SKIP: pp*
5358

5459
steps:
5560
- name: Check out the repo
@@ -154,8 +159,8 @@ jobs:
154159
name: Install guidance from wheels
155160
- run: pip install transformers torch
156161
name: Other installs
157-
- run: python -c "import guidance; lm = guidance.models.Transformers('gpt2'); lm += '1,2,3,4,5,' + guidance.gen('num', max_tokens=5, temperature=0); print(f'\n{str(lm)=}\n'); assert lm['num'].startswith('6')"
158-
name: Run smoke test
162+
# - run: python -c "import guidance; import transformers; lm = guidance.models.Transformers('gpt2'); lm += '1,2,3,4,5,' + guidance.gen('num', max_tokens=5, temperature=0); print(f'\n Transformers Version:{transformers.__version__}\n\n{str(lm)=}\n'); assert lm['num'].startswith('6')"
163+
# name: Run smoke test
159164

160165
publish_wheels:
161166
permissions:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
matrix:
170170
python-version: ["3.9", "3.10", "3.11", "3.12"]
171171
model:
172-
- "transformers_gpt2_cpu"
172+
# - "transformers_gpt2_cpu" See #965
173173
# - "transformers_phi2_cpu" Seems to get stuck
174174
# - "transformers_mistral_7b_cpu" See Issue 713
175175
# - "llamacpp_llama2_7b_cpu" Getting stuck with llama-cpp-python 0.2.77

guidance/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "0.1.15"
1+
__version__ = "0.2.0rc1"
22

33
import sys
44
import types

0 commit comments

Comments
 (0)