From 30ee180536416560013848781017321e8c6a514a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 22 Dec 2020 20:31:47 +0000 Subject: [PATCH 01/19] Update scikit-learn requirement from ^0.23 to >=0.23,<0.25 Updates the requirements on [scikit-learn](https://github.com/scikit-learn/scikit-learn) to permit the latest version. - [Release notes](https://github.com/scikit-learn/scikit-learn/releases) - [Commits](https://github.com/scikit-learn/scikit-learn/compare/0.23.0...0.24.0) Signed-off-by: dependabot-preview[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 667c5f0..1f87863 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ [tool.poetry.dependencies] python = ">=3.6.5,<3.9" numpy = "^1.17" -scikit-learn = "^0.23" +scikit-learn = ">=0.23,<0.25" tqdm = "^4.41" tensorboard = "^2.1" pandas = "^1.0" From 1d300be9300ee91e3123d461414c3f0d5d2c7707 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 20:29:26 +0000 Subject: [PATCH 02/19] Update tslearn requirement from ^0.4.1 to ^0.5.0 Updates the requirements on [tslearn](https://github.com/tslearn-team/tslearn) to permit the latest version. - [Release notes](https://github.com/tslearn-team/tslearn/releases) - [Changelog](https://github.com/tslearn-team/tslearn/blob/master/CHANGELOG.md) - [Commits](https://github.com/tslearn-team/tslearn/compare/v0.4.1...v0.5.0.5) Signed-off-by: dependabot-preview[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1f87863..11670aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ sphinx-material = "^0.0.32" sphinx-copybutton = "^0.3" sphinx-autoapi = "^1.5" mypy = "^0.790" -tslearn = "^0.4.1" +tslearn = "^0.5.0" hydra-core = "^1.0.3" From c76a7f80f2da61a696d5aaaa29fd6e58d092dd6b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:21:06 +0000 Subject: [PATCH 03/19] Update mxnet requirement from 1.6.0 to 1.7.0.post2 Updates the requirements on [mxnet](https://github.com/apache/incubator-mxnet) to permit the latest version. - [Release notes](https://github.com/apache/incubator-mxnet/releases) - [Changelog](https://github.com/apache/incubator-mxnet/blob/master/NEWS.md) - [Commits](https://github.com/apache/incubator-mxnet/commits) Signed-off-by: dependabot-preview[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1f87863..f2ea00f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ comet_ml = "^3.1.3" netron = "^4.5" [tool.poetry.dev-dependencies] -mxnet = "1.6.0" +mxnet = "1.7.0.post2" pytest = "^6.0" flake8 = "^3.8" black = "^20.8b1" From f1325750eb6ba9bbed3f8fe338eabacdf65ba649 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 14:46:30 +0000 Subject: [PATCH 04/19] Update mypy requirement from ^0.790 to ^0.812 Updates the requirements on [mypy](https://github.com/python/mypy) to permit the latest version. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.790...v0.812) Signed-off-by: dependabot-preview[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 11670aa..c44da3b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ tensorflow-datasets = "^4.0" sphinx-material = "^0.0.32" sphinx-copybutton = "^0.3" sphinx-autoapi = "^1.5" -mypy = "^0.790" +mypy = "^0.812" tslearn = "^0.5.0" hydra-core = "^1.0.3" From 05c72597384764adf4b844e2315bba8c1f88fcc9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 10:27:00 +0000 Subject: [PATCH 05/19] Update black requirement from ^20.8b1 to ^21.4b1 Updates the requirements on [black](https://github.com/psf/black) to permit the latest version. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/master/CHANGES.md) - [Commits](https://github.com/psf/black/commits) Signed-off-by: dependabot-preview[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bd1b2da..2c915d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ netron = "^4.5" mxnet = "1.7.0.post2" pytest = "^6.0" flake8 = "^3.8" -black = "^20.8b1" +black = "^21.4b1" tensorflow = "^2.3.0" tensorflow-datasets = "^4.0" sphinx-material = "^0.0.32" From 8089e6aa251bd79e49f400a397d3b59bd67611f5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:33:14 +0000 Subject: [PATCH 06/19] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..3b6b78a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,18 @@ +version: 2 +updates: +- package-ecosystem: pip + directory: "/" + schedule: + interval: daily + time: "20:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: black + versions: + - 21.4b0 + - dependency-name: mxnet + versions: + - 1.8.0 + - dependency-name: mypy + versions: + - "0.800" From 03b05168b8227c7d3e341dd2fe32cd993d97ec9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:28:13 +0000 Subject: [PATCH 07/19] Update mypy requirement from ^0.812 to ^0.902 Updates the requirements on [mypy](https://github.com/python/mypy) to permit the latest version. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.812...v0.902) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2c915d7..849c4f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ tensorflow-datasets = "^4.0" sphinx-material = "^0.0.32" sphinx-copybutton = "^0.3" sphinx-autoapi = "^1.5" -mypy = "^0.812" +mypy = "^0.902" tslearn = "^0.5.0" hydra-core = "^1.0.3" From 83f148d447d8c3c160939b2145de7acd98b8bcf9 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 20:56:32 +0900 Subject: [PATCH 08/19] #167 Removed TensorFlow and MXNet from pyproject.toml --- .github/workflows/ci-pytest-linux.yaml | 2 ++ .github/workflows/ci-pytest-mac.yaml | 2 ++ .github/workflows/ci-pytest-win.yaml | 2 ++ pyproject.toml | 3 --- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytest-linux.yaml b/.github/workflows/ci-pytest-linux.yaml index 2c78e19..4739fd1 100644 --- a/.github/workflows/ci-pytest-linux.yaml +++ b/.github/workflows/ci-pytest-linux.yaml @@ -33,6 +33,7 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision + poetry run pip install tensorflow tensorflow-datasets mxnet poetry install --no-interaction - name: Install Dependencies with Comet.ml @@ -40,6 +41,7 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision + poetry run pip install tensorflow tensorflow-datasets poetry install --no-interaction --extras comet - name: Lint with flake8 diff --git a/.github/workflows/ci-pytest-mac.yaml b/.github/workflows/ci-pytest-mac.yaml index 73ec092..8ac6ccd 100644 --- a/.github/workflows/ci-pytest-mac.yaml +++ b/.github/workflows/ci-pytest-mac.yaml @@ -33,6 +33,7 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision + poetry run pip install tensorflow tensorflow-datasets mxnet poetry install --no-interaction - name: Install Dependencies with Comet.ml @@ -40,6 +41,7 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision + poetry run pip install tensorflow tensorflow-datasets poetry install --no-interaction --extras comet - name: Lint with flake8 diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml index f62d6af..9d3d745 100644 --- a/.github/workflows/ci-pytest-win.yaml +++ b/.github/workflows/ci-pytest-win.yaml @@ -36,6 +36,7 @@ jobs: run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH poetry run pip install -U pip + poetry run pip install tensorflow tensorflow-datasets poetry run pip install -U torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html poetry install --no-interaction shell: bash @@ -45,6 +46,7 @@ jobs: run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH poetry run pip install -U pip + poetry run pip install tensorflow tensorflow-datasets mxnet poetry run pip install -U torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html poetry install --no-interaction --extras comet shell: bash diff --git a/pyproject.toml b/pyproject.toml index 5162170..225fb72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,12 +24,9 @@ netron = { version = "^4.5", optional = true } comet_ml = { version = "^3.1.3", optional = true } [tool.poetry.dev-dependencies] -mxnet = "1.7.0.post2" pytest = "^6.0" flake8 = "^3.8" black = "^20.8b1" -tensorflow = { version = "^2.3.0", allow-prereleases = true } -tensorflow-datasets = "^4.0" sphinx-material = "^0.0.32" sphinx-copybutton = "^0.3" sphinx-autoapi = "^1.5" From 379573975bb0d93614b616b1dec6552e0139b5ac Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 20:57:23 +0900 Subject: [PATCH 09/19] create Dockerfile for Aarch64 platform --- docker/Aarch64.Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docker/Aarch64.Dockerfile diff --git a/docker/Aarch64.Dockerfile b/docker/Aarch64.Dockerfile new file mode 100644 index 0000000..832671a --- /dev/null +++ b/docker/Aarch64.Dockerfile @@ -0,0 +1,11 @@ +FROM khirotaka0122/torch:1.8.0-aarch64-py3.8.8 + +SHELL ["/bin/bash", "-c"] + +WORKDIR /enchanter-build +COPY enchanter/ /enchanter-build/enchanter/ +COPY README.md pyproject.toml /enchanter-build/ + +RUN poetry install --no-interaction --no-ansi + +WORKDIR /workspace From 56db0ca877b3cc307d4f3ea399b6e986318a1cd1 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:04:25 +0900 Subject: [PATCH 10/19] add `--user` --- .github/workflows/ci-pytest-win.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml index 9d3d745..6d1fab0 100644 --- a/.github/workflows/ci-pytest-win.yaml +++ b/.github/workflows/ci-pytest-win.yaml @@ -35,9 +35,9 @@ jobs: if: "matrix.comet == false" run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U pip - poetry run pip install tensorflow tensorflow-datasets - poetry run pip install -U torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html + poetry run pip install -U --user pip + poetry run pip install --user tensorflow tensorflow-datasets + poetry run pip install -U --user torch torchvision poetry install --no-interaction shell: bash @@ -45,9 +45,9 @@ jobs: if: "matrix.comet == true" run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U pip - poetry run pip install tensorflow tensorflow-datasets mxnet - poetry run pip install -U torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html + poetry run pip install -U --user pip + poetry run pip install --user tensorflow tensorflow-datasets mxnet + poetry run pip install --user -U torch torchvision poetry install --no-interaction --extras comet shell: bash From c3fd281b46401316eb3b20990dd1fc2dfe7841a8 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:07:45 +0900 Subject: [PATCH 11/19] add `mxnet` --- .github/workflows/ci-pytest-linux.yaml | 2 +- .github/workflows/ci-pytest-mac.yaml | 2 +- .github/workflows/ci-pytest-win.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytest-linux.yaml b/.github/workflows/ci-pytest-linux.yaml index 4739fd1..97a3d5f 100644 --- a/.github/workflows/ci-pytest-linux.yaml +++ b/.github/workflows/ci-pytest-linux.yaml @@ -42,7 +42,7 @@ jobs: poetry run pip install -U pip poetry run pip install -U torch torchvision poetry run pip install tensorflow tensorflow-datasets - poetry install --no-interaction --extras comet + poetry install --no-interaction --extras comet mxnet - name: Lint with flake8 run: | diff --git a/.github/workflows/ci-pytest-mac.yaml b/.github/workflows/ci-pytest-mac.yaml index 8ac6ccd..d0cfaa8 100644 --- a/.github/workflows/ci-pytest-mac.yaml +++ b/.github/workflows/ci-pytest-mac.yaml @@ -41,7 +41,7 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision - poetry run pip install tensorflow tensorflow-datasets + poetry run pip install tensorflow tensorflow-datasets mxnet poetry install --no-interaction --extras comet - name: Lint with flake8 diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml index 6d1fab0..abbc513 100644 --- a/.github/workflows/ci-pytest-win.yaml +++ b/.github/workflows/ci-pytest-win.yaml @@ -36,7 +36,7 @@ jobs: run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH poetry run pip install -U --user pip - poetry run pip install --user tensorflow tensorflow-datasets + poetry run pip install --user tensorflow tensorflow-datasets mxnet poetry run pip install -U --user torch torchvision poetry install --no-interaction shell: bash From d38b62b7cdf374ae3b61e18370618332d3ed7765 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:10:02 +0900 Subject: [PATCH 12/19] `from torch.tensor` -> `from torch` --- enchanter/addons/layers/dense_interpolation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enchanter/addons/layers/dense_interpolation.py b/enchanter/addons/layers/dense_interpolation.py index deab175..1150561 100644 --- a/enchanter/addons/layers/dense_interpolation.py +++ b/enchanter/addons/layers/dense_interpolation.py @@ -9,7 +9,7 @@ import numpy as np from torch import tensor, bmm -from torch.tensor import Tensor +from torch import Tensor from torch.nn import Module From b13cf2095b41ed08c902a1e96702c03de2a384af Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:15:18 +0900 Subject: [PATCH 13/19] remove `--user` fucking windows --- .github/workflows/ci-pytest-win.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml index abbc513..7a5776e 100644 --- a/.github/workflows/ci-pytest-win.yaml +++ b/.github/workflows/ci-pytest-win.yaml @@ -35,9 +35,9 @@ jobs: if: "matrix.comet == false" run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U --user pip - poetry run pip install --user tensorflow tensorflow-datasets mxnet - poetry run pip install -U --user torch torchvision + poetry run pip install -U pip + poetry run pip install tensorflow tensorflow-datasets mxnet + poetry run pip install -U torch torchvision poetry install --no-interaction shell: bash From e44adc37f53b8ba2ef5f43fae93d594f3aa9c852 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:15:36 +0900 Subject: [PATCH 14/19] typo mxnet --- .github/workflows/ci-pytest-linux.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pytest-linux.yaml b/.github/workflows/ci-pytest-linux.yaml index 97a3d5f..e5af69c 100644 --- a/.github/workflows/ci-pytest-linux.yaml +++ b/.github/workflows/ci-pytest-linux.yaml @@ -41,8 +41,8 @@ jobs: run: | poetry run pip install -U pip poetry run pip install -U torch torchvision - poetry run pip install tensorflow tensorflow-datasets - poetry install --no-interaction --extras comet mxnet + poetry run pip install tensorflow tensorflow-datasets mxnet + poetry install --no-interaction --extras comet - name: Lint with flake8 run: | From 81744dda993e04f83f761746651ff38dedc06c76 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:18:06 +0900 Subject: [PATCH 15/19] remove `--user` from option workflow --- .github/workflows/ci-pytest-win.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml index 7a5776e..d7ed9cd 100644 --- a/.github/workflows/ci-pytest-win.yaml +++ b/.github/workflows/ci-pytest-win.yaml @@ -45,9 +45,9 @@ jobs: if: "matrix.comet == true" run: | echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U --user pip - poetry run pip install --user tensorflow tensorflow-datasets mxnet - poetry run pip install --user -U torch torchvision + poetry run pip install -U pip + poetry run pip install tensorflow tensorflow-datasets mxnet + poetry run pip install -U torch torchvision poetry install --no-interaction --extras comet shell: bash From a8d933d7f6d2261e2a287c9a0ebc80ac8d60f1c5 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:23:48 +0900 Subject: [PATCH 16/19] `from torch.tensor` -> `from torch` --- enchanter/addons/layers/mlp.py | 2 +- enchanter/addons/layers/se_layer.py | 2 +- enchanter/engine/runner.py | 2 +- enchanter/tasks/regression.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/enchanter/addons/layers/mlp.py b/enchanter/addons/layers/mlp.py index 84ec16a..e5354b9 100644 --- a/enchanter/addons/layers/mlp.py +++ b/enchanter/addons/layers/mlp.py @@ -9,7 +9,7 @@ from typing import List, Callable, Union from torch import relu -from torch.tensor import Tensor +from torch import Tensor from torch.nn import Module, ModuleList, Linear, Sequential, Conv1d, ReLU diff --git a/enchanter/addons/layers/se_layer.py b/enchanter/addons/layers/se_layer.py index a6842d7..581fd4e 100644 --- a/enchanter/addons/layers/se_layer.py +++ b/enchanter/addons/layers/se_layer.py @@ -1,4 +1,4 @@ -from torch.tensor import Tensor +from torch import Tensor from torch import nn diff --git a/enchanter/engine/runner.py b/enchanter/engine/runner.py index 3b7847c..e7cf915 100644 --- a/enchanter/engine/runner.py +++ b/enchanter/engine/runner.py @@ -21,7 +21,7 @@ import torch from torch.nn import Module -from torch.tensor import Tensor +from torch import Tensor from torch.cuda import is_available, amp from torch.optim.optimizer import Optimizer from torch.utils.data import DataLoader, SubsetRandomSampler diff --git a/enchanter/tasks/regression.py b/enchanter/tasks/regression.py index 1ae4451..603b3b5 100644 --- a/enchanter/tasks/regression.py +++ b/enchanter/tasks/regression.py @@ -12,7 +12,7 @@ import numpy as np from sklearn.metrics import r2_score import torch -from torch.nn.modules import Module +from torch.nn import Module from torch.nn.modules.loss import _Loss from torch.optim.optimizer import Optimizer from torch.cuda.amp import GradScaler, autocast From 52b726337e9b531db040cd9344f7de9b3becfc99 Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 21:26:26 +0900 Subject: [PATCH 17/19] Remove CI for Windows Enchanter does not guarantee operation on Windows. --- .github/workflows/ci-pytest-win.yaml | 83 ---------------------------- 1 file changed, 83 deletions(-) delete mode 100644 .github/workflows/ci-pytest-win.yaml diff --git a/.github/workflows/ci-pytest-win.yaml b/.github/workflows/ci-pytest-win.yaml deleted file mode 100644 index d7ed9cd..0000000 --- a/.github/workflows/ci-pytest-win.yaml +++ /dev/null @@ -1,83 +0,0 @@ -name: CI Windows - -on: - push: - pull_request: - -jobs: - pytest: - - runs-on: windows-2019 - strategy: - matrix: - comet: [true, false] - python-version: [3.7, 3.8, 3.9] - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install Poetry - run: | - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python - - shell: bash - - - name: Add path for Poetry - run: echo "$HOME/.poetry/bin" >> $GITHUB_PATH - shell: bash - - - name: Install Dependencies - if: "matrix.comet == false" - run: | - echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U pip - poetry run pip install tensorflow tensorflow-datasets mxnet - poetry run pip install -U torch torchvision - poetry install --no-interaction - shell: bash - - - name: Install Dependencies with Comet.ml - if: "matrix.comet == true" - run: | - echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pip install -U pip - poetry run pip install tensorflow tensorflow-datasets mxnet - poetry run pip install -U torch torchvision - poetry install --no-interaction --extras comet - shell: bash - - - name: Lint with flake8 - run: | - echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - # Pythonの構文エラーもしくは未定義の名前があればビルドを停止 - poetry run flake8 enchanter/ --count --select=E9,F63,F7,F82,E203 --show-source --statistics - # exit-zeroはすべてのエラーを警告として扱う。 - poetry run flake8 enchanter/ --count --exit-zero --max-complexity=22 --max-line-length=120 --statistics - shell: bash - - - name: Check code style with Black - run : | - poetry run black --check --diff . - echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - shell: bash - - - name: Test with pytest - run: | - echo "$env:USERPROFILE\.poetry\bin" >> $GITHUB_PATH - poetry run pytest --durations=10 tests/ - shell: bash - - - name: Test when using Comet - if: "matrix.comet == true" - env: - COMET_API_KEY: ${{ secrets.COMET_API_KEY }} - run: | - poetry run pytest --durations=10 tests/tasks/classification_with_comet.py - poetry run pytest --durations=10 tests/tasks/regression_with_comet.py - poetry run pytest --durations=10 tests/utils/comet_support.py - shell: bash From a17149f8d7a9631842823a09286078411930f30f Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 23:06:38 +0900 Subject: [PATCH 18/19] v0.9.0a0 -> v0.9.0b0 --- enchanter/__init__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enchanter/__init__.py b/enchanter/__init__.py index d6d2ba2..076354a 100644 --- a/enchanter/__init__.py +++ b/enchanter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.9.0a0" +__version__ = "0.9.0b0" __author__ = "Hirotaka Kawashima" __author_email__ = "khirotaka@vivaldi.net" __license__ = "Apache-2.0" diff --git a/pyproject.toml b/pyproject.toml index 225fb72..d27c012 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "enchanter" -version = "0.9.0a0" +version = "0.9.0b0" description = "Enchanter is a library for machine learning tasks for comet.ml users." authors = ["Hirotaka Kawashima "] license = "Apache-2.0" From d0c980b8be3577fc8aeca8730600e31e1e5fd42e Mon Sep 17 00:00:00 2001 From: Hirotaka Kawashima Date: Fri, 18 Jun 2021 23:07:48 +0900 Subject: [PATCH 19/19] fix #190 --- enchanter/preprocessing/signal/functions.py | 1 + tests/preprocessing/signal/test_functions.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/enchanter/preprocessing/signal/functions.py b/enchanter/preprocessing/signal/functions.py index 64833a7..d014fbb 100644 --- a/enchanter/preprocessing/signal/functions.py +++ b/enchanter/preprocessing/signal/functions.py @@ -147,6 +147,7 @@ def adjust_sequences( ``fill=["ffill" or int or float]`` dtype: Specify the data type of NumPy. The data type of the output series is determined based on this value. + ``dtype`` must be a float. Examples: >>> import numpy as np diff --git a/tests/preprocessing/signal/test_functions.py b/tests/preprocessing/signal/test_functions.py index c406fc7..5ab6e41 100644 --- a/tests/preprocessing/signal/test_functions.py +++ b/tests/preprocessing/signal/test_functions.py @@ -63,8 +63,8 @@ def test_adjust_sequences_4(): np.random.randn(100, 5), ] - new = signal.adjust_sequences(x, dtype=np.int64) - assert new.dtype == np.int64 + new = signal.adjust_sequences(x, dtype=np.float32) + assert new.dtype == np.float32 def test_adjust_sequences_5():