Cleanup install and dependencies (#5)

* Remove set_grad_enable
* Remove unused resources
* Install sub-packages
* Import config files
* Add missing LightGlue dependency
main
Paul-Edouard Sarlin 2023-10-08 21:50:23 +02:00 committed by GitHub
parent 5d9d89c0b9
commit 1709021473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 25 deletions

View File

@ -1,8 +1,6 @@
import torch
from pathlib import Path from pathlib import Path
from omegaconf import OmegaConf from omegaconf import OmegaConf
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import resource
from collections import defaultdict from collections import defaultdict
from tqdm import tqdm from tqdm import tqdm
import numpy as np import numpy as np
@ -22,12 +20,6 @@ from ..models.cache_loader import CacheLoader
from ..datasets import get_dataset from ..datasets import get_dataset
rlimit = resource.getrlimit(resource.RLIMIT_NOFILE)
resource.setrlimit(resource.RLIMIT_NOFILE, (4096, rlimit[1]))
torch.set_grad_enabled(False)
def eval_dataset(loader, pred_file, suffix=""): def eval_dataset(loader, pred_file, suffix=""):
results = defaultdict(list) results = defaultdict(list)
results["num_pos" + suffix] = 0 results["num_pos" + suffix] = 0

View File

@ -1,9 +1,7 @@
import torch
from pathlib import Path from pathlib import Path
from omegaconf import OmegaConf from omegaconf import OmegaConf
from pprint import pprint from pprint import pprint
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import resource
from collections import defaultdict from collections import defaultdict
from collections.abc import Iterable from collections.abc import Iterable
from tqdm import tqdm from tqdm import tqdm
@ -30,12 +28,6 @@ from ..utils.tools import AUCMetric
from .eval_pipeline import EvalPipeline from .eval_pipeline import EvalPipeline
rlimit = resource.getrlimit(resource.RLIMIT_NOFILE)
resource.setrlimit(resource.RLIMIT_NOFILE, (4096, rlimit[1]))
torch.set_grad_enabled(False)
class HPatchesPipeline(EvalPipeline): class HPatchesPipeline(EvalPipeline):
default_conf = { default_conf = {
"data": { "data": {

View File

@ -3,7 +3,6 @@ from pathlib import Path
from omegaconf import OmegaConf from omegaconf import OmegaConf
from pprint import pprint from pprint import pprint
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import resource
from collections import defaultdict from collections import defaultdict
from collections.abc import Iterable from collections.abc import Iterable
from tqdm import tqdm from tqdm import tqdm
@ -23,11 +22,6 @@ from .eval_pipeline import EvalPipeline
from .utils import eval_relative_pose_robust, eval_poses, eval_matches_epipolar from .utils import eval_relative_pose_robust, eval_poses, eval_matches_epipolar
rlimit = resource.getrlimit(resource.RLIMIT_NOFILE)
resource.setrlimit(resource.RLIMIT_NOFILE, (4096, rlimit[1]))
torch.set_grad_enabled(False)
class MegaDepth1500Pipeline(EvalPipeline): class MegaDepth1500Pipeline(EvalPipeline):
default_conf = { default_conf = {

View File

@ -31,6 +31,7 @@ dependencies = [
"kornia", "kornia",
"seaborn", "seaborn",
"joblib", "joblib",
"lightglue @ git+https://github.com/cvg/LightGlue.git",
] ]
urls = {Repository = "https://github.com/cvg/glue-factory"} urls = {Repository = "https://github.com/cvg/glue-factory"}
@ -44,8 +45,8 @@ extra = [
] ]
dev = ["black", "flake8", "jupyter"] dev = ["black", "flake8", "jupyter"]
[tool.setuptools] [tool.setuptools.packages.find]
packages = ["gluefactory", "gluefactory_nonfree"] include = ["gluefactory*"]
[tool.setuptools.package-data] [tool.setuptools.package-data]
gluefactory = ["datasets/megadepth_scene_lists/*.txt"] gluefactory = ["datasets/megadepth_scene_lists/*.txt", "configs/*.yaml"]