fix use_cuda

marvinzh · Jun 20, 2019 · 505e728 · 505e728
1 parent 11146f7
commit 505e728
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/convlab/modules/nlg/multiwoz/sc_lstm/loader/dataset_woz.py b/convlab/modules/nlg/multiwoz/sc_lstm/loader/dataset_woz.py
@@ -7,7 +7,7 @@
 
 import torch
 from torch.autograd import Variable
-from convlab.modules.nlg.multiwoz.sc_lstm.nlg_sc_lstm import USE_CUDA
+from convlab.modules.nlg.multiwoz.utils import USE_CUDA
 
 
 class DatasetWoz(object):

diff --git a/convlab/modules/nlg/multiwoz/sc_lstm/model/layers/decoder_deep.py b/convlab/modules/nlg/multiwoz/sc_lstm/model/layers/decoder_deep.py
@@ -6,7 +6,7 @@
 import torch.nn as nn
 import torch.nn.functional as F
 from torch.autograd import Variable
-from convlab.modules.nlg.multiwoz.sc_lstm.nlg_sc_lstm import USE_CUDA
+from convlab.modules.nlg.multiwoz.utils import USE_CUDA
 
 
 class DecoderDeep(nn.Module):

diff --git a/convlab/modules/nlg/multiwoz/sc_lstm/model/lm_deep.py b/convlab/modules/nlg/multiwoz/sc_lstm/model/lm_deep.py
@@ -9,7 +9,7 @@
 
 from convlab.modules.nlg.multiwoz.sc_lstm.model.layers.decoder_deep import DecoderDeep
 from convlab.modules.nlg.multiwoz.sc_lstm.model.masked_cross_entropy import masked_cross_entropy
-from convlab.modules.nlg.multiwoz.sc_lstm.nlg_sc_lstm import USE_CUDA
+from convlab.modules.nlg.multiwoz.utils import USE_CUDA
 
 
 class LMDeep(nn.Module):

diff --git a/convlab/modules/nlg/multiwoz/sc_lstm/nlg_sc_lstm.py b/convlab/modules/nlg/multiwoz/sc_lstm/nlg_sc_lstm.py
@@ -16,10 +16,10 @@
 from convlab.modules.nlg.multiwoz.sc_lstm.loader.dataset_woz import SimpleDatasetWoz
 from convlab.modules.nlg.multiwoz.sc_lstm.model.lm_deep import LMDeep
 from convlab.modules.nlg.nlg import NLG
+from convlab.modules.nlg.multiwoz.utils import USE_CUDA
 
 DEFAULT_DIRECTORY = "models"
 DEFAULT_ARCHIVE_FILE = os.path.join(DEFAULT_DIRECTORY, "nlg-sclstm-multiwoz.zip")
-USE_CUDA = -1
 
 def parse(is_user):
  if is_user:
@@ -63,6 +63,7 @@ def __init__(self,
 
  self.args, self.config = parse(is_user)
  self.dataset = SimpleDatasetWoz(self.config)
+ global USE_CUDA
  USE_CUDA = use_cuda
 
  # get model hyper-parameters

diff --git a/convlab/modules/nlg/multiwoz/utils.py b/convlab/modules/nlg/multiwoz/utils.py
@@ -8,6 +8,7 @@
 
 import numpy as np
 
+USE_CUDA = -1
 
 def initWeights(n,d):
  """ Initialization Strategy """