Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/#186 #192

Merged
merged 28 commits into from
Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
30ee180
Update scikit-learn requirement from ^0.23 to >=0.23,<0.25
dependabot-preview[bot] Dec 22, 2020
9d311ec
Merge pull request #171 from khirotaka/dependabot/pip/scikit-learn-gt…
khirotaka Dec 23, 2020
1d300be
Update tslearn requirement from ^0.4.1 to ^0.5.0
dependabot-preview[bot] Jan 25, 2021
c76a7f8
Update mxnet requirement from 1.6.0 to 1.7.0.post2
dependabot-preview[bot] Feb 8, 2021
3dc264c
Merge pull request #174 from khirotaka/dependabot/pip/tslearn-tw-0.5.0
khirotaka Feb 20, 2021
f132575
Update mypy requirement from ^0.790 to ^0.812
dependabot-preview[bot] Feb 20, 2021
042eea0
Merge pull request #175 from khirotaka/dependabot/pip/mxnet-1.7.0.post2
khirotaka Feb 21, 2021
4d849b1
Merge pull request #176 from khirotaka/dependabot/pip/mypy-tw-0.812
khirotaka Feb 23, 2021
05c7259
Update black requirement from ^20.8b1 to ^21.4b1
dependabot-preview[bot] Apr 28, 2021
e42bb9d
Merge pull request #183 from khirotaka/dependabot/pip/black-tw-21.4b1
khirotaka Apr 28, 2021
8089e6a
Upgrade to GitHub-native Dependabot
dependabot-preview[bot] Apr 29, 2021
138c4ee
Merge pull request #184 from khirotaka/dependabot/add-v2-config-file
khirotaka Apr 30, 2021
03b0516
Update mypy requirement from ^0.812 to ^0.902
dependabot[bot] Jun 10, 2021
f88f8a0
Merge pull request #189 from khirotaka/dependabot/pip/mypy-tw-0.902
khirotaka Jun 11, 2021
83f148d
#167 Removed TensorFlow and MXNet from pyproject.toml
khirotaka Jun 18, 2021
3795739
create Dockerfile for Aarch64 platform
khirotaka Jun 18, 2021
56db0ca
add `--user`
khirotaka Jun 18, 2021
c3fd281
add `mxnet`
khirotaka Jun 18, 2021
d38b62b
`from torch.tensor` -> `from torch`
khirotaka Jun 18, 2021
b13cf20
remove `--user`
khirotaka Jun 18, 2021
e44adc3
typo mxnet
khirotaka Jun 18, 2021
81744dd
remove `--user` from option workflow
khirotaka Jun 18, 2021
a8d933d
`from torch.tensor` -> `from torch`
khirotaka Jun 18, 2021
52b7263
Remove CI for Windows
khirotaka Jun 18, 2021
a17149f
v0.9.0a0 -> v0.9.0b0
khirotaka Jun 18, 2021
d0c980b
fix #190
khirotaka Jun 18, 2021
607eff3
Merge pull request #191 from khirotaka/hotfix/#190
khirotaka Jun 18, 2021
8d6ec5b
Merge branch 'master' into feature/#186
khirotaka Jun 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 2 additions & 0 deletions .github/workflows/ci-pytest-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ 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
if: "matrix.comet == true"
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 --extras comet

- name: Lint with flake8
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-pytest-mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ 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
if: "matrix.comet == true"
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 --extras comet

- name: Lint with flake8
Expand Down
81 changes: 0 additions & 81 deletions .github/workflows/ci-pytest-win.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions docker/Aarch64.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion enchanter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.9.0a0"
__version__ = "0.9.0b0"
__author__ = "Hirotaka Kawashima"
__author_email__ = "khirotaka@vivaldi.net"
__license__ = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion enchanter/addons/layers/dense_interpolation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion enchanter/addons/layers/mlp.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion enchanter/addons/layers/se_layer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from torch.tensor import Tensor
from torch import Tensor
from torch import nn


Expand Down
2 changes: 1 addition & 1 deletion enchanter/engine/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions enchanter/preprocessing/signal/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion enchanter/tasks/regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <khirotaka@vivaldi.net>"]
license = "Apache-2.0"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/preprocessing/signal/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down