From d489151e97eaa9d8ec446118b709863a5acab87d Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Mon, 24 Jun 2024 19:34:20 -0700 Subject: [PATCH 1/5] pinning numpy for older SKL backwards compat tests (#780) --- .github/workflows/pythonapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 63eec1e4..5ce2d9a1 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -56,10 +56,10 @@ jobs: python -m pip install -e .[tests] -f https://download.pytorch.org/whl/torch_stable.html - name: Test with older SKLearn on Linux with py3.9 to check backward compatibility if: ${{ matrix.python-version == '3.9' && startsWith(matrix.os, 'ubuntu') == true }} - run: python -m pip install scikit-learn==1.2.1 + run: python -m pip install scikit-learn==1.2.1 numpy==1.26.4 - name: Pin SKLearn<1.5.0 on not Linux with py3.9 if: ${{ !(matrix.python-version == '3.9' && startsWith(matrix.os, 'ubuntu') == true) }} - run: python -m pip install "scikit-learn<1.5.0" + run: python -m pip install "scikit-learn<1.5.0" numpy==1.26.4 - name: Run basic tests without extra run: pytest - name: Coverage on basic tests without extra From c47feb4cead248fb621fe4188b4d319e57f70eca Mon Sep 17 00:00:00 2001 From: Masahiro Hiramori Date: Thu, 25 Jul 2024 12:19:38 +0900 Subject: [PATCH 2/5] upgrade tvm to 0.17.0 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 5ce2d9a1..b184710f 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -26,7 +26,7 @@ jobs: os: [ubuntu-22.04, macos-12, windows-2022] python-version: ['3.9', '3.10', '3.11'] env: - TVM_VERSION_TAG: v0.16.0 + TVM_VERSION_TAG: v0.17.0 PYTORCH_VERSION: 2.2.0 LLVM_VERSION: 14 From 144ef92afc25cb9fb27909023e7efdf1cd5ca8d8 Mon Sep 17 00:00:00 2001 From: Masahiro Hiramori Date: Thu, 25 Jul 2024 20:41:25 +0900 Subject: [PATCH 3/5] re-run ci From 94d49f80252065cdc73ebc9bb78be78142a27ce3 Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:06:00 -0700 Subject: [PATCH 4/5] mitigating onnx install issue (#789) --- .github/workflows/pythonapp.yml | 14 +++++++------- setup.py | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index b184710f..445cb1b4 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -138,19 +138,19 @@ jobs: cd ~/work/hummingbird/tvm/python python3 -m pip install -e . - # We don't run pytest for macos py3.9 since we do coverage for that case. + # We don't run pytest for ubuntu py3.9 since we do coverage for that case. - name: Test with pytest - if: ${{ matrix.python-version != '3.9' || startsWith(matrix.os, 'macos') != true }} + if: ${{ matrix.python-version != '3.9' || startsWith(matrix.os, 'ubuntu') != true }} run: pytest - # Run and push coverage only for macos py3.9 - - name: Coverage 3.9 macos - if: ${{ matrix.python-version == '3.9' && startsWith(matrix.os, 'macos') }} + # Run and push coverage only for ubuntu py3.9 + - name: Coverage 3.9 ubuntu + if: ${{ matrix.python-version == '3.9' && startsWith(matrix.os, 'ubuntu') }} run: | coverage run -a -m pytest tests coverage xml - name: Upload coverage to Codecov - if: ${{ matrix.python-version == '3.9' && startsWith(matrix.os, 'macos') }} - uses: codecov/codecov-action@v3 + if: ${{ matrix.python-version == '3.9' && startsWith(matrix.os, 'ubuntu') }} + uses: codecov/codecov-action@v4 with: file: ./coverage.xml flags: unittests diff --git a/setup.py b/setup.py index dca5a7a5..f7b68645 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ install_requires = [ "numpy>=1.15", "onnxconverter-common>=1.6.0", + "onnx<=1.16.1", "scipy", "scikit-learn", "torch>1.7.0", From 2e9b3a76fcb5fb0a248ccda4e3d972a79928164e Mon Sep 17 00:00:00 2001 From: Masahiro Hiramori Date: Tue, 6 Aug 2024 02:06:26 +0900 Subject: [PATCH 5/5] [CI] Upgrade ubuntu runner image to ubuntu-24.04 (#787) * upgrade ubuntu runner image to ubuntu-24.04 --- .github/workflows/pythonapp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 445cb1b4..9a49046f 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -23,12 +23,12 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + os: [ubuntu-24.04, macos-12, windows-2022] python-version: ['3.9', '3.10', '3.11'] env: TVM_VERSION_TAG: v0.17.0 PYTORCH_VERSION: 2.2.0 - LLVM_VERSION: 14 + LLVM_VERSION: 18 steps: - uses: actions/checkout@v4 @@ -95,7 +95,7 @@ jobs: - name: Install LLVM if Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu')}} run: | - sudo apt install llvm-${{ env.LLVM_VERSION }}-dev + sudo apt install llvm-${{ env.LLVM_VERSION }}-dev libpolly-${{ env.LLVM_VERSION }}-dev - name: Install LLVM if Mac if: ${{ startsWith(matrix.os, 'macos')}} run: |