From 2b452acb10b262de34bbca33cba1df65c4e4a6e0 Mon Sep 17 00:00:00 2001 From: Benjamin Fineran Date: Wed, 18 Oct 2023 15:57:00 -0400 Subject: [PATCH 1/4] [local-install-check.yaml] install sparsezoo from src local install checks need to target building sparsezoo from src when testing installing deepsparse from src as well --- .github/workflows/local-install-check.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/local-install-check.yaml b/.github/workflows/local-install-check.yaml index 4af5526550..ea6a97183c 100644 --- a/.github/workflows/local-install-check.yaml +++ b/.github/workflows/local-install-check.yaml @@ -20,6 +20,12 @@ jobs: local-install-test: runs-on: ubuntu-20.04 steps: + - uses: actions/checkout@v2 + with: + repository: "neuralmagic/sparsezoo" + path: "sparsezoo" + - name: "⚙️ Install sparsezoo dependencies" + run: pip install sparsezoo/ - uses: actions/checkout@v2 - name: "⚙️ Install local deepsparse" run: pip3 install . @@ -28,6 +34,12 @@ jobs: local-develop-test: runs-on: ubuntu-20.04 steps: + - uses: actions/checkout@v2 + with: + repository: "neuralmagic/sparsezoo" + path: "sparsezoo" + - name: "⚙️ Install sparsezoo dependencies" + run: pip install sparsezoo/ - uses: actions/checkout@v2 - name: "⚙️ Install local develop deepsparse" run: | From eb05174d1f3e674f468b17de5897790d92dfa16d Mon Sep 17 00:00:00 2001 From: Benjamin Fineran Date: Wed, 18 Oct 2023 16:01:16 -0400 Subject: [PATCH 2/4] fix venv creation order in develop test --- .github/workflows/local-install-check.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/local-install-check.yaml b/.github/workflows/local-install-check.yaml index ea6a97183c..0b4c4c219e 100644 --- a/.github/workflows/local-install-check.yaml +++ b/.github/workflows/local-install-check.yaml @@ -34,6 +34,10 @@ jobs: local-develop-test: runs-on: ubuntu-20.04 steps: + - name: "⚙️ Create and activate venv" + run: | + python3.8 -m venv venv-dev + source venv-dev/bin/activate - uses: actions/checkout@v2 with: repository: "neuralmagic/sparsezoo" @@ -42,9 +46,7 @@ jobs: run: pip install sparsezoo/ - uses: actions/checkout@v2 - name: "⚙️ Install local develop deepsparse" - run: | - python3.8 -m venv venv-dev - source venv-dev/bin/activate + run: pip install -e . - name: "deepsparse.benchmark" run: | From f6ab4237e4cf0edd6ad6e9aa347a8e62ba4cc604 Mon Sep 17 00:00:00 2001 From: Benjamin Fineran Date: Wed, 18 Oct 2023 16:05:25 -0400 Subject: [PATCH 3/4] continue develop test fix --- .github/workflows/local-install-check.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/local-install-check.yaml b/.github/workflows/local-install-check.yaml index 0b4c4c219e..f536c50bfc 100644 --- a/.github/workflows/local-install-check.yaml +++ b/.github/workflows/local-install-check.yaml @@ -42,11 +42,12 @@ jobs: with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" - - name: "⚙️ Install sparsezoo dependencies" - run: pip install sparsezoo/ - uses: actions/checkout@v2 - name: "⚙️ Install local develop deepsparse" - run: + run: | + python3.8 -m venv venv-dev + source venv-dev/bin/activate + pip install sparsezoo/ pip install -e . - name: "deepsparse.benchmark" run: | From 553b3ac3677f460eaebd31e6afcb2fa9dedf67c7 Mon Sep 17 00:00:00 2001 From: Benjamin Fineran Date: Wed, 18 Oct 2023 16:17:44 -0400 Subject: [PATCH 4/4] continue develop test fix --- .github/workflows/local-install-check.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/local-install-check.yaml b/.github/workflows/local-install-check.yaml index f536c50bfc..e5b14bd527 100644 --- a/.github/workflows/local-install-check.yaml +++ b/.github/workflows/local-install-check.yaml @@ -34,15 +34,11 @@ jobs: local-develop-test: runs-on: ubuntu-20.04 steps: - - name: "⚙️ Create and activate venv" - run: | - python3.8 -m venv venv-dev - source venv-dev/bin/activate + - uses: actions/checkout@v2 - uses: actions/checkout@v2 with: repository: "neuralmagic/sparsezoo" path: "sparsezoo" - - uses: actions/checkout@v2 - name: "⚙️ Install local develop deepsparse" run: | python3.8 -m venv venv-dev