diff --git a/core/utils/__init__.py b/core/utils/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/demo.py b/demo.py index 9df169f..70f1502 100644 --- a/demo.py +++ b/demo.py @@ -1,14 +1,11 @@ -import sys -sys.path.append('core') - import argparse import glob import numpy as np import torch from tqdm import tqdm from pathlib import Path -from raft_stereo import RAFTStereo -from utils.utils import InputPadder +from raft_stereo.raft_stereo import RAFTStereo +from raft_stereo.utils.utils import InputPadder from PIL import Image from matplotlib import pyplot as plt diff --git a/evaluate_stereo.py b/evaluate_stereo.py index e96fc76..c7f11e6 100644 --- a/evaluate_stereo.py +++ b/evaluate_stereo.py @@ -1,6 +1,4 @@ from __future__ import print_function, division -import sys -sys.path.append('core') import argparse import time @@ -8,9 +6,9 @@ import numpy as np import torch from tqdm import tqdm -from raft_stereo import RAFTStereo, autocast -import stereo_datasets as datasets -from utils.utils import InputPadder +from raft_stereo.raft_stereo import RAFTStereo, autocast +import raft_stereo.stereo_datasets as datasets +from raft_stereo.utils.utils import InputPadder def count_parameters(model): return sum(p.numel() for p in model.parameters() if p.requires_grad) diff --git a/raft_stereo/__init__.py b/raft_stereo/__init__.py new file mode 100644 index 0000000..2e6223f --- /dev/null +++ b/raft_stereo/__init__.py @@ -0,0 +1 @@ +from raft_stereo import RAFTStereo \ No newline at end of file diff --git a/core/corr.py b/raft_stereo/corr.py similarity index 99% rename from core/corr.py rename to raft_stereo/corr.py index 97e79e6..f3b6597 100644 --- a/core/corr.py +++ b/raft_stereo/corr.py @@ -1,6 +1,6 @@ import torch import torch.nn.functional as F -from core.utils.utils import bilinear_sampler +from raft_stereo.utils.utils import bilinear_sampler try: import corr_sampler diff --git a/core/extractor.py b/raft_stereo/extractor.py similarity index 100% rename from core/extractor.py rename to raft_stereo/extractor.py diff --git a/core/raft_stereo.py b/raft_stereo/raft_stereo.py similarity index 95% rename from core/raft_stereo.py rename to raft_stereo/raft_stereo.py index 639d7c7..34a7751 100644 --- a/core/raft_stereo.py +++ b/raft_stereo/raft_stereo.py @@ -1,10 +1,10 @@ import torch import torch.nn as nn import torch.nn.functional as F -from core.update import BasicMultiUpdateBlock -from core.extractor import BasicEncoder, MultiBasicEncoder, ResidualBlock -from core.corr import CorrBlock1D, PytorchAlternateCorrBlock1D, CorrBlockFast1D, AlternateCorrBlock -from core.utils.utils import coords_grid, upflow8 +from raft_stereo.update import BasicMultiUpdateBlock +from raft_stereo.extractor import BasicEncoder, MultiBasicEncoder, ResidualBlock +from raft_stereo.corr import CorrBlock1D, PytorchAlternateCorrBlock1D, CorrBlockFast1D, AlternateCorrBlock +from raft_stereo.utils.utils import coords_grid, upflow8 try: diff --git a/core/stereo_datasets.py b/raft_stereo/stereo_datasets.py similarity index 99% rename from core/stereo_datasets.py rename to raft_stereo/stereo_datasets.py index 8266ea4..57be195 100644 --- a/core/stereo_datasets.py +++ b/raft_stereo/stereo_datasets.py @@ -14,8 +14,8 @@ from glob import glob import os.path as osp -from core.utils import frame_utils -from core.utils.augmentor import FlowAugmentor, SparseFlowAugmentor +from raft_stereo.utils import frame_utils +from raft_stereo.utils.augmentor import FlowAugmentor, SparseFlowAugmentor class StereoDataset(data.Dataset): diff --git a/core/update.py b/raft_stereo/update.py similarity index 100% rename from core/update.py rename to raft_stereo/update.py diff --git a/core/__init__.py b/raft_stereo/utils/__init__.py similarity index 100% rename from core/__init__.py rename to raft_stereo/utils/__init__.py diff --git a/core/utils/augmentor.py b/raft_stereo/utils/augmentor.py similarity index 100% rename from core/utils/augmentor.py rename to raft_stereo/utils/augmentor.py diff --git a/core/utils/frame_utils.py b/raft_stereo/utils/frame_utils.py similarity index 100% rename from core/utils/frame_utils.py rename to raft_stereo/utils/frame_utils.py diff --git a/core/utils/utils.py b/raft_stereo/utils/utils.py similarity index 100% rename from core/utils/utils.py rename to raft_stereo/utils/utils.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..0a897dd --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +from setuptools import setup, find_packages + +setup( + name='raft_stereo', + version='1.0.0', + packages=find_packages(), + install_requires=[ + 'torch', + 'torchvision', + 'opencv-python', + 'matplotlib', + 'tensorboard', + 'scipy', + 'opt_einsum', + 'glob', + 'skimage', + 'Pillow', + 'imageio', + 'numpy' + ] +) + diff --git a/train_stereo.py b/train_stereo.py index 29f82ed..f4545bc 100644 --- a/train_stereo.py +++ b/train_stereo.py @@ -10,10 +10,10 @@ import torch import torch.nn as nn import torch.optim as optim -from core.raft_stereo import RAFTStereo +from raft_stereo.raft_stereo import RAFTStereo from evaluate_stereo import * -import core.stereo_datasets as datasets +import raft_stereo.stereo_datasets as datasets try: from torch.cuda.amp import GradScaler