From 778fb550339d28e34d7272883746c6636b708a06 Mon Sep 17 00:00:00 2001 From: johnnynunez Date: Wed, 6 Mar 2024 14:57:29 +0100 Subject: [PATCH 1/3] updated --- .../build-and-publish-tagged-images.yaml | 12 ++++---- .github/workflows/linkcheck.yml | 2 +- .github/workflows/local-install-check.yaml | 12 ++++---- .github/workflows/publish-nightly-docker.yaml | 12 ++++---- .github/workflows/quality-check.yaml | 4 +-- .github/workflows/test-check.yaml | 30 +++++++++---------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-and-publish-tagged-images.yaml b/.github/workflows/build-and-publish-tagged-images.yaml index 4a2b0f3116..50affb5cbf 100644 --- a/.github/workflows/build-and-publish-tagged-images.yaml +++ b/.github/workflows/build-and-publish-tagged-images.yaml @@ -16,13 +16,13 @@ jobs: - name: Set up Docker Buildx if: ${{ startsWith(github.ref, 'refs/tags/v') }} id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - name: Login to Github Packages if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -30,7 +30,7 @@ jobs: - name: Checkout code if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -45,7 +45,7 @@ jobs: - name: Build and push deepsparse latest with all dependencies if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | @@ -57,7 +57,7 @@ jobs: - name: Build and push deepsparse with all dependencies if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | @@ -69,7 +69,7 @@ jobs: - name: Build and push deepsparse-base if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 8d02a43c7e..7007e3153d 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -15,7 +15,7 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: 'yes' diff --git a/.github/workflows/local-install-check.yaml b/.github/workflows/local-install-check.yaml index e5b14bd527..b06c71ac59 100644 --- a/.github/workflows/local-install-check.yaml +++ b/.github/workflows/local-install-check.yaml @@ -18,24 +18,24 @@ env: jobs: local-install-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" - name: "⚙️ Install sparsezoo dependencies" run: pip install sparsezoo/ - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: "⚙️ Install local deepsparse" run: pip3 install . - name: "deepsparse.benchmark" run: deepsparse.benchmark zoo:cv/classification/mobilenet_v1-1.0/pytorch/sparseml/imagenet/pruned_quant-moderate -w 1 -t 1 local-develop-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" diff --git a/.github/workflows/publish-nightly-docker.yaml b/.github/workflows/publish-nightly-docker.yaml index 69673a2b73..9e3cc83d68 100644 --- a/.github/workflows/publish-nightly-docker.yaml +++ b/.github/workflows/publish-nightly-docker.yaml @@ -18,19 +18,19 @@ jobs: steps: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - name: Login to Github Packages - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -43,7 +43,7 @@ jobs: echo ${{ steps.extract_tag.outputs.tag }} - name: DeepSparse-Nightly latest - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | @@ -54,7 +54,7 @@ jobs: ghcr.io/neuralmagic/deepsparse-nightly:latest - name: Today's DeepSparse-Nightly - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | @@ -65,7 +65,7 @@ jobs: ghcr.io/neuralmagic/deepsparse-nightly:${{ steps.extract_tag.outputs.tag }} - name: Today's DeepSparse-Nightly Base - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ./docker build-args: | diff --git a/.github/workflows/quality-check.yaml b/.github/workflows/quality-check.yaml index aa8958ce47..6712263d6e 100644 --- a/.github/workflows/quality-check.yaml +++ b/.github/workflows/quality-check.yaml @@ -16,8 +16,8 @@ jobs: quality-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" diff --git a/.github/workflows/test-check.yaml b/.github/workflows/test-check.yaml index 55887c290f..4cfb6e9435 100644 --- a/.github/workflows/test-check.yaml +++ b/.github/workflows/test-check.yaml @@ -26,16 +26,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, '3.11'] - os: [ubuntu-20.04] + python-version: ['3.8', '3.9', '3.11', '3.12'] + os: [ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" @@ -52,16 +52,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, '3.11'] - os: [ubuntu-20.04] + python-version: ['3.8', '3.9', '3.11', '3.12'] + os: [ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" @@ -78,16 +78,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, '3.10'] - os: [ubuntu-20.04] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + os: [ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" From d34baa4b298cd2f08db9aa5f585cb5fd8c694421 Mon Sep 17 00:00:00 2001 From: johnnynunez Date: Wed, 6 Mar 2024 14:58:59 +0100 Subject: [PATCH 2/3] updated --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b19ec0c1b0..22c36e0e79 100644 --- a/setup.py +++ b/setup.py @@ -200,7 +200,7 @@ def _check_supported_system(): def _check_supported_python_version(): supported_major = 3 - supported_minor = [8, 9, 10, 11] + supported_minor = [8, 9, 10, 11, 12] if ( sys.version_info[0] != supported_major @@ -344,7 +344,7 @@ def _setup_long_description() -> Tuple[str, str]: install_requires=_setup_install_requires(), extras_require=_setup_extras(), entry_points=_setup_entry_points(), - python_requires=">=3.8, <3.12", + python_requires=">=3.8, <3.13", classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", @@ -353,6 +353,7 @@ def _setup_long_description() -> Tuple[str, str]: "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Intended Audience :: Developers", "Intended Audience :: Education", "Intended Audience :: Information Technology", From e1b036c623b7363ea25892f79c085265767953a9 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 6 Mar 2024 18:34:21 +0100 Subject: [PATCH 3/3] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 22c36e0e79..736ceb6b53 100644 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ def _parse_requirements_file(file_path): _deps = [ "numpy>=1.16.3", - "onnx>=1.5.0,<1.15.0", + "onnx>=1.5.0,<1.17.0", "pydantic>=1.8.2,<2.0.0", "requests>=2.0.0", "tqdm>=4.0.0",