colmap · ahojnnes · Jul 28, 2023 · Jul 27, 2023 · Jul 27, 2023 · Jul 27, 2023
diff --git a/.clang-format b/.clang-format
@@ -6,7 +6,7 @@ IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:    '^"colmap'
     Priority: 1
-  - Regex:    '^"lib'
+  - Regex:    '^"thirdparty'
     Priority: 2
   - Regex:    '^<[[:alnum:]_]+>'
     Priority: 3

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -184,19 +184,13 @@ include(GenerateVersionDefinitions)
 include_directories(src)
 link_directories(${COLMAP_LINK_DIRS})
 
-add_subdirectory(src/lib)
 add_subdirectory(src/colmap)
-
+add_subdirectory(src/thirdparty)
 
 ################################################################################
 # Generate source groups for Visual Studio, XCode, etc.
 ################################################################################
 
-COLMAP_ADD_SOURCE_DIR(src/lib/LSD LIB_LSD_SRCS *.h *.c)
-COLMAP_ADD_SOURCE_DIR(src/lib/PoissonRecon LIB_POISSON_RECON_SRCS *.h *.cpp *.inl)
-COLMAP_ADD_SOURCE_DIR(src/lib/SiftGPU LIB_SIFT_GPU_SRCS *.h *.cpp *.cu)
-COLMAP_ADD_SOURCE_DIR(src/lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc)
-
 COLMAP_ADD_SOURCE_DIR(src/colmap/controllers CONTROLLERS_SRCS *.h *.cc)
 COLMAP_ADD_SOURCE_DIR(src/colmap/estimators ESTIMATORS_SRCS *.h *.cc)
 COLMAP_ADD_SOURCE_DIR(src/colmap/exe EXE_SRCS *.h *.cc)
@@ -214,15 +208,16 @@ COLMAP_ADD_SOURCE_DIR(src/colmap/tools TOOLS_SRCS *.h *.cc)
 COLMAP_ADD_SOURCE_DIR(src/colmap/ui UI_SRCS *.h *.cc)
 COLMAP_ADD_SOURCE_DIR(src/colmap/util UTIL_SRCS *.h *.cc)
 
