From cbb9ee3626acdfc10c7ef925468453e6c4b5ee0b Mon Sep 17 00:00:00 2001 From: Shaohui Liu Date: Thu, 28 Nov 2024 10:59:32 +0100 Subject: [PATCH] Remove pytlbd and TP-LSD from third-party. Move hawp to separate installation (#100) * remove tp_lsd from third-party and update installation guide * remove lbd and update installation guide * put hawp as separate installation * minor update on docs * update requirements.txt --- .gitmodules | 10 ---------- README.md | 2 +- misc/install/hawpv3.md | 8 ++++++++ misc/install/lbd.md | 1 + misc/install/tp_lsd.md | 1 + requirements.txt | 1 - third-party/TP-LSD | 1 - third-party/hawp | 1 - third-party/pytlbd | 1 - 9 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 misc/install/hawpv3.md delete mode 160000 third-party/TP-LSD delete mode 160000 third-party/hawp delete mode 160000 third-party/pytlbd diff --git a/.gitmodules b/.gitmodules index a3d91e06..051e7c95 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,16 +17,6 @@ [submodule "third-party/pytlsd"] path = third-party/pytlsd url = https://github.com/iago-suarez/pytlsd.git -[submodule "third-party/pytlbd"] - path = third-party/pytlbd - url = https://github.com/iago-suarez/pytlbd.git -[submodule "third-party/hawp"] - path = third-party/hawp - url = https://github.com/cherubicXN/hawp.git - ignore = dirty -[submodule "third-party/TP-LSD"] - path = third-party/TP-LSD - url = https://github.com/rpautrat/TP-LSD.git [submodule "third-party/DeepLSD"] path = third-party/DeepLSD url = https://github.com/cvg/DeepLSD.git diff --git a/README.md b/README.md index 06a0bbb9..5302048f 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ If you wish to use the methods with **separate installation needed** you need to **The following line detectors are currently supported:** - [LSD](https://github.com/iago-suarez/pytlsd) - [SOLD2](https://github.com/cvg/SOLD2) -- [HAWPv3](https://github.com/cherubicXN/hawp) +- [HAWP](https://github.com/cherubicXN/hawp) (separate installation needed [[Guide](misc/install/hawpv3.md)]) - [TP-LSD](https://github.com/Siyuada7/TP-LSD) (separate installation needed [[Guide](misc/install/tp_lsd.md)]) - [DeepLSD](https://github.com/cvg/DeepLSD) diff --git a/misc/install/hawpv3.md b/misc/install/hawpv3.md new file mode 100644 index 00000000..e1c04bae --- /dev/null +++ b/misc/install/hawpv3.md @@ -0,0 +1,8 @@ +## HAWP installation + +```bash +git clone --recursive https://github.com/cherubicXN/hawp.git ./third-party/hawp +python -m pip install -e ./third-party/hawp +``` + +Since HAWP (original link: [https://github.com/cherubicXN/hawp](https://github.com/cherubicXN/hawp)) is still under active development and we do not want to block the user from using the newest version, it is now listed as a separate dependency. diff --git a/misc/install/lbd.md b/misc/install/lbd.md index 4a3bc1a4..9207805f 100644 --- a/misc/install/lbd.md +++ b/misc/install/lbd.md @@ -6,6 +6,7 @@ sudo apt-get install libopencv-dev libopencv-contrib-dev libarpack++2-dev libarp ``` Then install the pytlbd Python package from [Iago Suárez](https://github.com/iago-suarez) ```bash +git clone --recursive https://github.com/iago-suarez/pytlbd.git ./third-party/pytlbd python -m pip install -e ./third-party/pytlbd ``` The LBD is listed as a dependency with separate installation to avoid the OpenCV dependency. When using the LBD matcher inside LIMAP, please use the parallelization with ``--line2d.matcher.n_jobs 8`` (8 cores, you can use even more CPU cores if applicable). diff --git a/misc/install/tp_lsd.md b/misc/install/tp_lsd.md index f56b52ae..0df67380 100644 --- a/misc/install/tp_lsd.md +++ b/misc/install/tp_lsd.md @@ -1,6 +1,7 @@ ## TP-LSD installation ```bash +git clone --recursive https://github.com/rpautrat/TP-LSD.git ./third-party/TP-LSD python -m pip install -e ./third-party/TP-LSD/tp_lsd/modeling/DCNv2 python -m pip install -e ./third-party/TP-LSD ``` diff --git a/requirements.txt b/requirements.txt index ebd63c7a..f1ae3d98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,6 @@ ruff==0.6.7 clang-format==19.1.0 ./third-party/pytlsd -./third-party/hawp -e ./third-party/Hierarchical-Localization -e ./third-party/DeepLSD -e ./third-party/GlueStick diff --git a/third-party/TP-LSD b/third-party/TP-LSD deleted file mode 160000 index 55580503..00000000 --- a/third-party/TP-LSD +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 555805033e705ed6bfbf4d691528681bf4ae6706 diff --git a/third-party/hawp b/third-party/hawp deleted file mode 160000 index 45bd43f7..00000000 --- a/third-party/hawp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 45bd43f704fc6252d88e06ba19d379b7a5753785 diff --git a/third-party/pytlbd b/third-party/pytlbd deleted file mode 160000 index b0c8cfce..00000000 --- a/third-party/pytlbd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0c8cfcec43ff3267804e5cdd32c9697f4f2040d