huge revamp of project structure, fix some bugs to support python 3

ermongroup · Jul 28, 2017 · e884fe8 · e884fe8
1 parent d1b8145
commit e884fe8
Show file tree

Hide file tree

Showing 57 changed files with 119 additions and 108 deletions.
diff --git a/models/__init__.py → a_nice_mc/__init__.py b/models/__init__.py → a_nice_mc/__init__.py
diff --git a/a_nice_mc/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/__pycache__/__init__.cpython-35.pyc
diff --git a/train/__init__.py → a_nice_mc/models/__init__.py b/train/__init__.py → a_nice_mc/models/__init__.py
diff --git a/a_nice_mc/models/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/models/__pycache__/__init__.cpython-35.pyc
diff --git a/a_nice_mc/models/__pycache__/discriminator.cpython-35.pyc b/a_nice_mc/models/__pycache__/discriminator.cpython-35.pyc
diff --git a/a_nice_mc/models/__pycache__/generator.cpython-35.pyc b/a_nice_mc/models/__pycache__/generator.cpython-35.pyc
diff --git a/models/discriminator.py → a_nice_mc/models/discriminator.py b/models/discriminator.py → a_nice_mc/models/discriminator.py
@@ -1,5 1,5 @@
 import tensorflow as tf
-from utils.layers import dense, lrelu
 from a_nice_mc.utils.layers import dense, lrelu
 
 
 class Discriminator(object):

diff --git a/models/generator.py → a_nice_mc/models/generator.py b/models/generator.py → a_nice_mc/models/generator.py
@@ -1,4 1,4 @@
-from utils.nice import NiceLayer, NiceNetwork
 from a_nice_mc.utils.nice import NiceLayer, NiceNetwork
 
 
 def create_nice_network(x_dim, v_dim, args):

diff --git a/objectives/__init__.py → a_nice_mc/objectives/__init__.py b/objectives/__init__.py → a_nice_mc/objectives/__init__.py
diff --git a/a_nice_mc/objectives/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/objectives/__pycache__/__init__.cpython-35.pyc
diff --git a/...ves/bayes_logistic_regression/__init__.py → ...ves/bayes_logistic_regression/__init__.py b/...ves/bayes_logistic_regression/__init__.py → ...ves/bayes_logistic_regression/__init__.py
@@ -1,8 1,8 @@
-import tensorflow as tf
 import numpy as np
-from objectives import Energy
-from utils.evaluation import effective_sample_size, acceptance_rate
-from utils.logger import save_ess, create_logger
 import tensorflow as tf
 from a_nice_mc.objectives import Energy
 from a_nice_mc.utils.evaluation import effective_sample_size, acceptance_rate
 from a_nice_mc.utils.logger import save_ess, create_logger
 
 logger = create_logger(__name__)
 

diff --git a/...s/bayes_logistic_regression/australian.py → ...s/bayes_logistic_regression/australian.py b/...s/bayes_logistic_regression/australian.py → ...s/bayes_logistic_regression/australian.py
@@ -1,5 1,5 @@
 import numpy as np
-from objectives.bayes_logistic_regression import BayesianLogisticRegression
 from a_nice_mc.objectives.bayes_logistic_regression import BayesianLogisticRegression
 
 
 class Australian(BayesianLogisticRegression):

diff --git a/...tives/bayes_logistic_regression/german.py → ...tives/bayes_logistic_regression/german.py b/...tives/bayes_logistic_regression/german.py → ...tives/bayes_logistic_regression/german.py
@@ -1,5 1,5 @@
 import numpy as np
-from objectives.bayes_logistic_regression import BayesianLogisticRegression
 from a_nice_mc.objectives.bayes_logistic_regression import BayesianLogisticRegression
 
 
 class German(BayesianLogisticRegression):

diff --git a/...ctives/bayes_logistic_regression/heart.py → ...ctives/bayes_logistic_regression/heart.py b/...ctives/bayes_logistic_regression/heart.py → ...ctives/bayes_logistic_regression/heart.py
@@ -1,5 1,5 @@
 import numpy as np
-from objectives.bayes_logistic_regression import BayesianLogisticRegression
 from a_nice_mc.objectives.bayes_logistic_regression import BayesianLogisticRegression
 
 
 class Heart(BayesianLogisticRegression):