+COLMAP_ADD_SOURCE_DIR(src/thirdparty/LSD THIRDPARTY_LSD_SRCS *.h *.c)
+COLMAP_ADD_SOURCE_DIR(src/thirdparty/PoissonRecon THIRDPARTY_POISSON_RECON_SRCS *.h *.cpp *.inl)
+COLMAP_ADD_SOURCE_DIR(src/thirdparty/SiftGPU THIRDPARTY_SIFT_GPU_SRCS *.h *.cpp *.cu)
+COLMAP_ADD_SOURCE_DIR(src/thirdparty/VLFeat THIRDPARTY_VLFEAT_SRCS *.h *.c *.tc)
+
 # Add all of the source files to a regular library target, as using a custom
 # target does not allow us to set its C++ include directories (and thus
 # intellisense can't find any of the included files).
 add_library(
     ${COLMAP_SRC_ROOT_FOLDER}
-    ${LIB_LSD_SRCS}
-    ${LIB_POISSON_RECON_SRCS}
-    ${LIB_SIFT_GPU_SRCS}
-    ${LIB_VLFEAT_SRCS}
     ${CONTROLLERS_SRCS}
     ${ESTIMATORS_SRCS}
     ${EXE_SRCS}
@@ -239,6 +234,10 @@ add_library(
     ${TOOLS_SRCS}
     ${UI_SRCS}
     ${UTIL_SRCS}
+    ${THIRDPARTY_LSD_SRCS}
+    ${THIRDPARTY_POISSON_RECON_SRCS}
+    ${THIRDPARTY_SIFT_GPU_SRCS}
+    ${THIRDPARTY_VLFEAT_SRCS}
 )
 
 # Prevent the library from being compiled automatically.
@@ -311,7 +310,7 @@ target_include_directories(
 install(
     TARGETS colmap ${COLMAP_EXPORT_LIBS}
     EXPORT colmap-targets
-    LIBRARY DESTINATION lib/)
+    LIBRARY DESTINATION thirdparty/)
 
 # Generate config and version.
 include(CMakePackageConfigHelpers)
@@ -340,7 +339,7 @@ install(
     DESTINATION include
     FILES_MATCHING PATTERN "*.h")
 install(
-    DIRECTORY src/lib
+    DIRECTORY src/thirdparty
     DESTINATION include/colmap
     FILES_MATCHING REGEX ".*[.]h|.*[.]hpp|.*[.]inl")
 

diff --git a/README.md b/README.md
@@ -91,9 +91,9 @@ License
 -------
 
 The COLMAP library is licensed under the new BSD license. Note that this text
-refers only to the license for COLMAP itself, independent of its dependencies,
-which are separately licensed. Building COLMAP with these dependencies may
-affect the resulting COLMAP license.
+refers only to the license for COLMAP itself, independent of its thirdparty
+dependencies, which are separately licensed. Building COLMAP with these
+dependencies may affect the resulting COLMAP license.
 
     Copyright (c) 2023, ETH Zurich and UNC Chapel Hill.
     All rights reserved.

diff --git a/doc/license.rst b/doc/license.rst
@@ -2,9 +2,9 @@ License
 =======
 
 The COLMAP library is licensed under the new BSD license. Note that this text
-refers only to the license for COLMAP itself, independent of its dependencies,
-which are separately licensed. Building COLMAP with these dependencies may
-affect the resulting COLMAP license.
+refers only to the license for COLMAP itself, independent of its thirdparty
+dependencies, which are separately licensed. Building COLMAP with these
+dependencies may affect the resulting COLMAP license.
 
 .. code-block:: text
 

diff --git a/src/colmap/controllers/feature_extraction.cc b/src/colmap/controllers/feature_extraction.cc
@@ -35,7 +35,7 @@
 #include "colmap/util/cuda.h"
 #include "colmap/util/misc.h"
 
-#include "lib/SiftGPU/SiftGPU.h"
+#include "thirdparty/SiftGPU/SiftGPU.h"
 
 #include <numeric>
 

diff --git a/src/colmap/controllers/feature_matching.cc b/src/colmap/controllers/feature_matching.cc
@@ -37,7 +37,7 @@
 #include "colmap/util/cuda.h"
 #include "colmap/util/misc.h"
 
-#include "lib/SiftGPU/SiftGPU.h"
+#include "thirdparty/SiftGPU/SiftGPU.h"
 
 #include <fstream>
 #include <numeric>

diff --git a/src/colmap/estimators/bundle_adjustment.cc b/src/colmap/estimators/bundle_adjustment.cc
@@ -31,15 +31,15 @@
 
 #include "colmap/estimators/bundle_adjustment.h"
 
-#include <iomanip>
-
 #include "colmap/estimators/cost_functions.h"
 #include "colmap/scene/projection.h"
 #include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/threading.h"
 #include "colmap/util/timer.h"
 
+#include <iomanip>
+
 namespace colmap {
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/src/colmap/feature/sift.cc b/src/colmap/feature/sift.cc
@@ -42,9 +42,9 @@
 #include "colmap/util/misc.h"
 #include "colmap/util/opengl_utils.h"
 
-#include "lib/SiftGPU/SiftGPU.h"
-#include "lib/VLFeat/covdet.h"
-#include "lib/VLFeat/sift.h"
+#include "thirdparty/SiftGPU/SiftGPU.h"
+#include "thirdparty/VLFeat/covdet.h"
+#include "thirdparty/VLFeat/sift.h"
 
 #include <array>
 #include <fstream>

diff --git a/src/colmap/feature/sift_test.cc b/src/colmap/feature/sift_test.cc
@@ -43,7 +43,7 @@
 #include "colmap/math/random.h"
 #include "colmap/util/opengl_utils.h"
 
-#include "lib/SiftGPU/SiftGPU.h"
+#include "thirdparty/SiftGPU/SiftGPU.h"
 
 namespace colmap {
 

diff --git a/src/colmap/image/line.cc b/src/colmap/image/line.cc
@@ -34,7 +34,7 @@
 #include "colmap/util/logging.h"
 
 extern "C" {
-#include "lib/LSD/lsd.h"
+#include "thirdparty/LSD/lsd.h"
 }
 
 namespace colmap {

diff --git a/src/colmap/image/warp.cc b/src/colmap/image/warp.cc
@@ -33,7 +33,7 @@
 
 #include "colmap/util/logging.h"
 
-#include "lib/VLFeat/imopv.h"
+#include "thirdparty/VLFeat/imopv.h"
 
 #include <Eigen/Geometry>
 

diff --git a/src/colmap/mvs/meshing.cc b/src/colmap/mvs/meshing.cc
@@ -50,8 +50,8 @@
 #include "colmap/util/threading.h"
 #include "colmap/util/timer.h"
 
-#include "lib/PoissonRecon/PoissonRecon.h"
-#include "lib/PoissonRecon/SurfaceTrimmer.h"
+#include "thirdparty/PoissonRecon/PoissonRecon.h"
+#include "thirdparty/PoissonRecon/SurfaceTrimmer.h"
 
 #if defined(COLMAP_CGAL_ENABLED)
 

diff --git a/src/colmap/sensor/bitmap.cc b/src/colmap/sensor/bitmap.cc
@@ -36,7 +36,7 @@
 #include "colmap/util/logging.h"
 #include "colmap/util/misc.h"
 
-#include "lib/VLFeat/imopv.h"
+#include "thirdparty/VLFeat/imopv.h"
 
 #include <regex>
 #include <unordered_map>

diff --git a/src/colmap/ui/render_options.h b/src/colmap/ui/render_options.h
@@ -31,10 +31,10 @@
 
 #pragma once
 
-#include <iostream>
-
 #include "colmap/util/logging.h"
 
+#include <iostream>
+
 namespace colmap {
 
 struct RenderOptions {

diff --git a/src/lib/CMakeLists.txt → src/thirdparty/CMakeLists.txt b/src/lib/CMakeLists.txt → src/thirdparty/CMakeLists.txt
diff --git a/src/lib/LSD/CMakeLists.txt → src/thirdparty/LSD/CMakeLists.txt b/src/lib/LSD/CMakeLists.txt → src/thirdparty/LSD/CMakeLists.txt
diff --git a/src/lib/LSD/LICENSE → src/thirdparty/LSD/LICENSE b/src/lib/LSD/LICENSE → src/thirdparty/LSD/LICENSE
diff --git a/src/lib/LSD/lsd.c → src/thirdparty/LSD/lsd.c b/src/lib/LSD/lsd.c → src/thirdparty/LSD/lsd.c
diff --git a/src/lib/LSD/lsd.h → src/thirdparty/LSD/lsd.h b/src/lib/LSD/lsd.h → src/thirdparty/LSD/lsd.h
diff --git a/src/lib/PoissonRecon/Allocator.h → src/thirdparty/PoissonRecon/Allocator.h b/src/lib/PoissonRecon/Allocator.h → src/thirdparty/PoissonRecon/Allocator.h
diff --git a/src/lib/PoissonRecon/Array.h → src/thirdparty/PoissonRecon/Array.h b/src/lib/PoissonRecon/Array.h → src/thirdparty/PoissonRecon/Array.h
diff --git a/src/lib/PoissonRecon/Array.inl → src/thirdparty/PoissonRecon/Array.inl b/src/lib/PoissonRecon/Array.inl → src/thirdparty/PoissonRecon/Array.inl
diff --git a/src/lib/PoissonRecon/BSplineData.h → src/thirdparty/PoissonRecon/BSplineData.h b/src/lib/PoissonRecon/BSplineData.h → src/thirdparty/PoissonRecon/BSplineData.h
diff --git a/src/lib/PoissonRecon/BSplineData.inl → src/thirdparty/PoissonRecon/BSplineData.inl b/src/lib/PoissonRecon/BSplineData.inl → src/thirdparty/PoissonRecon/BSplineData.inl
diff --git a/src/lib/PoissonRecon/BinaryNode.h → src/thirdparty/PoissonRecon/BinaryNode.h b/src/lib/PoissonRecon/BinaryNode.h → src/thirdparty/PoissonRecon/BinaryNode.h
diff --git a/src/lib/PoissonRecon/CMakeLists.txt → src/thirdparty/PoissonRecon/CMakeLists.txt b/src/lib/PoissonRecon/CMakeLists.txt → src/thirdparty/PoissonRecon/CMakeLists.txt
diff --git a/src/lib/PoissonRecon/CmdLineParser.cpp → ...thirdparty/PoissonRecon/CmdLineParser.cpp b/src/lib/PoissonRecon/CmdLineParser.cpp → ...thirdparty/PoissonRecon/CmdLineParser.cpp
diff --git a/src/lib/PoissonRecon/CmdLineParser.h → src/thirdparty/PoissonRecon/CmdLineParser.h b/src/lib/PoissonRecon/CmdLineParser.h → src/thirdparty/PoissonRecon/CmdLineParser.h
diff --git a/src/lib/PoissonRecon/CmdLineParser.inl → ...thirdparty/PoissonRecon/CmdLineParser.inl b/src/lib/PoissonRecon/CmdLineParser.inl → ...thirdparty/PoissonRecon/CmdLineParser.inl
diff --git a/src/lib/PoissonRecon/Factor.cpp → src/thirdparty/PoissonRecon/Factor.cpp b/src/lib/PoissonRecon/Factor.cpp → src/thirdparty/PoissonRecon/Factor.cpp
diff --git a/src/lib/PoissonRecon/Factor.h → src/thirdparty/PoissonRecon/Factor.h b/src/lib/PoissonRecon/Factor.h → src/thirdparty/PoissonRecon/Factor.h
diff --git a/src/lib/PoissonRecon/FunctionData.h → src/thirdparty/PoissonRecon/FunctionData.h b/src/lib/PoissonRecon/FunctionData.h → src/thirdparty/PoissonRecon/FunctionData.h
diff --git a/src/lib/PoissonRecon/FunctionData.inl → src/thirdparty/PoissonRecon/FunctionData.inl b/src/lib/PoissonRecon/FunctionData.inl → src/thirdparty/PoissonRecon/FunctionData.inl
diff --git a/src/lib/PoissonRecon/Geometry.cpp → src/thirdparty/PoissonRecon/Geometry.cpp b/src/lib/PoissonRecon/Geometry.cpp → src/thirdparty/PoissonRecon/Geometry.cpp
diff --git a/src/lib/PoissonRecon/Geometry.h → src/thirdparty/PoissonRecon/Geometry.h b/src/lib/PoissonRecon/Geometry.h → src/thirdparty/PoissonRecon/Geometry.h
diff --git a/src/lib/PoissonRecon/Geometry.inl → src/thirdparty/PoissonRecon/Geometry.inl b/src/lib/PoissonRecon/Geometry.inl → src/thirdparty/PoissonRecon/Geometry.inl
diff --git a/src/lib/PoissonRecon/Hash.h → src/thirdparty/PoissonRecon/Hash.h b/src/lib/PoissonRecon/Hash.h → src/thirdparty/PoissonRecon/Hash.h
diff --git a/src/lib/PoissonRecon/LICENSE → src/thirdparty/PoissonRecon/LICENSE b/src/lib/PoissonRecon/LICENSE → src/thirdparty/PoissonRecon/LICENSE
diff --git a/src/lib/PoissonRecon/MAT.h → src/thirdparty/PoissonRecon/MAT.h b/src/lib/PoissonRecon/MAT.h → src/thirdparty/PoissonRecon/MAT.h
diff --git a/src/lib/PoissonRecon/MAT.inl → src/thirdparty/PoissonRecon/MAT.inl b/src/lib/PoissonRecon/MAT.inl → src/thirdparty/PoissonRecon/MAT.inl
diff --git a/src/lib/PoissonRecon/MarchingCubes.cpp → ...thirdparty/PoissonRecon/MarchingCubes.cpp b/src/lib/PoissonRecon/MarchingCubes.cpp → ...thirdparty/PoissonRecon/MarchingCubes.cpp
diff --git a/src/lib/PoissonRecon/MarchingCubes.h → src/thirdparty/PoissonRecon/MarchingCubes.h b/src/lib/PoissonRecon/MarchingCubes.h → src/thirdparty/PoissonRecon/MarchingCubes.h
diff --git a/src/lib/PoissonRecon/MemoryUsage.h → src/thirdparty/PoissonRecon/MemoryUsage.h b/src/lib/PoissonRecon/MemoryUsage.h → src/thirdparty/PoissonRecon/MemoryUsage.h
diff --git a/...nRecon/MultiGridOctreeData.Evaluation.inl → ...nRecon/MultiGridOctreeData.Evaluation.inl b/...nRecon/MultiGridOctreeData.Evaluation.inl → ...nRecon/MultiGridOctreeData.Evaluation.inl
diff --git a/...nRecon/MultiGridOctreeData.IsoSurface.inl → ...nRecon/MultiGridOctreeData.IsoSurface.inl b/...nRecon/MultiGridOctreeData.IsoSurface.inl → ...nRecon/MultiGridOctreeData.IsoSurface.inl
diff --git a/...n/MultiGridOctreeData.SortedTreeNodes.inl → ...n/MultiGridOctreeData.SortedTreeNodes.inl b/...n/MultiGridOctreeData.SortedTreeNodes.inl → ...n/MultiGridOctreeData.SortedTreeNodes.inl
diff --git a/...issonRecon/MultiGridOctreeData.System.inl → ...issonRecon/MultiGridOctreeData.System.inl b/...issonRecon/MultiGridOctreeData.System.inl → ...issonRecon/MultiGridOctreeData.System.inl
diff --git a/...n/MultiGridOctreeData.WeightedSamples.inl → ...n/MultiGridOctreeData.WeightedSamples.inl b/...n/MultiGridOctreeData.WeightedSamples.inl → ...n/MultiGridOctreeData.WeightedSamples.inl
diff --git a/src/lib/PoissonRecon/MultiGridOctreeData.h → ...dparty/PoissonRecon/MultiGridOctreeData.h b/src/lib/PoissonRecon/MultiGridOctreeData.h → ...dparty/PoissonRecon/MultiGridOctreeData.h
diff --git a/src/lib/PoissonRecon/MultiGridOctreeData.inl → ...arty/PoissonRecon/MultiGridOctreeData.inl b/src/lib/PoissonRecon/MultiGridOctreeData.inl → ...arty/PoissonRecon/MultiGridOctreeData.inl
diff --git a/src/lib/PoissonRecon/MyTime.h → src/thirdparty/PoissonRecon/MyTime.h b/src/lib/PoissonRecon/MyTime.h → src/thirdparty/PoissonRecon/MyTime.h
diff --git a/src/lib/PoissonRecon/Octree.h → src/thirdparty/PoissonRecon/Octree.h b/src/lib/PoissonRecon/Octree.h → src/thirdparty/PoissonRecon/Octree.h
diff --git a/src/lib/PoissonRecon/Octree.inl → src/thirdparty/PoissonRecon/Octree.inl b/src/lib/PoissonRecon/Octree.inl → src/thirdparty/PoissonRecon/Octree.inl
diff --git a/src/lib/PoissonRecon/PPolynomial.h → src/thirdparty/PoissonRecon/PPolynomial.h b/src/lib/PoissonRecon/PPolynomial.h → src/thirdparty/PoissonRecon/PPolynomial.h
diff --git a/src/lib/PoissonRecon/PPolynomial.inl → src/thirdparty/PoissonRecon/PPolynomial.inl b/src/lib/PoissonRecon/PPolynomial.inl → src/thirdparty/PoissonRecon/PPolynomial.inl
diff --git a/src/lib/PoissonRecon/Ply.h → src/thirdparty/PoissonRecon/Ply.h b/src/lib/PoissonRecon/Ply.h → src/thirdparty/PoissonRecon/Ply.h
diff --git a/src/lib/PoissonRecon/PlyFile.cpp → src/thirdparty/PoissonRecon/PlyFile.cpp b/src/lib/PoissonRecon/PlyFile.cpp → src/thirdparty/PoissonRecon/PlyFile.cpp
diff --git a/src/lib/PoissonRecon/PointStream.h → src/thirdparty/PoissonRecon/PointStream.h b/src/lib/PoissonRecon/PointStream.h → src/thirdparty/PoissonRecon/PointStream.h
diff --git a/src/lib/PoissonRecon/PointStream.inl → src/thirdparty/PoissonRecon/PointStream.inl b/src/lib/PoissonRecon/PointStream.inl → src/thirdparty/PoissonRecon/PointStream.inl
diff --git a/src/lib/PoissonRecon/PoissonRecon.cpp → src/thirdparty/PoissonRecon/PoissonRecon.cpp b/src/lib/PoissonRecon/PoissonRecon.cpp → src/thirdparty/PoissonRecon/PoissonRecon.cpp
diff --git a/src/lib/PoissonRecon/PoissonRecon.h → src/thirdparty/PoissonRecon/PoissonRecon.h b/src/lib/PoissonRecon/PoissonRecon.h → src/thirdparty/PoissonRecon/PoissonRecon.h
diff --git a/src/lib/PoissonRecon/Polynomial.h → src/thirdparty/PoissonRecon/Polynomial.h b/src/lib/PoissonRecon/Polynomial.h → src/thirdparty/PoissonRecon/Polynomial.h
diff --git a/src/lib/PoissonRecon/Polynomial.inl → src/thirdparty/PoissonRecon/Polynomial.inl b/src/lib/PoissonRecon/Polynomial.inl → src/thirdparty/PoissonRecon/Polynomial.inl
diff --git a/src/lib/PoissonRecon/SparseMatrix.h → src/thirdparty/PoissonRecon/SparseMatrix.h b/src/lib/PoissonRecon/SparseMatrix.h → src/thirdparty/PoissonRecon/SparseMatrix.h
diff --git a/src/lib/PoissonRecon/SparseMatrix.inl → src/thirdparty/PoissonRecon/SparseMatrix.inl b/src/lib/PoissonRecon/SparseMatrix.inl → src/thirdparty/PoissonRecon/SparseMatrix.inl
diff --git a/src/lib/PoissonRecon/SurfaceTrimmer.cpp → ...hirdparty/PoissonRecon/SurfaceTrimmer.cpp b/src/lib/PoissonRecon/SurfaceTrimmer.cpp → ...hirdparty/PoissonRecon/SurfaceTrimmer.cpp
diff --git a/src/lib/PoissonRecon/SurfaceTrimmer.h → src/thirdparty/PoissonRecon/SurfaceTrimmer.h b/src/lib/PoissonRecon/SurfaceTrimmer.h → src/thirdparty/PoissonRecon/SurfaceTrimmer.h
diff --git a/src/lib/SiftGPU/CLTexImage.cpp → src/thirdparty/SiftGPU/CLTexImage.cpp b/src/lib/SiftGPU/CLTexImage.cpp → src/thirdparty/SiftGPU/CLTexImage.cpp
diff --git a/src/lib/SiftGPU/CLTexImage.h → src/thirdparty/SiftGPU/CLTexImage.h b/src/lib/SiftGPU/CLTexImage.h → src/thirdparty/SiftGPU/CLTexImage.h
diff --git a/src/lib/SiftGPU/CMakeLists.txt → src/thirdparty/SiftGPU/CMakeLists.txt b/src/lib/SiftGPU/CMakeLists.txt → src/thirdparty/SiftGPU/CMakeLists.txt
diff --git a/src/lib/SiftGPU/CuTexImage.cpp → src/thirdparty/SiftGPU/CuTexImage.cpp b/src/lib/SiftGPU/CuTexImage.cpp → src/thirdparty/SiftGPU/CuTexImage.cpp
diff --git a/src/lib/SiftGPU/CuTexImage.h → src/thirdparty/SiftGPU/CuTexImage.h b/src/lib/SiftGPU/CuTexImage.h → src/thirdparty/SiftGPU/CuTexImage.h
diff --git a/src/lib/SiftGPU/FrameBufferObject.cpp → src/thirdparty/SiftGPU/FrameBufferObject.cpp b/src/lib/SiftGPU/FrameBufferObject.cpp → src/thirdparty/SiftGPU/FrameBufferObject.cpp
diff --git a/src/lib/SiftGPU/FrameBufferObject.h → src/thirdparty/SiftGPU/FrameBufferObject.h b/src/lib/SiftGPU/FrameBufferObject.h → src/thirdparty/SiftGPU/FrameBufferObject.h
diff --git a/src/lib/SiftGPU/GLTexImage.cpp → src/thirdparty/SiftGPU/GLTexImage.cpp b/src/lib/SiftGPU/GLTexImage.cpp → src/thirdparty/SiftGPU/GLTexImage.cpp
diff --git a/src/lib/SiftGPU/GLTexImage.h → src/thirdparty/SiftGPU/GLTexImage.h b/src/lib/SiftGPU/GLTexImage.h → src/thirdparty/SiftGPU/GLTexImage.h
diff --git a/src/lib/SiftGPU/GlobalUtil.cpp → src/thirdparty/SiftGPU/GlobalUtil.cpp b/src/lib/SiftGPU/GlobalUtil.cpp → src/thirdparty/SiftGPU/GlobalUtil.cpp
diff --git a/src/lib/SiftGPU/GlobalUtil.h → src/thirdparty/SiftGPU/GlobalUtil.h b/src/lib/SiftGPU/GlobalUtil.h → src/thirdparty/SiftGPU/GlobalUtil.h
diff --git a/src/lib/SiftGPU/LICENSE → src/thirdparty/SiftGPU/LICENSE b/src/lib/SiftGPU/LICENSE → src/thirdparty/SiftGPU/LICENSE
diff --git a/src/lib/SiftGPU/LiteWindow.h → src/thirdparty/SiftGPU/LiteWindow.h b/src/lib/SiftGPU/LiteWindow.h → src/thirdparty/SiftGPU/LiteWindow.h
diff --git a/src/lib/SiftGPU/ProgramCG.cpp → src/thirdparty/SiftGPU/ProgramCG.cpp b/src/lib/SiftGPU/ProgramCG.cpp → src/thirdparty/SiftGPU/ProgramCG.cpp
diff --git a/src/lib/SiftGPU/ProgramCG.h → src/thirdparty/SiftGPU/ProgramCG.h b/src/lib/SiftGPU/ProgramCG.h → src/thirdparty/SiftGPU/ProgramCG.h
diff --git a/src/lib/SiftGPU/ProgramCL.cpp → src/thirdparty/SiftGPU/ProgramCL.cpp b/src/lib/SiftGPU/ProgramCL.cpp → src/thirdparty/SiftGPU/ProgramCL.cpp
diff --git a/src/lib/SiftGPU/ProgramCL.h → src/thirdparty/SiftGPU/ProgramCL.h b/src/lib/SiftGPU/ProgramCL.h → src/thirdparty/SiftGPU/ProgramCL.h
diff --git a/src/lib/SiftGPU/ProgramCU.cu → src/thirdparty/SiftGPU/ProgramCU.cu b/src/lib/SiftGPU/ProgramCU.cu → src/thirdparty/SiftGPU/ProgramCU.cu
diff --git a/src/lib/SiftGPU/ProgramCU.h → src/thirdparty/SiftGPU/ProgramCU.h b/src/lib/SiftGPU/ProgramCU.h → src/thirdparty/SiftGPU/ProgramCU.h
diff --git a/src/lib/SiftGPU/ProgramGLSL.cpp → src/thirdparty/SiftGPU/ProgramGLSL.cpp b/src/lib/SiftGPU/ProgramGLSL.cpp → src/thirdparty/SiftGPU/ProgramGLSL.cpp
diff --git a/src/lib/SiftGPU/ProgramGLSL.h → src/thirdparty/SiftGPU/ProgramGLSL.h b/src/lib/SiftGPU/ProgramGLSL.h → src/thirdparty/SiftGPU/ProgramGLSL.h
diff --git a/src/lib/SiftGPU/ProgramGPU.h → src/thirdparty/SiftGPU/ProgramGPU.h b/src/lib/SiftGPU/ProgramGPU.h → src/thirdparty/SiftGPU/ProgramGPU.h
diff --git a/src/lib/SiftGPU/PyramidCL.cpp → src/thirdparty/SiftGPU/PyramidCL.cpp b/src/lib/SiftGPU/PyramidCL.cpp → src/thirdparty/SiftGPU/PyramidCL.cpp
diff --git a/src/lib/SiftGPU/PyramidCL.h → src/thirdparty/SiftGPU/PyramidCL.h b/src/lib/SiftGPU/PyramidCL.h → src/thirdparty/SiftGPU/PyramidCL.h
diff --git a/src/lib/SiftGPU/PyramidCU.cpp → src/thirdparty/SiftGPU/PyramidCU.cpp b/src/lib/SiftGPU/PyramidCU.cpp → src/thirdparty/SiftGPU/PyramidCU.cpp
diff --git a/src/lib/SiftGPU/PyramidCU.h → src/thirdparty/SiftGPU/PyramidCU.h b/src/lib/SiftGPU/PyramidCU.h → src/thirdparty/SiftGPU/PyramidCU.h
diff --git a/src/lib/SiftGPU/PyramidGL.cpp → src/thirdparty/SiftGPU/PyramidGL.cpp b/src/lib/SiftGPU/PyramidGL.cpp → src/thirdparty/SiftGPU/PyramidGL.cpp
diff --git a/src/lib/SiftGPU/PyramidGL.h → src/thirdparty/SiftGPU/PyramidGL.h b/src/lib/SiftGPU/PyramidGL.h → src/thirdparty/SiftGPU/PyramidGL.h
diff --git a/src/lib/SiftGPU/ShaderMan.cpp → src/thirdparty/SiftGPU/ShaderMan.cpp b/src/lib/SiftGPU/ShaderMan.cpp → src/thirdparty/SiftGPU/ShaderMan.cpp
diff --git a/src/lib/SiftGPU/ShaderMan.h → src/thirdparty/SiftGPU/ShaderMan.h b/src/lib/SiftGPU/ShaderMan.h → src/thirdparty/SiftGPU/ShaderMan.h
diff --git a/src/lib/SiftGPU/SiftGPU.cpp → src/thirdparty/SiftGPU/SiftGPU.cpp b/src/lib/SiftGPU/SiftGPU.cpp → src/thirdparty/SiftGPU/SiftGPU.cpp
diff --git a/src/lib/SiftGPU/SiftGPU.h → src/thirdparty/SiftGPU/SiftGPU.h b/src/lib/SiftGPU/SiftGPU.h → src/thirdparty/SiftGPU/SiftGPU.h
diff --git a/src/lib/SiftGPU/SiftMatch.cpp → src/thirdparty/SiftGPU/SiftMatch.cpp b/src/lib/SiftGPU/SiftMatch.cpp → src/thirdparty/SiftGPU/SiftMatch.cpp
diff --git a/src/lib/SiftGPU/SiftMatch.h → src/thirdparty/SiftGPU/SiftMatch.h b/src/lib/SiftGPU/SiftMatch.h → src/thirdparty/SiftGPU/SiftMatch.h
diff --git a/src/lib/SiftGPU/SiftMatchCU.cpp → src/thirdparty/SiftGPU/SiftMatchCU.cpp b/src/lib/SiftGPU/SiftMatchCU.cpp → src/thirdparty/SiftGPU/SiftMatchCU.cpp
diff --git a/src/lib/SiftGPU/SiftMatchCU.h → src/thirdparty/SiftGPU/SiftMatchCU.h b/src/lib/SiftGPU/SiftMatchCU.h → src/thirdparty/SiftGPU/SiftMatchCU.h
diff --git a/src/lib/SiftGPU/SiftPyramid.cpp → src/thirdparty/SiftGPU/SiftPyramid.cpp b/src/lib/SiftGPU/SiftPyramid.cpp → src/thirdparty/SiftGPU/SiftPyramid.cpp
diff --git a/src/lib/SiftGPU/SiftPyramid.h → src/thirdparty/SiftGPU/SiftPyramid.h b/src/lib/SiftGPU/SiftPyramid.h → src/thirdparty/SiftGPU/SiftPyramid.h
diff --git a/src/lib/VLFeat/CMakeLists.txt → src/thirdparty/VLFeat/CMakeLists.txt b/src/lib/VLFeat/CMakeLists.txt → src/thirdparty/VLFeat/CMakeLists.txt
diff --git a/src/lib/VLFeat/LICENSE → src/thirdparty/VLFeat/LICENSE b/src/lib/VLFeat/LICENSE → src/thirdparty/VLFeat/LICENSE
diff --git a/src/lib/VLFeat/aib.c → src/thirdparty/VLFeat/aib.c b/src/lib/VLFeat/aib.c → src/thirdparty/VLFeat/aib.c
diff --git a/src/lib/VLFeat/aib.h → src/thirdparty/VLFeat/aib.h b/src/lib/VLFeat/aib.h → src/thirdparty/VLFeat/aib.h
diff --git a/src/lib/VLFeat/array.c → src/thirdparty/VLFeat/array.c b/src/lib/VLFeat/array.c → src/thirdparty/VLFeat/array.c
diff --git a/src/lib/VLFeat/array.h → src/thirdparty/VLFeat/array.h b/src/lib/VLFeat/array.h → src/thirdparty/VLFeat/array.h
diff --git a/src/lib/VLFeat/covdet.c → src/thirdparty/VLFeat/covdet.c b/src/lib/VLFeat/covdet.c → src/thirdparty/VLFeat/covdet.c
diff --git a/src/lib/VLFeat/covdet.h → src/thirdparty/VLFeat/covdet.h b/src/lib/VLFeat/covdet.h → src/thirdparty/VLFeat/covdet.h
diff --git a/src/lib/VLFeat/dsift.c → src/thirdparty/VLFeat/dsift.c b/src/lib/VLFeat/dsift.c → src/thirdparty/VLFeat/dsift.c
diff --git a/src/lib/VLFeat/dsift.h → src/thirdparty/VLFeat/dsift.h b/src/lib/VLFeat/dsift.h → src/thirdparty/VLFeat/dsift.h
diff --git a/src/lib/VLFeat/fisher.c → src/thirdparty/VLFeat/fisher.c b/src/lib/VLFeat/fisher.c → src/thirdparty/VLFeat/fisher.c
diff --git a/src/lib/VLFeat/fisher.h → src/thirdparty/VLFeat/fisher.h b/src/lib/VLFeat/fisher.h → src/thirdparty/VLFeat/fisher.h
diff --git a/src/lib/VLFeat/float.h → src/thirdparty/VLFeat/float.h b/src/lib/VLFeat/float.h → src/thirdparty/VLFeat/float.h
diff --git a/src/lib/VLFeat/generic.c → src/thirdparty/VLFeat/generic.c b/src/lib/VLFeat/generic.c → src/thirdparty/VLFeat/generic.c
diff --git a/src/lib/VLFeat/generic.h → src/thirdparty/VLFeat/generic.h b/src/lib/VLFeat/generic.h → src/thirdparty/VLFeat/generic.h
diff --git a/src/lib/VLFeat/getopt_long.c → src/thirdparty/VLFeat/getopt_long.c b/src/lib/VLFeat/getopt_long.c → src/thirdparty/VLFeat/getopt_long.c
diff --git a/src/lib/VLFeat/getopt_long.h → src/thirdparty/VLFeat/getopt_long.h b/src/lib/VLFeat/getopt_long.h → src/thirdparty/VLFeat/getopt_long.h
diff --git a/src/lib/VLFeat/gmm.c → src/thirdparty/VLFeat/gmm.c b/src/lib/VLFeat/gmm.c → src/thirdparty/VLFeat/gmm.c
diff --git a/src/lib/VLFeat/gmm.h → src/thirdparty/VLFeat/gmm.h b/src/lib/VLFeat/gmm.h → src/thirdparty/VLFeat/gmm.h
diff --git a/src/lib/VLFeat/heap-def.h → src/thirdparty/VLFeat/heap-def.h b/src/lib/VLFeat/heap-def.h → src/thirdparty/VLFeat/heap-def.h
diff --git a/src/lib/VLFeat/hikmeans.c → src/thirdparty/VLFeat/hikmeans.c b/src/lib/VLFeat/hikmeans.c → src/thirdparty/VLFeat/hikmeans.c
diff --git a/src/lib/VLFeat/hikmeans.h → src/thirdparty/VLFeat/hikmeans.h b/src/lib/VLFeat/hikmeans.h → src/thirdparty/VLFeat/hikmeans.h
diff --git a/src/lib/VLFeat/hog.c → src/thirdparty/VLFeat/hog.c b/src/lib/VLFeat/hog.c → src/thirdparty/VLFeat/hog.c
diff --git a/src/lib/VLFeat/hog.h → src/thirdparty/VLFeat/hog.h b/src/lib/VLFeat/hog.h → src/thirdparty/VLFeat/hog.h
diff --git a/src/lib/VLFeat/homkermap.c → src/thirdparty/VLFeat/homkermap.c b/src/lib/VLFeat/homkermap.c → src/thirdparty/VLFeat/homkermap.c
diff --git a/src/lib/VLFeat/homkermap.h → src/thirdparty/VLFeat/homkermap.h b/src/lib/VLFeat/homkermap.h → src/thirdparty/VLFeat/homkermap.h
diff --git a/src/lib/VLFeat/host.c → src/thirdparty/VLFeat/host.c b/src/lib/VLFeat/host.c → src/thirdparty/VLFeat/host.c
diff --git a/src/lib/VLFeat/host.h → src/thirdparty/VLFeat/host.h b/src/lib/VLFeat/host.h → src/thirdparty/VLFeat/host.h
diff --git a/src/lib/VLFeat/ikmeans.c → src/thirdparty/VLFeat/ikmeans.c b/src/lib/VLFeat/ikmeans.c → src/thirdparty/VLFeat/ikmeans.c
diff --git a/src/lib/VLFeat/ikmeans.h → src/thirdparty/VLFeat/ikmeans.h b/src/lib/VLFeat/ikmeans.h → src/thirdparty/VLFeat/ikmeans.h
diff --git a/src/lib/VLFeat/ikmeans_elkan.tc → src/thirdparty/VLFeat/ikmeans_elkan.tc b/src/lib/VLFeat/ikmeans_elkan.tc → src/thirdparty/VLFeat/ikmeans_elkan.tc
diff --git a/src/lib/VLFeat/ikmeans_init.tc → src/thirdparty/VLFeat/ikmeans_init.tc b/src/lib/VLFeat/ikmeans_init.tc → src/thirdparty/VLFeat/ikmeans_init.tc
diff --git a/src/lib/VLFeat/ikmeans_lloyd.tc → src/thirdparty/VLFeat/ikmeans_lloyd.tc b/src/lib/VLFeat/ikmeans_lloyd.tc → src/thirdparty/VLFeat/ikmeans_lloyd.tc
diff --git a/src/lib/VLFeat/imopv.c → src/thirdparty/VLFeat/imopv.c b/src/lib/VLFeat/imopv.c → src/thirdparty/VLFeat/imopv.c
diff --git a/src/lib/VLFeat/imopv.h → src/thirdparty/VLFeat/imopv.h b/src/lib/VLFeat/imopv.h → src/thirdparty/VLFeat/imopv.h
diff --git a/src/lib/VLFeat/imopv_sse2.c → src/thirdparty/VLFeat/imopv_sse2.c b/src/lib/VLFeat/imopv_sse2.c → src/thirdparty/VLFeat/imopv_sse2.c
diff --git a/src/lib/VLFeat/imopv_sse2.h → src/thirdparty/VLFeat/imopv_sse2.h b/src/lib/VLFeat/imopv_sse2.h → src/thirdparty/VLFeat/imopv_sse2.h
diff --git a/src/lib/VLFeat/kdtree.c → src/thirdparty/VLFeat/kdtree.c b/src/lib/VLFeat/kdtree.c → src/thirdparty/VLFeat/kdtree.c
diff --git a/src/lib/VLFeat/kdtree.h → src/thirdparty/VLFeat/kdtree.h b/src/lib/VLFeat/kdtree.h → src/thirdparty/VLFeat/kdtree.h
diff --git a/src/lib/VLFeat/kmeans.c → src/thirdparty/VLFeat/kmeans.c b/src/lib/VLFeat/kmeans.c → src/thirdparty/VLFeat/kmeans.c
diff --git a/src/lib/VLFeat/kmeans.h → src/thirdparty/VLFeat/kmeans.h b/src/lib/VLFeat/kmeans.h → src/thirdparty/VLFeat/kmeans.h
diff --git a/src/lib/VLFeat/lbp.c → src/thirdparty/VLFeat/lbp.c b/src/lib/VLFeat/lbp.c → src/thirdparty/VLFeat/lbp.c
diff --git a/src/lib/VLFeat/lbp.h → src/thirdparty/VLFeat/lbp.h b/src/lib/VLFeat/lbp.h → src/thirdparty/VLFeat/lbp.h
diff --git a/src/lib/VLFeat/liop.c → src/thirdparty/VLFeat/liop.c b/src/lib/VLFeat/liop.c → src/thirdparty/VLFeat/liop.c
diff --git a/src/lib/VLFeat/liop.h → src/thirdparty/VLFeat/liop.h b/src/lib/VLFeat/liop.h → src/thirdparty/VLFeat/liop.h
diff --git a/src/lib/VLFeat/mathop.c → src/thirdparty/VLFeat/mathop.c b/src/lib/VLFeat/mathop.c → src/thirdparty/VLFeat/mathop.c
diff --git a/src/lib/VLFeat/mathop.h → src/thirdparty/VLFeat/mathop.h b/src/lib/VLFeat/mathop.h → src/thirdparty/VLFeat/mathop.h
diff --git a/src/lib/VLFeat/mathop_avx.c → src/thirdparty/VLFeat/mathop_avx.c b/src/lib/VLFeat/mathop_avx.c → src/thirdparty/VLFeat/mathop_avx.c
diff --git a/src/lib/VLFeat/mathop_avx.h → src/thirdparty/VLFeat/mathop_avx.h b/src/lib/VLFeat/mathop_avx.h → src/thirdparty/VLFeat/mathop_avx.h
diff --git a/src/lib/VLFeat/mathop_sse2.c → src/thirdparty/VLFeat/mathop_sse2.c b/src/lib/VLFeat/mathop_sse2.c → src/thirdparty/VLFeat/mathop_sse2.c
diff --git a/src/lib/VLFeat/mathop_sse2.h → src/thirdparty/VLFeat/mathop_sse2.h b/src/lib/VLFeat/mathop_sse2.h → src/thirdparty/VLFeat/mathop_sse2.h
diff --git a/src/lib/VLFeat/mser.c → src/thirdparty/VLFeat/mser.c b/src/lib/VLFeat/mser.c → src/thirdparty/VLFeat/mser.c
diff --git a/src/lib/VLFeat/mser.h → src/thirdparty/VLFeat/mser.h b/src/lib/VLFeat/mser.h → src/thirdparty/VLFeat/mser.h
diff --git a/src/lib/VLFeat/pgm.c → src/thirdparty/VLFeat/pgm.c b/src/lib/VLFeat/pgm.c → src/thirdparty/VLFeat/pgm.c
diff --git a/src/lib/VLFeat/pgm.h → src/thirdparty/VLFeat/pgm.h b/src/lib/VLFeat/pgm.h → src/thirdparty/VLFeat/pgm.h
diff --git a/src/lib/VLFeat/qsort-def.h → src/thirdparty/VLFeat/qsort-def.h b/src/lib/VLFeat/qsort-def.h → src/thirdparty/VLFeat/qsort-def.h
diff --git a/src/lib/VLFeat/quickshift.c → src/thirdparty/VLFeat/quickshift.c b/src/lib/VLFeat/quickshift.c → src/thirdparty/VLFeat/quickshift.c
diff --git a/src/lib/VLFeat/quickshift.h → src/thirdparty/VLFeat/quickshift.h b/src/lib/VLFeat/quickshift.h → src/thirdparty/VLFeat/quickshift.h
diff --git a/src/lib/VLFeat/random.c → src/thirdparty/VLFeat/random.c b/src/lib/VLFeat/random.c → src/thirdparty/VLFeat/random.c
diff --git a/src/lib/VLFeat/random.h → src/thirdparty/VLFeat/random.h b/src/lib/VLFeat/random.h → src/thirdparty/VLFeat/random.h
diff --git a/src/lib/VLFeat/rodrigues.c → src/thirdparty/VLFeat/rodrigues.c b/src/lib/VLFeat/rodrigues.c → src/thirdparty/VLFeat/rodrigues.c
diff --git a/src/lib/VLFeat/rodrigues.h → src/thirdparty/VLFeat/rodrigues.h b/src/lib/VLFeat/rodrigues.h → src/thirdparty/VLFeat/rodrigues.h
diff --git a/src/lib/VLFeat/scalespace.c → src/thirdparty/VLFeat/scalespace.c b/src/lib/VLFeat/scalespace.c → src/thirdparty/VLFeat/scalespace.c
diff --git a/src/lib/VLFeat/scalespace.h → src/thirdparty/VLFeat/scalespace.h b/src/lib/VLFeat/scalespace.h → src/thirdparty/VLFeat/scalespace.h
diff --git a/src/lib/VLFeat/shuffle-def.h → src/thirdparty/VLFeat/shuffle-def.h b/src/lib/VLFeat/shuffle-def.h → src/thirdparty/VLFeat/shuffle-def.h
diff --git a/src/lib/VLFeat/sift.c → src/thirdparty/VLFeat/sift.c b/src/lib/VLFeat/sift.c → src/thirdparty/VLFeat/sift.c
diff --git a/src/lib/VLFeat/sift.h → src/thirdparty/VLFeat/sift.h b/src/lib/VLFeat/sift.h → src/thirdparty/VLFeat/sift.h
diff --git a/src/lib/VLFeat/slic.c → src/thirdparty/VLFeat/slic.c b/src/lib/VLFeat/slic.c → src/thirdparty/VLFeat/slic.c
diff --git a/src/lib/VLFeat/slic.h → src/thirdparty/VLFeat/slic.h b/src/lib/VLFeat/slic.h → src/thirdparty/VLFeat/slic.h
diff --git a/src/lib/VLFeat/stringop.c → src/thirdparty/VLFeat/stringop.c b/src/lib/VLFeat/stringop.c → src/thirdparty/VLFeat/stringop.c
diff --git a/src/lib/VLFeat/stringop.h → src/thirdparty/VLFeat/stringop.h b/src/lib/VLFeat/stringop.h → src/thirdparty/VLFeat/stringop.h
diff --git a/src/lib/VLFeat/svm.c → src/thirdparty/VLFeat/svm.c b/src/lib/VLFeat/svm.c → src/thirdparty/VLFeat/svm.c
diff --git a/src/lib/VLFeat/svm.h → src/thirdparty/VLFeat/svm.h b/src/lib/VLFeat/svm.h → src/thirdparty/VLFeat/svm.h
diff --git a/src/lib/VLFeat/svmdataset.c → src/thirdparty/VLFeat/svmdataset.c b/src/lib/VLFeat/svmdataset.c → src/thirdparty/VLFeat/svmdataset.c
diff --git a/src/lib/VLFeat/svmdataset.h → src/thirdparty/VLFeat/svmdataset.h b/src/lib/VLFeat/svmdataset.h → src/thirdparty/VLFeat/svmdataset.h
diff --git a/src/lib/VLFeat/vlad.c → src/thirdparty/VLFeat/vlad.c b/src/lib/VLFeat/vlad.c → src/thirdparty/VLFeat/vlad.c
diff --git a/src/lib/VLFeat/vlad.h → src/thirdparty/VLFeat/vlad.h b/src/lib/VLFeat/vlad.h → src/thirdparty/VLFeat/vlad.h