diff --git a/.gitignore b/.gitignore index ebd4b27..0799079 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.egg-info __pycache__/ .ipynb_checkpoints/ -.vscode \ No newline at end of file +.venv +.vscode diff --git a/sdc/sdc/.flake8 b/sdc/.flake8 similarity index 100% rename from sdc/sdc/.flake8 rename to sdc/.flake8 diff --git a/sdc/ysdc_dataset_api/evaluation/metrics.py b/sdc/ysdc_dataset_api/evaluation/metrics.py index 550237c..ec38b98 100644 --- a/sdc/ysdc_dataset_api/evaluation/metrics.py +++ b/sdc/ysdc_dataset_api/evaluation/metrics.py @@ -3,13 +3,12 @@ import numpy as np import torch -from scipy.special import softmax from sdc.constants import VALID_BASE_METRICS, VALID_AGGREGATORS def average_displacement_error(ground_truth, predicted): - """Calculates average displacement error + r"""Calculates average displacement error ADE(y) = (1/T) \sum_{t=1}^T || s_t - s^*_t ||_2 where T = num_timesteps, y = (s_1, ..., s_T) @@ -223,7 +222,7 @@ def average_displacement_error_torch( ground_truth: torch.Tensor, predicted: torch.Tensor, ) -> torch.Tensor: - """Calculates average displacement error + r"""Calculates average displacement error ADE(y) = (1/T) \sum_{t=1}^T || s_t - s^*_t ||_2 where T = num_timesteps, y = (s_1, ..., s_T) diff --git a/sdc/ysdc_dataset_api/features/rendering.py b/sdc/ysdc_dataset_api/features/rendering.py index 255e1e0..f480e90 100644 --- a/sdc/ysdc_dataset_api/features/rendering.py +++ b/sdc/ysdc_dataset_api/features/rendering.py @@ -186,7 +186,7 @@ def _get_fm_values(self, tracks, transform): values.append(self._get_acceleration_values(tracks, transform)) if 'yaw' in self._config: values.append(self._get_yaw_values(tracks)) - return np.concatenate(values, axis=1, dtype=np.float64) + return np.concatenate(values, axis=1).astype(np.float64) class PedestrianTracksRenderer(TrackRendererBase): @@ -209,7 +209,7 @@ def _get_fm_values(self, tracks, transform): values.append(self._get_occupancy_values(tracks)) if 'velocity' in self._config: values.append(self._get_velocity_values(tracks, transform)) - return np.concatenate(values, axis=1, dtype=np.float64) + return np.concatenate(values, axis=1).astype(dtype=np.float64) class RoadGraphRenderer(FeatureMapRendererBase): diff --git a/sdc/ysdc_dataset_api/tests/test_metrics.py b/sdc/ysdc_dataset_api/tests/test_metrics.py index 1fc2950..0787d2d 100644 --- a/sdc/ysdc_dataset_api/tests/test_metrics.py +++ b/sdc/ysdc_dataset_api/tests/test_metrics.py @@ -7,7 +7,6 @@ get_trajectories_weights_arrays, min_ade, min_fde, top1_ade, top1_fde, trajectory_array_to_proto, weighted_ade, weighted_fde) -from ..evaluation.metrics import _softmax_normalize from ..proto import ObjectPrediction, Submission, WeightedTrajectory