-
Notifications
You must be signed in to change notification settings - Fork 186
Revert "Move pip install to dedicated GitHub Actions steps" #219
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,16 +14,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-dsr1-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 1k1k --model-prefix dsr1) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -35,16 +28,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-gptoss-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 1k1k --model-prefix gptoss) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -173,20 +159,15 @@ jobs: | |
| token: ${{ secrets.REPO_PAT }} | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Download results artifacts | ||
| uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 | ||
| with: | ||
| path: ${{ env.RESULTS_DIR }} | ||
| pattern: results_* | ||
|
|
||
| - name: Install python dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Calculate success rate | ||
| run: python3 utils/calc_success_rate.py $STATS_FILENAME | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,16 +14,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-dsr1-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 1k8k --model-prefix dsr1) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -35,16 +28,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-gptoss-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 1k8k --model-prefix gptoss) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -128,20 +114,15 @@ jobs: | |
| token: ${{ secrets.REPO_PAT }} | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Download results artifacts | ||
| uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 | ||
| with: | ||
| path: ${{ env.RESULTS_DIR }} | ||
| pattern: results_* | ||
|
|
||
| - name: Install python dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Calculate success rate | ||
| run: python3 utils/calc_success_rate.py $STATS_FILENAME | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,16 +14,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-dsr1-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 8k1k --model-prefix dsr1) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -35,16 +28,9 @@ jobs: | |
| - name: Checkout code | ||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install pydantic pyyaml | ||
|
|
||
| - id: get-gptoss-configs | ||
| run: | | ||
| pip install pydantic | ||
|
||
| CONFIG_JSON=$(python3 ${GITHUB_WORKSPACE}/utils/matrix-logic/generate_sweep_configs.py full-sweep --config-files ${GITHUB_WORKSPACE}/.github/configs/nvidia-master.yaml ${GITHUB_WORKSPACE}/.github/configs/amd-master.yaml --seq-lens 8k1k --model-prefix gptoss) | ||
| echo "search-space-config=$CONFIG_JSON" >> $GITHUB_OUTPUT | ||
|
|
||
|
|
@@ -173,20 +159,15 @@ jobs: | |
| token: ${{ secrets.REPO_PAT }} | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: '3.12' | ||
|
|
||
| - name: Install dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Download results artifacts | ||
| uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 | ||
| with: | ||
| path: ${{ env.RESULTS_DIR }} | ||
| pattern: results_* | ||
|
|
||
| - name: Install python dependencies | ||
| run: pip install PyGithub | ||
|
|
||
| - name: Calculate success rate | ||
| run: python3 utils/calc_success_rate.py $STATS_FILENAME | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -48,18 +48,11 @@ jobs: | |||||
| - name: Checkout code | ||||||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||||||
|
|
||||||
| - name: Set up Python | ||||||
| uses: actions/setup-python@v6 | ||||||
| with: | ||||||
| python-version: '3.12' | ||||||
|
|
||||||
| - name: Install dependencies | ||||||
| run: pip install pydantic pyyaml | ||||||
|
|
||||||
| # This looks complicated, but it is just calling generate_sweep_configs.py conditioned on | ||||||
| # discrete inputs (i.e., run_1k1k, run_h100, etc.) to split the test sweep into discrete jobs | ||||||
| - id: generate-configs | ||||||
| run: | | ||||||
| pip install pydantic | ||||||
|
||||||
| pip install pydantic | |
| pip install pydantic pyyaml |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -18,14 +18,6 @@ jobs: | |||||
| - name: Checkout code | ||||||
| uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 | ||||||
|
|
||||||
| - name: Set up Python | ||||||
| uses: actions/setup-python@v6 | ||||||
| with: | ||||||
| python-version: '3.12' | ||||||
|
|
||||||
| - name: Install dependencies | ||||||
| run: pip install pydantic pyyaml | ||||||
|
|
||||||
| - id: get-jobs | ||||||
| shell: python | ||||||
| run: | | ||||||
|
|
@@ -57,6 +49,7 @@ jobs: | |||||
| # Generate configs for standard labels | ||||||
| all_configs = [] | ||||||
| if matching: | ||||||
| subprocess.run(['pip', 'install', 'pydantic'], check=True) | ||||||
|
||||||
| subprocess.run(['pip', 'install', 'pydantic'], check=True) | |
| subprocess.run(['pip', 'install', 'pydantic', 'pyyaml'], check=True) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
pyyamldependency is missing from the pip install command. The original code installed bothpydanticandpyyaml, but after the revert onlypydanticis being installed. This will cause failures if the generate_sweep_configs.py script requires thepyyamlpackage.