diff --git a/...es/bayes_logistic_regression/synthetic.py → ...es/bayes_logistic_regression/synthetic.py b/...es/bayes_logistic_regression/synthetic.py → ...es/bayes_logistic_regression/synthetic.py
@@ -1,5 1,5 @@
 import numpy as np
-from objectives.bayes_logistic_regression import BayesianLogisticRegression
 from a_nice_mc.objectives.bayes_logistic_regression import BayesianLogisticRegression
 
 
 class Synthetic(BayesianLogisticRegression):

diff --git a/objectives/expression/__init__.py → a_nice_mc/objectives/expression/__init__.py b/objectives/expression/__init__.py → a_nice_mc/objectives/expression/__init__.py
@@ -1,7 1,7 @@
 import numpy as np
-from objectives import Energy
-from utils.evaluation import effective_sample_size, acceptance_rate
-from utils.logger import save_ess, create_logger
 from .. import Energy
 from ...utils.evaluation import effective_sample_size, acceptance_rate
 from ...utils.logger import save_ess, create_logger
 
 logger = create_logger(__name__)
 

diff --git a/a_nice_mc/objectives/expression/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/objectives/expression/__pycache__/__init__.cpython-35.pyc
diff --git a/a_nice_mc/objectives/expression/__pycache__/lord_of_rings.cpython-35.pyc b/a_nice_mc/objectives/expression/__pycache__/lord_of_rings.cpython-35.pyc
diff --git a/objectives/expression/lord_of_rings.py → ...mc/objectives/expression/lord_of_rings.py b/objectives/expression/lord_of_rings.py → ...mc/objectives/expression/lord_of_rings.py
@@ -1,7 1,8 @@
-import tensorflow as tf
 import numpy as np
-from objectives.expression import Expression
-from utils.logger import create_logger
 import tensorflow as tf
 from a_nice_mc.objectives.expression import Expression
 from a_nice_mc.utils.logger import create_logger
 
 
 logger = create_logger(__name__)
 

diff --git a/objectives/expression/mog2.py → a_nice_mc/objectives/expression/mog2.py b/objectives/expression/mog2.py → a_nice_mc/objectives/expression/mog2.py
@@ -1,7 1,7 @@
-import tensorflow as tf
 import numpy as np
-from objectives.expression import Expression
-from utils.logger import create_logger
 import tensorflow as tf
 from a_nice_mc.objectives.expression import Expression
 from a_nice_mc.utils.logger import create_logger
 
 logger = create_logger(__name__)
 

diff --git a/objectives/expression/mog6.py → a_nice_mc/objectives/expression/mog6.py b/objectives/expression/mog6.py → a_nice_mc/objectives/expression/mog6.py
@@ -1,7 1,7 @@
-import tensorflow as tf
 import numpy as np
-from objectives.expression import Expression
-from utils.logger import create_logger
 import tensorflow as tf
 from a_nice_mc.objectives.expression import Expression
 from a_nice_mc.utils.logger import create_logger
 
 logger = create_logger(__name__)
 

diff --git a/objectives/expression/ring2d.py → a_nice_mc/objectives/expression/ring2d.py b/objectives/expression/ring2d.py → a_nice_mc/objectives/expression/ring2d.py
@@ -1,7 1,7 @@
-import tensorflow as tf
 import numpy as np
-from objectives.expression import Expression
-from utils.logger import create_logger
 import tensorflow as tf
 from a_nice_mc.objectives.expression import Expression
 from a_nice_mc.utils.logger import create_logger
 
 logger = create_logger(__name__)
 

diff --git a/utils/__init__.py → a_nice_mc/train/__init__.py b/utils/__init__.py → a_nice_mc/train/__init__.py
diff --git a/a_nice_mc/train/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/train/__pycache__/__init__.cpython-35.pyc
diff --git a/a_nice_mc/train/__pycache__/wgan_nll.cpython-35.pyc b/a_nice_mc/train/__pycache__/wgan_nll.cpython-35.pyc
diff --git a/train/wgan_nll.py → a_nice_mc/train/wgan_nll.py b/train/wgan_nll.py → a_nice_mc/train/wgan_nll.py
@@ -1,12 1,11 @@
 import os
 import time
 
 import numpy as np
