From dfa1d43f2ebff7e85b21305c53ef43cdecb07c82 Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Mon, 9 Oct 2023 20:27:29 +0200 Subject: [PATCH] Change imports to support usage as module Note that this does require rerunning the `process_data.py` scripts in the example folders so that the dill-files are updated. --- experiments/pedestrians/evaluate.py | 8 ++++---- experiments/pedestrians/process_data.py | 8 ++++---- trajectron/environment/map.py | 2 +- trajectron/environment/node.py | 2 +- trajectron/evaluation/evaluation.py | 4 ++-- trajectron/model/components/discrete_latent.py | 2 +- trajectron/model/components/gmm2d.py | 2 +- trajectron/model/dynamics/linear.py | 2 +- trajectron/model/dynamics/single_integrator.py | 6 +++--- trajectron/model/dynamics/unicycle.py | 6 +++--- trajectron/model/mgcvae.py | 8 ++++---- trajectron/model/trajectron.py | 4 ++-- trajectron/visualization/visualization.py | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/experiments/pedestrians/evaluate.py b/experiments/pedestrians/evaluate.py index f5431be..da6cc28 100644 --- a/experiments/pedestrians/evaluate.py +++ b/experiments/pedestrians/evaluate.py @@ -7,11 +7,11 @@ import torch import numpy as np import pandas as pd -sys.path.append("../../trajectron") +sys.path.append("../../") from tqdm import tqdm -from model.model_registrar import ModelRegistrar -from model.trajectron import Trajectron -import evaluation +from trajectron.model.model_registrar import ModelRegistrar +from trajectron.model.trajectron import Trajectron +import trajectron.evaluation as evaluation seed = 0 np.random.seed(seed) diff --git a/experiments/pedestrians/process_data.py b/experiments/pedestrians/process_data.py index 369fcd0..8c69ff4 100644 --- a/experiments/pedestrians/process_data.py +++ b/experiments/pedestrians/process_data.py @@ -4,10 +4,10 @@ import numpy as np import pandas as pd import dill -sys.path.append("../../trajectron") -from environment import Environment, Scene, Node -from utils import maybe_makedirs -from environment import derivative_of +sys.path.append("../../") +from trajectron.environment import Environment, Scene, Node +from trajectron.utils import maybe_makedirs +from trajectron.environment import derivative_of desired_max_time = 100 pred_indices = [2, 3] diff --git a/trajectron/environment/map.py b/trajectron/environment/map.py index d1b527d..55ba597 100644 --- a/trajectron/environment/map.py +++ b/trajectron/environment/map.py @@ -1,6 +1,6 @@ import torch import numpy as np -from model.dataset.homography_warper import get_rotation_matrix2d, warp_affine_crop +from trajectron.model.dataset.homography_warper import get_rotation_matrix2d, warp_affine_crop class Map(object): diff --git a/trajectron/environment/node.py b/trajectron/environment/node.py index 2db820e..316888a 100644 --- a/trajectron/environment/node.py +++ b/trajectron/environment/node.py @@ -1,7 +1,7 @@ import random import numpy as np import pandas as pd -from environment import DoubleHeaderNumpyArray +from trajectron.environment import DoubleHeaderNumpyArray from ncls import NCLS diff --git a/trajectron/evaluation/evaluation.py b/trajectron/evaluation/evaluation.py index 8e5a643..27e79a6 100644 --- a/trajectron/evaluation/evaluation.py +++ b/trajectron/evaluation/evaluation.py @@ -2,8 +2,8 @@ import numpy as np from scipy.interpolate import RectBivariateSpline from scipy.ndimage import binary_dilation from scipy.stats import gaussian_kde -from utils import prediction_output_to_trajectories -import visualization +from trajectron.utils import prediction_output_to_trajectories +import trajectron.visualization from matplotlib import pyplot as plt diff --git a/trajectron/model/components/discrete_latent.py b/trajectron/model/components/discrete_latent.py index b3f8688..6cdd5a3 100644 --- a/trajectron/model/components/discrete_latent.py +++ b/trajectron/model/components/discrete_latent.py @@ -1,7 +1,7 @@ import torch import torch.distributions as td import numpy as np -from model.model_utils import ModeKeys +from trajectron.model.model_utils import ModeKeys class DiscreteLatent(object): diff --git a/trajectron/model/components/gmm2d.py b/trajectron/model/components/gmm2d.py index 6fb4836..f18cbc1 100644 --- a/trajectron/model/components/gmm2d.py +++ b/trajectron/model/components/gmm2d.py @@ -1,7 +1,7 @@ import torch import torch.distributions as td import numpy as np -from model.model_utils import to_one_hot +from trajectron.model.model_utils import to_one_hot class GMM2D(td.Distribution): diff --git a/trajectron/model/dynamics/linear.py b/trajectron/model/dynamics/linear.py index 9b55e64..48c87ab 100644 --- a/trajectron/model/dynamics/linear.py +++ b/trajectron/model/dynamics/linear.py @@ -1,4 +1,4 @@ -from model.dynamics import Dynamic +from trajectron.model.dynamics import Dynamic class Linear(Dynamic): diff --git a/trajectron/model/dynamics/single_integrator.py b/trajectron/model/dynamics/single_integrator.py index 984f5fa..1e1e11a 100644 --- a/trajectron/model/dynamics/single_integrator.py +++ b/trajectron/model/dynamics/single_integrator.py @@ -1,7 +1,7 @@ import torch -from model.dynamics import Dynamic -from utils import block_diag -from model.components import GMM2D +from trajectron.model.dynamics import Dynamic +from trajectron.utils import block_diag +from trajectron.model.components import GMM2D class SingleIntegrator(Dynamic): diff --git a/trajectron/model/dynamics/unicycle.py b/trajectron/model/dynamics/unicycle.py index 1a83c42..7685b33 100644 --- a/trajectron/model/dynamics/unicycle.py +++ b/trajectron/model/dynamics/unicycle.py @@ -1,8 +1,8 @@ import torch import torch.nn as nn -from model.dynamics import Dynamic -from utils import block_diag -from model.components import GMM2D +from trajectron.model.dynamics import Dynamic +from trajectron.utils import block_diag +from trajectron.model.components import GMM2D class Unicycle(Dynamic): diff --git a/trajectron/model/mgcvae.py b/trajectron/model/mgcvae.py index 8760d6d..1ace631 100644 --- a/trajectron/model/mgcvae.py +++ b/trajectron/model/mgcvae.py @@ -2,10 +2,10 @@ import warnings import torch.nn as nn import torch.nn.functional as F import torch.optim as optim -from model.components import * -from model.model_utils import * -import model.dynamics as dynamic_module -from environment.scene_graph import DirectedEdge +from trajectron.model.components import * +from trajectron.model.model_utils import * +import trajectron.model.dynamics as dynamic_module +from trajectron.environment.scene_graph import DirectedEdge class MultimodalGenerativeCVAE(object): diff --git a/trajectron/model/trajectron.py b/trajectron/model/trajectron.py index 1806702..9b423f6 100644 --- a/trajectron/model/trajectron.py +++ b/trajectron/model/trajectron.py @@ -1,7 +1,7 @@ import torch import numpy as np -from model.mgcvae import MultimodalGenerativeCVAE -from model.dataset import get_timesteps_data, restore +from trajectron.model.mgcvae import MultimodalGenerativeCVAE +from trajectron.model.dataset import get_timesteps_data, restore class Trajectron(object): diff --git a/trajectron/visualization/visualization.py b/trajectron/visualization/visualization.py index 08e1fef..d28c13e 100644 --- a/trajectron/visualization/visualization.py +++ b/trajectron/visualization/visualization.py @@ -1,4 +1,4 @@ -from utils import prediction_output_to_trajectories +from trajectron.utils import prediction_output_to_trajectories from scipy import linalg import matplotlib.pyplot as plt import matplotlib.patches as patches