Skip to content

Commit

Permalink
clean imports
Browse files Browse the repository at this point in the history
  • Loading branch information
jincli committed Jun 13, 2019
1 parent 6a32a1c commit 7fdc623
Show file tree
Hide file tree
Showing 158 changed files with 616 additions and 650 deletions.
12 changes: 6 additions & 6 deletions convlab/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.

from convlab.modules.usr import UserSimulator
from convlab.modules.nlu.multiwoz import ErrorNLU, OneNetLU, MILU, SVMNLU
import os

from convlab.modules.dst.multiwoz import RuleDST
from convlab.modules.word_dst.multiwoz import MDBTTracker
from convlab.modules.nlg.multiwoz import TemplateNLG, MultiwozTemplateNLG, SCLSTM
from convlab.modules.nlu.multiwoz import ErrorNLU, OneNetLU, MILU, SVMNLU
from convlab.modules.policy.system.multiwoz import RuleBasedMultiwozBot, RuleInformBot, VanillaMLEPolicy
from convlab.modules.policy.user.multiwoz import UserPolicyAgendaMultiWoz
from convlab.modules.nlg.multiwoz import TemplateNLG, MultiwozTemplateNLG, SCLSTM
from convlab.modules.usr import UserSimulator
from convlab.modules.word_dst.multiwoz import MDBTTracker
from convlab.modules.word_policy.multiwoz import MDRGWordPolicy

import os

os.environ['PY_ENV'] = os.environ.get('PY_ENV') or 'development'
ROOT_DIR = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))

Expand Down
6 changes: 3 additions & 3 deletions convlab/agent/__init__.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from copy import deepcopy

# The agent module
import numpy as np
import pandas as pd
import pydash as ps
import torch
from copy import deepcopy

from convlab import evaluator
from convlab.agent import algorithm, memory
from convlab.agent.algorithm import policy_util
from convlab.agent.net import net_util
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
from convlab.modules import nlu, dst, word_dst, nlg, state_encoder, action_decoder
from convlab import evaluator


logger = logger.get_logger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion convlab/agent/algorithm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# expose all the classes
from .actor_critic import *
from .dqn import *
from .external import *
from .ppo import *
from .random import *
from .reinforce import *
from .sarsa import *
from .sil import *
from .external import *
7 changes: 4 additions & 3 deletions convlab/agent/algorithm/actor_critic.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np
import pydash as ps
import torch

from convlab.agent import net
from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.reinforce import Reinforce
from convlab.agent.net import net_util
from convlab.lib import logger, math_util, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps
import torch

logger = logger.get_logger(__name__)

Expand Down
6 changes: 4 additions & 2 deletions convlab/agent/algorithm/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
# Licensed under the MIT license.

from abc import ABC, abstractmethod

import numpy as np
import pydash as ps

from convlab.agent.net import net_util
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps

logger = logger.get_logger(__name__)

Expand Down
11 changes: 5 additions & 6 deletions convlab/agent/algorithm/dqn.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np
import torch

from convlab.agent import memory
from convlab.agent import net
from convlab.agent import memory
from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.sarsa import SARSA
from convlab.agent.net import net_util
from convlab.lib import logger, math_util, util
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps
import torch

logger = logger.get_logger(__name__)

