Skip to content

Commit

Permalink
Py3 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@matsuyamax
matsuyamax committed Oct 6, 2015
1 parent cfd2763 commit e839a4b
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 38 deletions.
10 changes: 5 additions & 5 deletions keras/layers/advanced_activations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"alpha": self.alpha}
base_config = super(LeakyReLU, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class PReLU(MaskedLayer):
Expand Down Expand Up @@ -51,7 +51,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"init": self.init.__name__}
base_config = super(PReLU, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ParametricSoftplus(MaskedLayer):
Expand Down Expand Up @@ -89,7 +89,7 @@ def get_config(self):
"alpha_init": self.alpha_init,
"beta_init": self.beta_init}
base_config = super(ParametricSoftplus, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ThresholdedLinear(MaskedLayer):
Expand All @@ -112,7 +112,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"theta": self.theta}
base_config = super(ThresholdedLinear, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ThresholdedReLU(MaskedLayer):
Expand All @@ -135,4 +135,4 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"theta": self.theta}
base_config = super(ThresholdedReLU, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
16 changes: 8 additions & 8 deletions keras/layers/convolutional.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(Convolution1D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Convolution2D(Layer):
Expand Down Expand Up @@ -282,7 +282,7 @@ def get_config(self):
"W_constraint": self.W_constraint.get_config() if self.W_constraint else None,
"b_constraint": self.b_constraint.get_config() if self.b_constraint else None}
base_config = super(Convolution2D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class MaxPooling1D(Layer):
Expand Down Expand Up @@ -319,7 +319,7 @@ def get_config(self):
"pool_length": self.pool_length,
"ignore_border": self.ignore_border}
base_config = super(MaxPooling1D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class MaxPooling2D(Layer):
Expand Down Expand Up @@ -352,7 +352,7 @@ def get_config(self):
"ignore_border": self.ignore_border,
"stride": self.stride}
base_config = super(MaxPooling2D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class UpSample1D(Layer):
Expand All @@ -377,7 +377,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"length": self.length}
base_config = super(UpSample1D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class UpSample2D(Layer):
Expand All @@ -403,7 +403,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"size": self.size}
base_config = super(UpSample2D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ZeroPadding1D(Layer):
Expand Down Expand Up @@ -448,7 +448,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"padding": self.padding}
base_config = super(ZeroPadding1D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ZeroPadding2D(Layer):
Expand Down Expand Up @@ -501,4 +501,4 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"padding": self.padding}
base_config = super(ZeroPadding2D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
24 changes: 12 additions & 12 deletions keras/layers/core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"mask_value": self.mask_value}
base_config = super(Masking, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class TimeDistributedMerge(Layer):
Expand Down Expand Up @@ -257,7 +257,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"mode": self.mode}
base_config = super(TimeDistributedMerge, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Merge(Layer):
Expand Down Expand Up @@ -367,7 +367,7 @@ def get_config(self):
"mode": self.mode,
"concat_axis": self.concat_axis}
base_config = super(Merge, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Dropout(MaskedLayer):
Expand All @@ -393,7 +393,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"p": self.p}
base_config = super(Dropout, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Activation(MaskedLayer):
Expand All @@ -416,7 +416,7 @@ def get_config(self):
"target": self.target,
"beta": self.beta}
base_config = super(Activation, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Reshape(Layer):
Expand All @@ -442,7 +442,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"dims": self.dims}
base_config = super(Reshape, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Permute(Layer):
Expand Down Expand Up @@ -470,7 +470,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"dims": self.dims}
base_config = super(Permute, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Flatten(Layer):
Expand Down Expand Up @@ -519,7 +519,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"n": self.n}
base_config = super(RepeatVector, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class Dense(Layer):
Expand Down Expand Up @@ -597,7 +597,7 @@ def get_config(self):
"b_constraint": self.b_constraint.get_config() if self.b_constraint else None,
"input_dim": self.input_dim}
base_config = super(Dense, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class ActivityRegularization(Layer):
Expand All @@ -622,7 +622,7 @@ def get_config(self):
"l1": self.l1,
"l2": self.l2}
base_config = super(ActivityRegularization, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class TimeDistributedDense(MaskedLayer):
Expand Down Expand Up @@ -707,7 +707,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(TimeDistributedDense, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class AutoEncoder(Layer):
Expand Down Expand Up @@ -869,4 +869,4 @@ def get_config(self):
"b_constraint": self.b_constraint.get_config() if self.b_constraint else None,
"input_dim": self.input_dim}
base_config = super(MaxoutDense, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
4 changes: 2 additions & 2 deletions keras/layers/embeddings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def get_config(self):
"W_regularizer": self.W_regularizer.get_config() if self.W_regularizer else None,
"W_constraint": self.W_constraint.get_config() if self.W_constraint else None}
base_config = super(Embedding, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class WordContextProduct(Layer):
Expand Down Expand Up @@ -150,4 +150,4 @@ def get_config(self):
"init": self.init.__name__,
"activation": self.activation.__name__}
base_config = super(WordContextProduct, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
4 changes: 2 additions & 2 deletions keras/layers/noise.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"sigma": self.sigma}
base_config = super(GaussianNoise, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class GaussianDropout(MaskedLayer):
Expand All @@ -54,4 +54,4 @@ def get_config(self):
config = {"name": self.__class__.__name__,
"p": self.p}
base_config = super(GaussianDropout, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
4 changes: 2 additions & 2 deletions keras/layers/normalization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def get_config(self):
"mode": self.mode,
"momentum": self.momentum}
base_config = super(BatchNormalization, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class LRN2D(Layer):
Expand Down Expand Up @@ -114,4 +114,4 @@ def get_config(self):
"beta": self.beta,
"n": self.n}
base_config = super(LRN2D, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))
14 changes: 7 additions & 7 deletions keras/layers/recurrent.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(SimpleRNN, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class SimpleDeepRNN(Recurrent):
Expand Down Expand Up @@ -222,7 +222,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(SimpleDeepRNN, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class GRU(Recurrent):
Expand Down Expand Up @@ -335,7 +335,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(GRU, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class LSTM(Recurrent):
Expand Down Expand Up @@ -466,7 +466,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(LSTM, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class JZS1(Recurrent):
Expand Down Expand Up @@ -583,7 +583,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(JZS1, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class JZS2(Recurrent):
Expand Down Expand Up @@ -701,7 +701,7 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(JZS2, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))


class JZS3(Recurrent):
Expand Down Expand Up @@ -812,4 +812,4 @@ def get_config(self):
"input_dim": self.input_dim,
"input_length": self.input_length}
base_config = super(JZS3, self).get_config()
return dict(base_config.items() + config.items())
return dict(list(base_config.items()) + list(config.items()))

0 comments on commit e839a4b

Please sign in to comment.