From 17ee56ec737499aab0d2c5241bcc90ed214a0c48 Mon Sep 17 00:00:00 2001 From: Tri Dao Date: Tue, 5 Jan 2021 21:05:05 -0800 Subject: [PATCH] Update sktime to 0.5.1, change sktime.utils.load_data to data_io --- datasets/uea.py | 6 +++--- requirements.txt | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/datasets/uea.py b/datasets/uea.py index c93fd7a..8f2d932 100644 --- a/datasets/uea.py +++ b/datasets/uea.py @@ -7,7 +7,7 @@ import urllib.request import zipfile import sklearn.model_selection -import sktime.utils.load_data +import sktime.utils.data_io import numpy as np import torch import collections as co @@ -69,8 +69,8 @@ def load_data(dataset_name): assert dataset_name in valid_dataset_names, "Must specify a valid dataset name." base_filename = here / 'data' / 'UEA' / 'Multivariate_ts' / dataset_name / dataset_name - train_X, train_y = sktime.utils.load_data.load_from_tsfile_to_dataframe(str(base_filename) + '_TRAIN.ts') - test_X, test_y = sktime.utils.load_data.load_from_tsfile_to_dataframe(str(base_filename) + '_TEST.ts') + train_X, train_y = sktime.utils.data_io.load_from_tsfile_to_dataframe(str(base_filename) + '_TRAIN.ts') + test_X, test_y = sktime.utils.data_io.load_from_tsfile_to_dataframe(str(base_filename) + '_TEST.ts') train_X = train_X.to_numpy() test_X = test_X.to_numpy() X = np.concatenate((train_X, test_X), axis=0) diff --git a/requirements.txt b/requirements.txt index 3c02033..f06f0ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,10 @@ -pytorch-lightning>=0.7.6 +pytorch-lightning>=1.1.0 torchtext numpy scipy sklearn -sktime +sktime>=0.5.1 matplotlib tqdm -hydra-core==1.0.0rc4 -omegaconf +hydra-core>=1.0.4 munch