Expand Down
10 changes: 5 additions & 5 deletions convlab/agent/algorithm/external.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
The random agent algorithm
For basic dev purpose.
'''
from convlab.agent.algorithm.base import Algorithm
from copy import deepcopy

import pydash as ps

from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.base import Algorithm
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
from convlab.modules import policy, word_policy, e2e

import numpy as np
from copy import deepcopy
import pydash as ps

logger = logger.get_logger(__name__)


Expand Down
10 changes: 5 additions & 5 deletions convlab/agent/algorithm/policy_util.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np
import torch
import torch.nn.functional as F
# Action policy module
# Constructs action probability distribution used by agent to sample action and calculate log_prob, entropy, etc.
from gym import spaces
from torch import distributions

# from convlab.env.wrapper import LazyFrames
from convlab.lib import distribution, logger, math_util, util
from torch import distributions
import numpy as np
import pydash as ps
import torch
import torch.nn.functional as F

logger = logger.get_logger(__name__)

Expand Down
8 changes: 4 additions & 4 deletions convlab/agent/algorithm/ppo.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Licensed under the MIT license.

from copy import deepcopy
from convlab.agent import net

import numpy as np
import torch

from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.actor_critic import ActorCritic
from convlab.agent.net import net_util
from convlab.lib import logger, math_util, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps
import torch

logger = logger.get_logger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion convlab/agent/algorithm/random.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np

# The random agent algorithm
# For basic dev purpose
from convlab.agent.algorithm.base import Algorithm
from convlab.lib import logger
from convlab.lib.decorator import lab_api
import numpy as np

logger = logger.get_logger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion convlab/agent/algorithm/reinforce.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np

from convlab.agent import net
from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.base import Algorithm
from convlab.agent.net import net_util
from convlab.lib import logger, math_util, util
from convlab.lib.decorator import lab_api
import numpy as np

logger = logger.get_logger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions convlab/agent/algorithm/sarsa.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import numpy as np
import torch

from convlab.agent import net
from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.base import Algorithm
from convlab.agent.net import net_util
from convlab.lib import logger, math_util, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps
import torch

logger = logger.get_logger(__name__)

Expand Down
8 changes: 4 additions & 4 deletions convlab/agent/algorithm/sil.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from convlab.agent import net, memory
import numpy as np
import torch

from convlab.agent import memory
from convlab.agent.algorithm import policy_util
from convlab.agent.algorithm.actor_critic import ActorCritic
from convlab.agent.algorithm.ppo import PPO
from convlab.lib import logger, math_util, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps
import torch

logger = logger.get_logger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions convlab/agent/memory/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Contains different ways of storing an agents experiences and sampling from them
'''

# expose all the classes
from .replay import *
from .onpolicy import *
from .prioritized import *
# expose all the classes
from .replay import *
6 changes: 2 additions & 4 deletions convlab/agent/memory/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
# Licensed under the MIT license.

from abc import ABC, abstractmethod
from collections import deque
from convlab.lib import logger, util
import numpy as np
import pydash as ps

from convlab.lib import logger

logger = logger.get_logger(__name__)

Expand Down
4 changes: 0 additions & 4 deletions convlab/agent/memory/onpolicy.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from collections import deque
from copy import deepcopy
from convlab.agent.memory.base import Memory
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps

logger = logger.get_logger(__name__)

Expand Down
7 changes: 4 additions & 3 deletions convlab/agent/memory/prioritized.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

import random

import numpy as np

from convlab.agent.memory.replay import Replay
from convlab.lib import util
from convlab.lib.decorator import lab_api
import numpy as np
import random


class SumTree:
Expand Down
8 changes: 3 additions & 5 deletions convlab/agent/memory/replay.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from collections import deque
from copy import deepcopy
import numpy as np

from convlab.agent.memory.base import Memory
from convlab.lib import logger, math_util, util
from convlab.lib import logger, util
from convlab.lib.decorator import lab_api
import numpy as np
import pydash as ps

logger = logger.get_logger(__name__)

Expand Down
6 changes: 4 additions & 2 deletions convlab/agent/net/base.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from abc import ABC, abstractmethod
from convlab.agent.net import net_util
from abc import ABC

import pydash as ps
import torch
import torch.nn as nn

from convlab.agent.net import net_util


class Net(ABC):
'''Abstract Net class to define the API methods'''
Expand Down
7 changes: 4 additions & 3 deletions convlab/agent/net/conv.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from convlab.agent.net import net_util
from convlab.agent.net.base import Net
from convlab.lib import math_util, util
import pydash as ps
import torch
import torch.nn as nn

from convlab.agent.net import net_util
from convlab.agent.net.base import Net
from convlab.lib import math_util, util


class ConvNet(Net, nn.Module):
'''
Expand Down
7 changes: 4 additions & 3 deletions convlab/agent/net/mlp.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from convlab.agent.net import net_util
from convlab.agent.net.base import Net
from convlab.lib import math_util, util
import numpy as np
import pydash as ps
import torch
import torch.nn as nn

from convlab.agent.net import net_util
from convlab.agent.net.base import Net
from convlab.lib import math_util, util


class MLPNet(Net, nn.Module):
'''
Expand Down
6 changes: 4 additions & 2 deletions convlab/agent/net/net_util.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Modified by Microsoft Corporation.
# Licensed under the MIT license.

from functools import partial, wraps
from convlab.lib import logger, optimizer, util
import os
from functools import partial, wraps

import pydash as ps
import torch
import torch.nn as nn

from convlab.lib import logger, optimizer, util

logger = logger.get_logger(__name__)

# register custom torch.optim
Expand Down
Loading

0 comments on commit 7fdc623

Please sign in to comment.