From f92bcb3719bd70c93060715dc76cc5c24ad9f4bf Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 11:56:49 +0800 Subject: [PATCH 1/8] dev(hansbug): test for torch high version --- .github/workflows/test.yml | 1 + .gitignore | 3 ++- requirements-test-extra.txt | 2 +- requirements.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a70c661fcd..dfe555a853 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,7 @@ jobs: torch-version: - '1.7.1' - '1.13.1' + - '2.0.1' - 'latest' steps: diff --git a/.gitignore b/.gitignore index 75f354648d..ff652ebf8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1213,4 +1213,5 @@ fabric.properties !/docs/source/_static/**/* !/runs/artifacts /runs/artifacts/* -.benchmarks \ No newline at end of file +.benchmarks +/venv* diff --git a/requirements-test-extra.txt b/requirements-test-extra.txt index ea8327ef93..7744e14635 100644 --- a/requirements-test-extra.txt +++ b/requirements-test-extra.txt @@ -1,2 +1,2 @@ jax[cpu]>=0.3.25; platform_system != 'Windows' -torch>=1.1.0; python_version < '3.11' +torch>=1.1.0; python_version < '3.12' diff --git a/requirements.txt b/requirements.txt index af87456d80..08fe11e5d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ enum_tools graphviz~=0.17 dill~=0.3.4 click>=7.1.0 -hbutils>=0.0.1 \ No newline at end of file +hbutils>=0.9.1 \ No newline at end of file From 7e2bd4e894691cc1e5d6e44e3e248f18afc1142e Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 12:02:50 +0800 Subject: [PATCH 2/8] dev(hansbug): add more complex test set: --- .github/workflows/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfe555a853..8985d7d5d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,9 @@ jobs: - '1.13.1' - '2.0.1' - 'latest' + exclude: + - python-version: '3.7' + torch-version: '2.0.1' steps: - name: Get system version for Linux @@ -99,16 +102,15 @@ jobs: pip install -r requirements.txt pip install -r requirements-build.txt pip install -r requirements-test.txt + - name: Install Extra Test Requirements + shell: bash + run: | + pip install -r requirements-test-extra.txt - name: Install Torch shell: bash if: ${{ matrix.torch-version != 'latest' }} - continue-on-error: true run: | pip install torch==${{ matrix.torch-version }} - - name: Install Extra Test Requirements - shell: bash - run: | - pip install -r requirements-test-extra.txt - name: Test the basic environment shell: bash run: | From a4aa8050ec8840e78401cc2104f1561c5fac616b Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 12:13:42 +0800 Subject: [PATCH 3/8] dev(hansbug): exclude some impossible combines --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8985d7d5d7..e066089e12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,6 +34,12 @@ jobs: exclude: - python-version: '3.7' torch-version: '2.0.1' + - python-version: '3.10' + torch-version: '1.7.1' + - python-version: '3.11' + torch-version: '1.7.1' + - python-version: '3.11' + torch-version: '1.13.1' steps: - name: Get system version for Linux From a1bf340aa89198b9bec9310a789a13284ddc92e7 Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 12:36:21 +0800 Subject: [PATCH 4/8] dev(hansbug): show detailed information of size compare on windows --- test/tree/tree/base.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test/tree/tree/base.py b/test/tree/tree/base.py index ee179cb26d..4034269df6 100644 --- a/test/tree/tree/base.py +++ b/test/tree/tree/base.py @@ -758,7 +758,9 @@ def test_repr_svg(self): _repr_svg_ = t1._repr_svg_() assert isinstance(_repr_svg_, str) - assert 4500 <= len(_repr_svg_) <= 4900 + min_size, max_size = 4500, 4900 + assert min_size <= len(_repr_svg_) <= max_size, \ + f'Size within [{min_size!r}, {max_size!r}] required, but {len(_repr_svg_)!r} found.' @unittest.skipUnless(cmdv('dot'), 'Dot installed only') def test_repr_png(self): @@ -768,9 +770,11 @@ def test_repr_png(self): _repr_png_ = t1._repr_png_() assert isinstance(_repr_png_, bytes) if OS.windows: - assert 12000 <= len(_repr_png_) <= 16050 + min_size, max_size = 12000, 16050 else: - assert 16050 <= len(_repr_png_) <= 20500 + min_size, max_size = 16050, 20500 + assert min_size <= len(_repr_png_) <= max_size, \ + f'Size within [{min_size!r}, {max_size!r}] required, but {len(_repr_png_)!r} found.' @unittest.skipUnless(cmdv('dot'), 'Dot installed only') def test_repr_jpeg(self): @@ -779,6 +783,8 @@ def test_repr_jpeg(self): _repr_jpeg_ = t1._repr_jpeg_() assert isinstance(_repr_jpeg_, bytes) - assert 10500 <= len(_repr_jpeg_) <= 14500 + min_size, max_size = 10500, 14500 + assert min_size <= len(_repr_jpeg_) <= max_size, \ + f'Size within [{min_size!r}, {max_size!r}] required, but {len(_repr_jpeg_)!r} found.' return _TestClass From 35fc46eb85f588d32e0de45c5a27b470b91ba294 Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 12:59:37 +0800 Subject: [PATCH 5/8] dev(hansbug): fix bug on windows --- test/tree/tree/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tree/tree/base.py b/test/tree/tree/base.py index 4034269df6..c67a9c6f56 100644 --- a/test/tree/tree/base.py +++ b/test/tree/tree/base.py @@ -770,7 +770,7 @@ def test_repr_png(self): _repr_png_ = t1._repr_png_() assert isinstance(_repr_png_, bytes) if OS.windows: - min_size, max_size = 12000, 16050 + min_size, max_size = 14000, 18050 else: min_size, max_size = 16050, 20500 assert min_size <= len(_repr_png_) <= max_size, \ From 609a8cd25df14a80d26451c0cc519f3738a7f834 Mon Sep 17 00:00:00 2001 From: HansBug Date: Fri, 26 May 2023 14:18:41 +0800 Subject: [PATCH 6/8] release(hansbug): release as version v1.4.11 --- treevalue/config/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/treevalue/config/meta.py b/treevalue/config/meta.py index 81d19bdbde..5b701e2221 100644 --- a/treevalue/config/meta.py +++ b/treevalue/config/meta.py @@ -7,7 +7,7 @@ __TITLE__ = "treevalue" #: Version of this project. -__VERSION__ = "1.4.10" +__VERSION__ = "1.4.11" #: Short description of the project, will be included in ``setup.py``. __DESCRIPTION__ = 'A flexible, generalized tree-based data structure.' From 4ef9bad58252ab39d9b20f9bb25b3cda966fa869 Mon Sep 17 00:00:00 2001 From: HansBug Date: Thu, 10 Aug 2023 10:50:32 +0800 Subject: [PATCH 7/8] dev(narugo): run unittest of treevalue --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e066089e12..3681ccc85e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: - dev/* - fix/* - test/* + workflow_dispatch: jobs: unittest: From c7920bde1b814d9ed9ff9c4df59513ad47380caa Mon Sep 17 00:00:00 2001 From: HansBug Date: Thu, 10 Aug 2023 11:15:31 +0800 Subject: [PATCH 8/8] dev(narugo): upload for fixing platform_system --- requirements-build.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-build.txt b/requirements-build.txt index 8cc70c1a1f..2055a21306 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -1,3 +1,4 @@ -cython>=0.29 +cython>=0.29; platform_system != 'Windows' +cython>=0.29,<3; platform_system == 'Windows' build>=0.7.0 auditwheel>=4 \ No newline at end of file