-import os
 import tensorflow as tf
-
-from utils.bootstrap import Buffer
-from utils.logger import create_logger
-from utils.nice import TrainingOperator, InferenceOperator
 from a_nice_mc.utils.bootstrap import Buffer
 from a_nice_mc.utils.logger import create_logger
 from a_nice_mc.utils.nice import TrainingOperator, InferenceOperator
 
 
 class Trainer(object):

diff --git a/a_nice_mc/utils/__init__.py b/a_nice_mc/utils/__init__.py
diff --git a/a_nice_mc/utils/__pycache__/__init__.cpython-35.pyc b/a_nice_mc/utils/__pycache__/__init__.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/bootstrap.cpython-35.pyc b/a_nice_mc/utils/__pycache__/bootstrap.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/evaluation.cpython-35.pyc b/a_nice_mc/utils/__pycache__/evaluation.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/hmc.cpython-35.pyc b/a_nice_mc/utils/__pycache__/hmc.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/layers.cpython-35.pyc b/a_nice_mc/utils/__pycache__/layers.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/logger.cpython-35.pyc b/a_nice_mc/utils/__pycache__/logger.cpython-35.pyc
diff --git a/a_nice_mc/utils/__pycache__/nice.cpython-35.pyc b/a_nice_mc/utils/__pycache__/nice.cpython-35.pyc
diff --git a/utils/bootstrap.py → a_nice_mc/utils/bootstrap.py b/utils/bootstrap.py → a_nice_mc/utils/bootstrap.py
diff --git a/utils/evaluation.py → a_nice_mc/utils/evaluation.py b/utils/evaluation.py → a_nice_mc/utils/evaluation.py
diff --git a/utils/hmc/sampler.py → a_nice_mc/utils/hmc.py b/utils/hmc/sampler.py → a_nice_mc/utils/hmc.py
@@ -1,7 1,8 @@
-import tensorflow as tf
-import numpy as np
 import time
-from utils.logger import create_logger
 
 import numpy as np
 import tensorflow as tf
 from a_nice_mc.utils.logger import create_logger
 
 logger = create_logger(__name__)
 
