Adjust imports/references

aai-institute · Sep 22, 2023 · 476c651 · 476c651
1 parent 4eb3808
commit 476c651
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 description = ""
 authors = ["Faried Abu Zaid <[email protected]>"]
 readme = "README.md"
-packages = [{include = "veriflow"}, {include = "scripts"}]
+packages = [{include = "src"}, {include = "scripts"}]
 
 [tool.poetry.dependencies]
 python = "^3.11"

diff --git a/src/experiments/hyperopt.py b/src/experiments/hyperopt.py
@@ -15,9 +15,9 @@
 from torch.utils.data import DataLoader
 
 from src.experiments.base import Experiment
-from src.flows import NiceFlow
-from src.networks import AdditiveAffineNN
-from src.transforms import ScaleTransform
+from src.veriflow.flows import NiceFlow
+from src.veriflow.networks import AdditiveAffineNN
+from src.veriflow.transforms import ScaleTransform
 
 HyperParams = Literal["train", "test", "coupling_layers", "coupling_nn_layers", "split_dim", "epochs", "iters", "batch_size", 
                       "optim", "optim_params", "base_dist"]

diff --git a/src/veriflow/flows.py b/src/veriflow/flows.py
@@ -14,8 +14,8 @@
 
 from sklearn.datasets import load_digits
 from tqdm import tqdm
-from src.transforms import ScaleTransform, MaskedCoupling, Permute, LUTransform, LeakyReLUTransform
-from src.networks import AdditiveAffineNN, ConvNet2D
+from src.veriflow.transforms import ScaleTransform, MaskedCoupling, Permute, LUTransform, LeakyReLUTransform
+from src.veriflow.networks import AdditiveAffineNN, ConvNet2D
 
 
 class Flow(torch.nn.Module):

diff --git a/tests/mnist.yaml b/tests/mnist.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: veriflow.experiments.base.ExperimentCollection
+__object__: src.experiments.base.ExperimentCollection
 name: mnist_basedist_comparison
 experiments:
     - &exp_nice
-      __object__: veriflow.experiments.hyperopt.HyperoptExperiment
+      __object__: src.experiments.hyperopt.HyperoptExperiment
       name: mnist_nice
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler
@@ -18,7 +18,7 @@ experiments:
         mode: min
       trial_config:
         dataset: &dataset
-          __object__: veriflow.experiments.datasets.MnistSplit
+          __object__: src.experiments.datasets.MnistSplit
           digit: 0
         epochs: &epochs 20
         patience: &patience 5

diff --git a/tests/onnx_test.py b/tests/onnx_test.py
@@ -1,7 +1,7 @@
 import torch
 from pyro.distributions import Normal
 
-from src.flows import NiceFlow
+from src.veriflow.flows import NiceFlow
 
 
 def test_onnx():