From c10839c53e64f25d8fa240c3881605c39de163e6 Mon Sep 17 00:00:00 2001 From: B1ueber2y Date: Sun, 24 Nov 2024 22:24:01 +0100 Subject: [PATCH 1/5] remove tp_lsd from third-party and update installation guide --- .gitmodules | 3 --- misc/install/tp_lsd.md | 1 + third-party/TP-LSD | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 160000 third-party/TP-LSD diff --git a/.gitmodules b/.gitmodules index d7ad5e3e..1d305920 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,9 +27,6 @@ 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/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/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 From bbfc62756197fa5ce5e7d7e9b69f9f2e1631401e Mon Sep 17 00:00:00 2001 From: B1ueber2y Date: Sun, 24 Nov 2024 22:26:23 +0100 Subject: [PATCH 2/5] remove lbd and update installation guide --- .gitmodules | 3 --- misc/install/lbd.md | 1 + third-party/pytlbd | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 160000 third-party/pytlbd diff --git a/.gitmodules b/.gitmodules index 1d305920..480ea96e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,9 +20,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 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/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 From 5ee1c7356be08399a3aea78932c4ba9f14bee824 Mon Sep 17 00:00:00 2001 From: B1ueber2y Date: Sun, 24 Nov 2024 22:32:13 +0100 Subject: [PATCH 3/5] put hawp as separate installation --- .gitmodules | 4 ---- README.md | 2 +- misc/install/hawpv3.md | 8 ++++++++ third-party/hawp | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 misc/install/hawpv3.md delete mode 160000 third-party/hawp diff --git a/.gitmodules b/.gitmodules index 480ea96e..de5b7884 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,10 +20,6 @@ [submodule "third-party/pytlsd"] path = third-party/pytlsd url = https://github.com/iago-suarez/pytlsd.git -[submodule "third-party/hawp"] - path = third-party/hawp - url = https://github.com/cherubicXN/hawp.git - ignore = dirty [submodule "third-party/DeepLSD"] path = third-party/DeepLSD url = https://github.com/cvg/DeepLSD.git diff --git a/README.md b/README.md index 81e57874..532919f4 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,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) +- [HAWPv3](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..ca320a90 --- /dev/null +++ b/misc/install/hawpv3.md @@ -0,0 +1,8 @@ +## HAWPv3 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 listed as a separate dependency. 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 From ac60f01568e6bb474798f29697df4118649550c8 Mon Sep 17 00:00:00 2001 From: B1ueber2y Date: Sun, 24 Nov 2024 22:33:50 +0100 Subject: [PATCH 4/5] minor update on docs --- README.md | 2 +- misc/install/hawpv3.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 532919f4..2c620d85 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,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) (separate installation needed) [[Guide](misc/install/hawpv3.md)] +- [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 index ca320a90..e1c04bae 100644 --- a/misc/install/hawpv3.md +++ b/misc/install/hawpv3.md @@ -1,8 +1,8 @@ -## HAWPv3 installation +## 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 listed as a separate dependency. +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. From d5ec878ccfe06a81315b7b57800e516747fee9d2 Mon Sep 17 00:00:00 2001 From: B1ueber2y Date: Sun, 24 Nov 2024 22:39:42 +0100 Subject: [PATCH 5/5] update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c776ad85..a1510d68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,6 @@ python-json-logger ruff==0.6.7 ./third-party/pytlsd -./third-party/hawp -e ./third-party/Hierarchical-Localization -e ./third-party/DeepLSD -e ./third-party/GlueStick