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

Adapted use of mx module. Applied isort. #878

Merged
merged 3 commits into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/gluonts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@

from pkgutil import extend_path

from pkg_resources import get_distribution, DistributionNotFound
from pkg_resources import DistributionNotFound, get_distribution

from gluonts.mx.prelude import *

__path__ = extend_path(__path__, __name__) # type: ignore

try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
__version__ = "0.0.0-unknown"


from gluonts.mx.prelude import *
3 changes: 2 additions & 1 deletion src/gluonts/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
import sys
import warnings

import gluonts.mx.block

warnings.warn(
"gluonts.block is deprecated. Use gluonts.mx.block instead.",
DeprecationWarning,
stacklevel=2,
)

import gluonts.mx.block

sys.modules["gluonts.block"] = gluonts.mx.block

Expand Down
2 changes: 1 addition & 1 deletion src/gluonts/core/serde.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from functools import singledispatch
from pathlib import PurePath
from pydoc import locate
from typing import cast, Any, NamedTuple, Optional
from typing import Any, NamedTuple, Optional, cast

# Third-party imports
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion src/gluonts/dataset/artificial/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# Relative imports
from ._base import (
ArtificialDataset,
ConstantDataset,
ComplexSeasonalTimeSeries,
ConstantDataset,
RecipeDataset,
constant_dataset,
default_synthetic,
Expand Down
2 changes: 1 addition & 1 deletion src/gluonts/dataset/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from functools import lru_cache
from pathlib import Path
from typing import (
cast,
Any,
Callable,
Dict,
Expand All @@ -27,6 +26,7 @@
NamedTuple,
Optional,
Union,
cast,
)

# Third-party imports
Expand Down
3 changes: 2 additions & 1 deletion src/gluonts/dataset/jsonl.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
from pathlib import Path
from typing import NamedTuple

import numpy as np

# Third-party imports
import ujson as json
import numpy as np

# First-party imports
from gluonts.core.exception import GluonTSDataError
Expand Down
4 changes: 2 additions & 2 deletions src/gluonts/dataset/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
# Standard library imports
import itertools
import logging
from typing import Any, Dict, Iterable, Iterator, Optional
import multiprocessing as mp
from typing import Any, Dict, Iterable, Iterator, Optional

# Third-party imports
import mxnet as mx
import numpy as np

# First-party imports
from gluonts.core.component import DType
from gluonts.dataset.common import DataEntry, Dataset, DataBatch
from gluonts.dataset.common import DataBatch, DataEntry, Dataset
from gluonts.dataset.parallelized_loader import ParallelDataLoader
from gluonts.transform import Transformation

Expand Down
9 changes: 5 additions & 4 deletions src/gluonts/dataset/multivariate_grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@

# Standard library imports
import logging
from typing import Callable, Optional

import numpy as np
import pandas as pd
from typing import Callable, Optional

# First-party imports
from gluonts.dataset.common import ListDataset, DataEntry, Dataset
from gluonts.core.component import validated
from gluonts.dataset.field_names import FieldName

# First-party imports
from gluonts.dataset.common import DataEntry, Dataset, ListDataset
from gluonts.dataset.field_names import FieldName

OLDEST_SUPPORTED_TIMESTAMP = pd.Timestamp(1800, 1, 1, 12)
LATEST_SUPPORTED_TIMESTAMP = pd.Timestamp(2200, 1, 1, 12)
Expand Down
30 changes: 15 additions & 15 deletions src/gluonts/dataset/parallelized_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@
# Standard library imports
import collections
import functools
import io
import itertools
import logging
import multiprocessing
import multiprocessing.queues
import pathlib
import pickle
import io
import random
import sys
import time

from collections.abc import Sized
from multiprocessing.managers import SyncManager
from typing import Callable, Iterable, Optional, List, Iterator, Union, Any

import multiprocessing
import multiprocessing.queues
from multiprocessing.reduction import ForkingPickler
from multiprocessing.pool import Pool
from multiprocessing.reduction import ForkingPickler
from queue import Queue
from typing import Any, Callable, Iterable, Iterator, List, Optional, Union

try:
import multiprocessing.resource_sharer
except ImportError:
pass
import mxnet as mx

# Third-party imports
import numpy as np
from mxnet import nd, context
import mxnet as mx
from mxnet import context, nd

# First-party imports
from gluonts.core.component import DType
from gluonts.dataset.common import Dataset, DataEntry, DataBatch, FileDataset
from gluonts.transform import Transformation
from gluonts.dataset.common import DataBatch, DataEntry, Dataset, FileDataset
from gluonts.dataset.util import MPWorkerInfo
from gluonts.transform import Transformation

try:
import multiprocessing.resource_sharer
except ImportError:
pass


# ForkingPickler related functions:
if sys.platform == "darwin" or sys.platform == "win32":
Expand Down
4 changes: 2 additions & 2 deletions src/gluonts/dataset/repository/_gp_copula_2019.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"""
import json
import os
import tarfile
import shutil
import tarfile
from pathlib import Path
from typing import NamedTuple, Optional
from urllib import request

from gluonts.dataset.repository._util import metadata, save_to_file, to_dict
from gluonts.dataset.common import FileDataset
from gluonts.dataset.field_names import FieldName
from gluonts.dataset.repository._util import metadata, save_to_file, to_dict


class GPCopulaDataset(NamedTuple):
Expand Down
6 changes: 3 additions & 3 deletions src/gluonts/dataset/repository/_m4.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

from pathlib import Path
import os
import json
import os
from pathlib import Path

import pandas as pd
import numpy as np
import pandas as pd

from gluonts.dataset.repository._util import metadata, save_to_file, to_dict

Expand Down
8 changes: 4 additions & 4 deletions src/gluonts/dataset/repository/_m5.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

from pathlib import Path
import os
import json
import os
from pathlib import Path

import pandas as pd
import numpy as np
import pandas as pd

from gluonts.dataset.repository._util import metadata, save_to_file
from gluonts.dataset.field_names import FieldName
from gluonts.dataset.repository._util import metadata, save_to_file


def generate_m5_dataset(
Expand Down
2 changes: 1 addition & 1 deletion src/gluonts/dataset/repository/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import json
import os
from pathlib import Path
from typing import Dict, List, Optional, Any, Union
from typing import Any, Dict, List, Optional, Union

import numpy as np

Expand Down
4 changes: 2 additions & 2 deletions src/gluonts/dataset/repository/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
from gluonts.dataset.artificial import ConstantDataset
from gluonts.dataset.common import TrainDatasets, load_datasets
from gluonts.dataset.repository._artificial import generate_artificial_dataset
from gluonts.dataset.repository._lstnet import generate_lstnet_dataset
from gluonts.dataset.repository._m4 import generate_m4_dataset
from gluonts.dataset.repository._gp_copula_2019 import (
generate_gp_copula_dataset,
)
from gluonts.dataset.repository._lstnet import generate_lstnet_dataset
from gluonts.dataset.repository._m4 import generate_m4_dataset
from gluonts.dataset.repository._m5 import generate_m5_dataset
from gluonts.support.util import get_download_path

Expand Down
2 changes: 1 addition & 1 deletion src/gluonts/dataset/stat.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# First-party imports
from gluonts.core.component import validated
from gluonts.core.exception import assert_data_error
from gluonts.gluonts_tqdm import tqdm
from gluonts.dataset.field_names import FieldName
from gluonts.gluonts_tqdm import tqdm


class ScaleHistogram:
Expand Down
5 changes: 2 additions & 3 deletions src/gluonts/dataset/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,22 @@
# Standard library imports
import itertools
import logging
import random
import os
import random
from pathlib import Path
from typing import (
Callable,
Iterable,
Iterator,
List,
NamedTuple,
Tuple,
TypeVar,
NamedTuple,
)

# Third-party imports
import pandas as pd


T = TypeVar("T")


Expand Down
3 changes: 2 additions & 1 deletion src/gluonts/distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
import sys
import warnings

import gluonts.mx.distribution

warnings.warn(
"gluonts.distribution is deprecated. Use gluonts.mx.distribution instead.",
DeprecationWarning,
stacklevel=2,
)

import gluonts.mx.distribution

sys.modules["gluonts.distribution"] = gluonts.mx.distribution

Expand Down
6 changes: 3 additions & 3 deletions src/gluonts/evaluation/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@
import multiprocessing
import re
import sys

from collections import Sized
from functools import lru_cache
from itertools import chain, tee
from typing import (
Any,
Callable,
Dict,
Iterable,
Iterator,
List,
Optional,
Tuple,
Union,
Callable,
)

# Third-party imports
import numpy as np
import pandas as pd

from gluonts.gluonts_tqdm import tqdm

# First-party imports
from gluonts.model.forecast import Forecast, Quantile
from gluonts.gluonts_tqdm import tqdm


@lru_cache()
Expand Down
3 changes: 2 additions & 1 deletion src/gluonts/kernels.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
import sys
import warnings

import gluonts.mx.kernels

warnings.warn(
"gluonts.kernels is deprecated. Use gluonts.mx.kernels instead.",
DeprecationWarning,
stacklevel=2,
)

import gluonts.mx.kernels

sys.modules["gluonts.kernels"] = gluonts.mx.kernels

Expand Down
9 changes: 4 additions & 5 deletions src/gluonts/model/canonical/_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@
# Third-party imports
from mxnet.gluon import HybridBlock, nn

# First-party imports
from gluonts.block.feature import FeatureEmbedder
from gluonts.block.rnn import RNN
from gluonts.core.component import validated
from gluonts.dataset.field_names import FieldName
from gluonts.distribution import DistributionOutput, StudentTOutput
from gluonts.model.estimator import GluonEstimator
from gluonts.model.predictor import Predictor, RepresentableBlockPredictor
from gluonts.mx.block.feature import FeatureEmbedder
from gluonts.mx.block.rnn import RNN
from gluonts.mx.distribution import DistributionOutput, StudentTOutput
from gluonts.mx.trainer import Trainer
from gluonts.time_feature import time_features_from_frequency_str
from gluonts.trainer import Trainer
from gluonts.transform import (
AddTimeFeatures,
AsNumpyArray,
Expand Down
9 changes: 5 additions & 4 deletions src/gluonts/model/canonical/_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
# Third-party imports
from mxnet.gluon import HybridBlock

# First-party imports
from gluonts.block.feature import FeatureEmbedder
from gluonts.block.scaler import MeanScaler
from gluonts.core.component import validated
from gluonts.distribution import DistributionOutput
from gluonts.model.common import Tensor

# First-party imports
from gluonts.mx.block.feature import FeatureEmbedder
from gluonts.mx.block.scaler import MeanScaler
from gluonts.mx.distribution import DistributionOutput


class CanonicalNetworkBase(HybridBlock):
@validated()
Expand Down
Loading