@@ -99,7 100,8 @@ def __init__(self, energy_fn, prior, stepsize=0.1, n_steps=10,
  self.stepsize = tf.Variable(stepsize)
  self.avg_acceptance_rate = tf.Variable(target_acceptance_rate)
 
- def fn((z, s, a), x):
  def fn(zsa, x):
  z, s, a = zsa
  accept, final_pos, final_vel = hmc_move(
  z,
  energy_fn,

diff --git a/utils/layers.py → a_nice_mc/utils/layers.py b/utils/layers.py → a_nice_mc/utils/layers.py
diff --git a/utils/logger.py → a_nice_mc/utils/logger.py b/utils/logger.py → a_nice_mc/utils/logger.py
diff --git a/utils/mmd.py → a_nice_mc/utils/mmd.py b/utils/mmd.py → a_nice_mc/utils/mmd.py
diff --git a/utils/nice/__init__.py → a_nice_mc/utils/nice.py b/utils/nice/__init__.py → a_nice_mc/utils/nice.py
@@ -1,7 1,7 @@
 import tensorflow as tf
 
-from utils.hmc import hamiltonian, metropolis_hastings_accept
-from utils.layers import dense
 from a_nice_mc.utils.hmc import hamiltonian, metropolis_hastings_accept
 from a_nice_mc.utils.layers import dense
 
 
 class Layer(object):
@@ -106,14 106,15 @@ def __init__(self, network):
  self.network = network
 
  def __call__(self, inputs, steps):
- def fn((z, v), x):
  def fn(zv, x):
  """
  Transition for training, without Metropolis-Hastings.
  `z` is the input state.
  `v` is created as a dummy variable to allow output of v_, for training p(v).
  :param x: variable only for specifying the number of steps
  :return: next state `z_`, and the corresponding auxiliary variable `v_`.
  """
  z, v = zv
  v = tf.random_normal(shape=tf.stack([tf.shape(z)[0], self.network.v_dim]))
  z_, v_ = self.network.forward([z, v])
  return z_, v_
@@ -128,14 129,15 @@ def __init__(self, network, energy_fn):
  self.energy_fn = energy_fn
 
  def __call__(self, inputs, steps):
- def fn((z, v), x):
  def fn(zv, x):
  """
  Transition with Metropolis-Hastings.
  `z` is the input state.
  `v` is created as a dummy variable to allow output of v_, for debugging purposes.
  :param x: variable only for specifying the number of steps
  :return: next state `z_`, and the corresponding auxiliary variable `v_`.
  """
  z, v = zv
  v = tf.random_normal(shape=tf.stack([tf.shape(z)[0], self.network.v_dim]))
  z_, v_ = self.network([z, v], is_backward=(tf.random_uniform([]) < 0.5))
  ep = hamiltonian(z, v, self.energy_fn)

diff --git a/utils/statistics.py → a_nice_mc/utils/statistics.py b/utils/statistics.py → a_nice_mc/utils/statistics.py
@@ -2,10 2,9 @@
 
 import numpy as np
 import tensorflow as tf
-
-from evaluation import acceptance_rate, effective_sample_size
-from utils.hmc import metropolis_hastings_accept
-from utils.logger import create_logger
 from a_nice_mc.utils.evaluation import acceptance_rate, effective_sample_size
 from a_nice_mc.utils.hmc import metropolis_hastings_accept
 from a_nice_mc.utils.logger import create_logger
 
 logger = create_logger(__name__)
 

diff --git a/examples/hmc_ring2d.py b/examples/hmc_ring2d.py
@@ -1,8 1,8 @@
 import os
 import sys
 
 import matplotlib.pyplot as plt
 import numpy as np
-import os
 
 sys.path.append(os.getcwd())
 
@@ -12,8 12,8 @@ def prior(bs):
 
 
 if __name__ == '__main__':
- from utils.statistics import NormalMonteCarloSampler
- from objectives.expression.ring2d import Ring2d
  from a_nice_mc.utils.statistics import NormalMonteCarloSampler
  from a_nice_mc.objectives.expression.ring2d import Ring2d
 
  os.environ['CUDA_VISIBLE_DEVICES'] = ''
 

diff --git a/examples/nice_australian.py b/examples/nice_australian.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 15])
 
 if __name__ == '__main__':
- from objectives.bayes_logistic_regression.australian import Australian
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.bayes_logistic_regression.australian import Australian
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = '0'
 

diff --git a/examples/nice_german.py b/examples/nice_german.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 25])
 
 if __name__ == '__main__':
- from objectives.bayes_logistic_regression.german import German
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.bayes_logistic_regression.german import German
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = '0'
 

diff --git a/examples/nice_heart.py b/examples/nice_heart.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 14])
 
 if __name__ == '__main__':
- from objectives.bayes_logistic_regression.heart import Heart
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.bayes_logistic_regression.heart import Heart
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = '0'
 

diff --git a/examples/nice_lord_of_rings.py b/examples/nice_lord_of_rings.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 2])
 
 if __name__ == '__main__':
- from objectives.expression.lord_of_rings import LordOfRings
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.expression.lord_of_rings import LordOfRings
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = ''
 

diff --git a/examples/nice_mog2.py b/examples/nice_mog2.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 2])
 
 if __name__ == '__main__':
- from objectives.expression.mog2 import MixtureOfGaussians
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.expression.mog2 import MixtureOfGaussians
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = ''
 

diff --git a/examples/nice_mog6.py b/examples/nice_mog6.py
@@ -1,18 1,19 @@
-import numpy as np
 import os
 import sys
 
 import numpy as np
 
 sys.path.append(os.getcwd())
 
 
 def noise_sampler(bs):
  return np.random.normal(0.0, 1.0, [bs, 2])
 
 if __name__ == '__main__':
- from objectives.expression.mog6 import MixtureOfGaussians
- from models.discriminator import MLPDiscriminator
- from models.generator import create_nice_network
- from train.wgan_nll import Trainer
  from a_nice_mc.objectives.expression.mog6 import MixtureOfGaussians
  from a_nice_mc.models.discriminator import MLPDiscriminator
  from a_nice_mc.models.generator import create_nice_network
  from a_nice_mc.train.wgan_nll import Trainer
 
  os.environ['CUDA_VISIBLE_DEVICES'] = ''