Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
some minor patches
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-neuma committed May 2, 2024
1 parent 6cae967 commit b30e6df
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .github/actions/nm-install-test-whl/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ runs:
pip3 install coverage
pip3 install pytest-cov
pip3 install pytest-xdist
pip3 install --index-url http://${{ inputs.pypi }}:8080/ --trusted-host ${{ inputs.pypi }} nm-magic-wand-nightly
pip3 list
pip3 install -r requirements-dev.txt
BASE=$(./.github/scripts/convert-version ${{ inputs.python }})
WHL=$(find . -type f -iname "*${BASE}*.whl")
WHL_BASENAME=$(basename ${WHL})
echo "whl=${WHL_BASENAME}" >> "$GITHUB_OUTPUT"
pip3 install ${WHL}
pip3 install -r requirements-dev.txt
pip3 install ${WHL}[sparse]
# report magic_wand version
MAGIC_WAND=$(pip3 show nm-magic-wand-nightly | grep "Version" | cut -d' ' -f2)
echo "magic_wand=${MAGIC_WAND}" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/nm-install-whl/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
COMMIT=${{ github.sha }}
VENV="${{ env.VENV_BASE }}-${COMMIT:0:7}"
source $(pyenv root)/versions/${{ inputs.python }}/envs/${VENV}/bin/activate
pip3 install -r requirements-cuda.txt -r requirements-dev.txt
pip3 install -r requirements-dev.txt
BASE=$(./.github/scripts/convert-version ${{ inputs.python }})
WHL=$(find . -type f -iname "*${BASE}*.whl")
WHL_BASENAME=$(basename ${WHL})
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ jobs:
timeout: ${{ inputs.benchmark_timeout }}
gitref: ${{ github.ref }}
python: ${{ inputs.python }}
whl: ${{ needs.BUILD.outputs.whl }}
# Always push if it is a scheduled job
push_benchmark_results_to_gh_pages: "${{ github.event_name == 'schedule' || inputs.push_benchmark_results_to_gh_pages }}"
secrets: inherit
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/nm-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:
description: "python version, e.g. 3.10.12"
type: string
required: true
whl:
description: "whl to test (variable appears late binding so unusable outside 'download artifact')"
type: string
required: true
push_benchmark_results_to_gh_pages:
description: "When set to true, the workflow pushes all benchmarking results to gh-pages UI"
type: string
Expand Down Expand Up @@ -51,6 +55,10 @@ on:
description: "python version, e.g. 3.10.12"
type: string
required: true
whl:
description: "whl to test (variable appears late binding so unusable outside 'download artifact')"
type: string
required: true
push_benchmark_results_to_gh_pages:
description: "When set to true, the workflow pushes all benchmarking results to gh-pages UI"
type: choice
Expand Down Expand Up @@ -85,8 +93,8 @@ jobs:
uses: ./.github/actions/nm-set-env/
with:
hf_token: ${{ secrets.NM_HF_TOKEN }}
Gi_per_thread: ${{ inputs.Gi_per_thread }}
nvcc_threads: ${{ inputs.nvcc_threads }}
Gi_per_thread: 1
nvcc_threads: 0

- name: set python
id: set_python
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ jobs:
with:
hf_token: ${{ secrets.NM_HF_TOKEN }}
Gi_per_thread: 1
nvcc_threads: 0

- name: set python
id: set_python
Expand Down
1 change: 0 additions & 1 deletion neuralmagic/benchmarks/requirements-benchmark.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
requests
aiohttp
datasets
nm-magic-wand-nightly

0 comments on commit b30e6df

Please sign in to comment.