Skip to content

Commit db55074

Browse files
committed
added Pytorch 2.0 compatibility
1 parent 8add057 commit db55074

10 files changed

+1010
-1071
lines changed

nbs/006_data.core.ipynb

Lines changed: 90 additions & 138 deletions
Large diffs are not rendered by default.

nbs/009_data.preprocessing.ipynb

Lines changed: 896 additions & 905 deletions
Large diffs are not rendered by default.

nbs/012_data.image.ipynb

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

nbs/data/TSCategoricalEncoder.joblib

-96 Bytes
Binary file not shown.

nbs/data/TSDateTimeEncoder.joblib

-60 Bytes
Binary file not shown.

nbs/data/TSMissingnessEncoder.joblib

-77 Bytes
Binary file not shown.

nbs/models/test.pth

1.19 KB
Binary file not shown.

settings.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ status = 4
1515
min_python = 3.7
1616
audience = Developers
1717
language = English
18-
requirements = fastai>=2.7.9 pyts>=0.12.0 imbalanced-learn>=0.8.0 psutil>=5.4.8
19-
pip_requirements = torch>=1.7,<1.14
18+
requirements = fastai>=2.7.12 pyts>=0.12.0 imbalanced-learn>=0.8.0 psutil>=5.4.8
19+
pip_requirements = torch>=1.7,<2.1
2020
conda_user = timeseriesAI
21-
conda_requirements = pytorch>=1.7,<1.14
21+
conda_requirements = pytorch>=1.7,<2.1
2222
extra_requirements = sktime>=0.10.1 tsfresh>=0.18.0 PyWavelets>=1.1.1 nbformat>=5.1.3
2323
dev_requirements = nbdev>2 ipykernel>6
2424
console_scripts = nb2py=tsai.export:nb2py

tsai/data/core.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ def data(self): return cast(self, Tensor)
4444

4545
def __repr__(self):
4646
if self.ndim > 0: return f'NumpyTensor(shape:{tuple(self.shape)}, device={self.device}, dtype={self.dtype})'
47-
else: return f'NumpyTensor([{self}], device={self.device}, dtype={self.dtype})'
47+
else: return f'NumpyTensor([{self.data}], device={self.device}, dtype={self.dtype})'
4848

4949

5050
def show(self, ax=None, ctx=None, title=None, **kwargs):
51-
if self.ndim == 0: return str(self)
51+
if self.ndim == 0: return str(self.data)
5252
elif self.ndim != 2: self = type(self)(to2d(self))
5353
if not isinstance(self,np.ndarray): self = self.detach().cpu().numpy()
5454
ax = ifnone(ax, ctx)
@@ -79,13 +79,9 @@ def __new__(cls, o, dtype=None, device=None, copy=None, requires_grad=False, **k
7979

8080
@property
8181
def data(self): return cast(self, Tensor)
82-
83-
def __repr__(self):
84-
if self.ndim > 0: return f'NumpyTensor(shape:{tuple(self.shape)}, device={self.device}, dtype={self.dtype})'
85-
else: return f'NumpyTensor([{self}], device={self.device}, dtype={self.dtype})'
8682

8783
def show(self, ax=None, ctx=None, title=None, **kwargs):
88-
if self.ndim == 0: return str(self)
84+
if self.ndim == 0: return str(self.data)
8985
elif self.ndim != 2: self = type(self)(to2d(self))
9086
if not isinstance(self,np.ndarray): self = self.detach().cpu().numpy()
9187
ax = ifnone(ax, ctx)
@@ -115,7 +111,7 @@ def __repr__(self):
115111
return f'TSTensor(vars:{self.shape[-2]}, len:{self.shape[-1]}, device={self.device}, dtype={self.dtype})'
116112
elif self.ndim == 1:
117113
return f'TSTensor(len:{self.shape[-1]}, device={self.device}, dtype={self.dtype})'
118-
else: return f'TSTensor([{self}], device={self.device}, dtype={self.dtype})'
114+
else: return f'TSTensor([{self.data}], device={self.device}, dtype={self.dtype})'
119115

120116
# %% ../../nbs/006_data.core.ipynb 8
121117
class ToTSTensor(Transform):
@@ -134,12 +130,12 @@ def show_tuple(tup, **kwargs):
134130
# %% ../../nbs/006_data.core.ipynb 27
135131
class TSLabelTensor(NumpyTensor):
136132
def __repr__(self):
137-
if self.ndim == 0: return f'{self}'
133+
if self.ndim == 0: return f'{self.data}'
138134
else: return f'TSLabelTensor(shape:{tuple(self.shape)}, device={self.device}, dtype={self.dtype})'
139135

140136
class TSMaskTensor(NumpyTensor):
141137
def __repr__(self):
142-
if self.ndim == 0: return f'{self}'
138+
if self.ndim == 0: return f'{self.data}'
143139
else: return f'TSMaskTensor(shape:{tuple(self.shape)}, device={self.device}, dtype={self.dtype})'
144140

145141
# %% ../../nbs/006_data.core.ipynb 30

tsai/data/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def vars(self):
3131
def len(self): return self.shape[-2:]
3232

3333
def __repr__(self):
34-
if self.ndim == 0: return f'{self}'
34+
if self.ndim == 0: return f'{self.data}'
3535
else: return f'TSImage(shape:{self.shape})'
3636

3737
def show(self, **kwargs):

0 commit comments

Comments
 (0)