Remove cross-dependencies between "feature" and "matching" modules

Metric is now defined in the "feature" module.
alicevision · Jul 27, 2020 · 8f3422d · 8f3422d
1 parent f8bfcae
commit 8f3422d
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 37 deletions.
diff --git a/src/aliceVision/feature/CMakeLists.txt b/src/aliceVision/feature/CMakeLists.txt
@@ -14,9 +14,11 @@ set(features_files_headers
   Descriptor.hpp
   feature.hpp
   FeaturesPerView.hpp
+  Hamming.hpp
   ImageDescriber.hpp
   imageDescriberCommon.hpp
   KeypointSet.hpp
+  metric.hpp
   PointFeature.hpp
   Regions.hpp
   regionsFactory.hpp
@@ -88,3 +90,4 @@ endif()
 
 # Unit tests
 alicevision_add_test(features_test.cpp NAME "features" LINKS aliceVision_feature)
+alicevision_add_test(metric_test.cpp   NAME "descriptor_metric"   LINKS aliceVision_feature)
diff --git a/src/aliceVision/matching/Hamming.hpp → src/aliceVision/feature/Hamming.hpp b/src/aliceVision/matching/Hamming.hpp → src/aliceVision/feature/Hamming.hpp
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <aliceVision/matching/metric.hpp>
+#include "metric.hpp"
 
 #include <bitset>
 
@@ -29,7 +29,7 @@ typedef unsigned __int64 uint64_t;
 // For maximal performance SSE4 must be enable for builtin popcount activation.
 
 namespace aliceVision {
-namespace matching {
+namespace feature {
 
 #undef PLATFORM_64_BIT
 #undef PLATFORM_32_BIT
@@ -180,5 +180,5 @@ struct SquaredHamming
   }
 };
 
-}  // namespace matching
+}  // namespace feature
 }  // namespace aliceVision
diff --git a/src/aliceVision/feature/Regions.hpp b/src/aliceVision/feature/Regions.hpp
@@ -11,7 +11,7 @@
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/feature/PointFeature.hpp>
 #include <aliceVision/feature/Descriptor.hpp>
-#include <aliceVision/matching/metric.hpp>
+#include <aliceVision/feature/metric.hpp>
 
 #include <string>
 #include <cstddef>
@@ -152,13 +152,13 @@ struct SquaredMetric;
 template<typename T>
 struct SquaredMetric<T, ERegionType::Scalar>
 {
-  using Metric = matching::L2_Vectorized<T>;
+  using Metric = L2_Vectorized<T>;
 };
 
 template<typename T>
 struct SquaredMetric<T, ERegionType::Binary>
 {
-  using Metric = matching::SquaredHamming<T>;
+  using Metric = SquaredHamming<T>;
 };
 
 

diff --git a/src/aliceVision/matching/metric.hpp → src/aliceVision/feature/metric.hpp b/src/aliceVision/matching/metric.hpp → src/aliceVision/feature/metric.hpp
@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "aliceVision/matching/Hamming.hpp"
-#include "aliceVision/numeric/Accumulator.hpp"
+#include "Hamming.hpp"
+
+#include <aliceVision/numeric/Accumulator.hpp>
 #include <aliceVision/config.hpp>
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_SSE)
@@ -18,8 +19,9 @@
 
 #include <cstddef>
 
+
 namespace aliceVision {
-namespace matching {
+namespace feature {
 
 /// Squared Euclidean distance functor.
 template<class T>
@@ -136,5 +138,5 @@ struct L2_Vectorized<float>
 
 #endif // ALICEVISION_HAVE_SSE
 
-}  // namespace matching
+}  // namespace feature
 }  // namespace aliceVision
diff --git a/src/aliceVision/matching/metric_test.cpp → src/aliceVision/feature/metric_test.cpp b/src/aliceVision/matching/metric_test.cpp → src/aliceVision/feature/metric_test.cpp
@@ -5,7 +5,8 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "aliceVision/matching/metric.hpp"
+#include <aliceVision/feature/metric.hpp>
+
 #include <iostream>
 #include <string>
 
@@ -16,7 +17,7 @@
 
 using namespace std;
 using namespace aliceVision;
-using namespace matching;
+using namespace feature;
 
 template<typename Metric>
 typename Metric::ResultType DistanceT()

diff --git a/src/aliceVision/matching/ArrayMatcher_bruteForce.hpp b/src/aliceVision/matching/ArrayMatcher_bruteForce.hpp
@@ -7,19 +7,22 @@
 
 #pragma once
 
-#include "aliceVision/numeric/numeric.hpp"
-#include "aliceVision/matching/ArrayMatcher.hpp"
-#include "aliceVision/matching/metric.hpp"
-#include "aliceVision/stl/indexedSort.hpp"
+#include <aliceVision/numeric/numeric.hpp>
+#include <aliceVision/matching/ArrayMatcher.hpp>
+#include <aliceVision/feature/metric.hpp>
+#include <aliceVision/stl/indexedSort.hpp>
+
 #include <aliceVision/config.hpp>
+
 #include <memory>
 #include <iostream>
 
+
 namespace aliceVision {
 namespace matching {
 
 // By default compute square(L2 distance).
-template < typename Scalar = float, typename Metric = L2_Simple<Scalar> >
+template < typename Scalar = float, typename Metric = feature::L2_Simple<Scalar> >
 class ArrayMatcher_bruteForce  : public ArrayMatcher<Scalar, Metric>
 {
   public:

diff --git a/src/aliceVision/matching/ArrayMatcher_cascadeHashing.hpp b/src/aliceVision/matching/ArrayMatcher_cascadeHashing.hpp
@@ -7,9 +7,10 @@
 
 #pragma once
 
-#include "aliceVision/matching/ArrayMatcher.hpp"
-#include "aliceVision/matching/CascadeHasher.hpp"
-#include "aliceVision/matching/IndMatch.hpp"
+#include <aliceVision/feature/metric.hpp>
+#include <aliceVision/matching/ArrayMatcher.hpp>
+#include <aliceVision/matching/CascadeHasher.hpp>
+#include <aliceVision/matching/IndMatch.hpp>
 
 #include <aliceVision/system/Logger.hpp>
 
@@ -32,7 +33,7 @@ namespace matching {
 // Implementation of descriptor matching using the cascade hashing method of [1].
 // If you use this matcher, please cite the paper.
 // template Metric parameter is ignored (by default compute square(L2 distance)).
-template < typename Scalar = float, typename Metric = L2_Simple<Scalar> >
+template < typename Scalar = float, typename Metric = feature::L2_Simple<Scalar> >
 class ArrayMatcher_cascadeHashing  : public ArrayMatcher<Scalar, Metric>
 {
   public:

diff --git a/src/aliceVision/matching/CMakeLists.txt b/src/aliceVision/matching/CMakeLists.txt
@@ -10,8 +10,6 @@ set(matching_files_headers
   guidedMatching.hpp
   io.hpp
   matcherType.hpp
-  metric.hpp
-  Hamming.hpp
   CascadeHasher.hpp
   RegionsMatcher.hpp
   pairwiseAdjacencyDisplay.hpp
@@ -49,6 +47,5 @@ alicevision_add_library(aliceVision_matching
 alicevision_add_test(matching_test.cpp NAME "matching"          LINKS aliceVision_matching)
 alicevision_add_test(filters_test.cpp  NAME "matching_filters"  LINKS aliceVision_matching)
 alicevision_add_test(indMatch_test.cpp NAME "matching_indMatch" LINKS aliceVision_matching)
-alicevision_add_test(metric_test.cpp   NAME "matching_metric"   LINKS aliceVision_matching)
 
 add_subdirectory(kvld)
diff --git a/src/aliceVision/matching/CascadeHasher.hpp b/src/aliceVision/matching/CascadeHasher.hpp
@@ -7,10 +7,11 @@
 
 #pragma once
 
-#include "aliceVision/numeric/numeric.hpp"
-#include "aliceVision/matching/metric.hpp"
-#include "aliceVision/matching/IndMatch.hpp"
-#include "aliceVision/stl/DynamicBitset.hpp"
+#include <aliceVision/numeric/numeric.hpp>
+#include <aliceVision/feature/metric.hpp>
+#include <aliceVision/matching/IndMatch.hpp>
+#include <aliceVision/stl/DynamicBitset.hpp>
+
 #include <iostream>
 #include <random>
 #include <cmath>
@@ -229,7 +230,7 @@ class CascadeHasher {
     const int NN = 2
   ) const
   {
-    typedef L2_Vectorized<typename MatrixT::Scalar> MetricT;
+    typedef feature::L2_Vectorized<typename MatrixT::Scalar> MetricT;
     MetricT metric;
 
     static const int kNumTopCandidates = 10;
@@ -254,7 +255,7 @@ class CascadeHasher {
     // feature for matching (i.e., prevents duplicates).
     std::vector<bool> used_descriptor(hashed_descriptions2.hashed_desc.size());
 
-    typedef matching::Hamming<stl::dynamic_bitset::BlockType> HammingMetricType;
+    typedef feature::Hamming<stl::dynamic_bitset::BlockType> HammingMetricType;
     static const HammingMetricType metricH = {};
     for (int i = 0; i < hashed_descriptions1.hashed_desc.size(); ++i)
     {

diff --git a/src/aliceVision/matching/RegionsMatcher.cpp b/src/aliceVision/matching/RegionsMatcher.cpp
@@ -76,7 +76,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
       {
         case BRUTE_FORCE_L2:
         {
-          typedef L2_Vectorized<unsigned char> MetricT;
+          typedef feature::L2_Vectorized<unsigned char> MetricT;
           typedef ArrayMatcher_bruteForce<unsigned char, MetricT> MatcherT;
           out.reset(new matching::RegionsMatcher<MatcherT>(regions, true));
         }
@@ -89,7 +89,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
         break;
         case CASCADE_HASHING_L2:
         {
-          typedef L2_Vectorized<unsigned char> MetricT;
+          typedef feature::L2_Vectorized<unsigned char> MetricT;
           typedef ArrayMatcher_cascadeHashing<unsigned char, MetricT> MatcherT;
           out.reset(new matching::RegionsMatcher<MatcherT>(regions, true));
         }
@@ -105,7 +105,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
       {
         case BRUTE_FORCE_L2:
         {
-          typedef L2_Vectorized<float> MetricT;
+          typedef feature::L2_Vectorized<float> MetricT;
           typedef ArrayMatcher_bruteForce<float, MetricT> MatcherT;
           out.reset(new matching::RegionsMatcher<MatcherT>(regions, true));
         }
@@ -118,7 +118,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
         break;
         case CASCADE_HASHING_L2:
         {
-          typedef L2_Vectorized<float> MetricT;
+          typedef feature::L2_Vectorized<float> MetricT;
           typedef ArrayMatcher_cascadeHashing<float, MetricT> MatcherT;
           out.reset(new matching::RegionsMatcher<MatcherT>(regions, true));
         }
@@ -134,7 +134,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
       {
         case BRUTE_FORCE_L2:
         {
-          typedef L2_Vectorized<double> MetricT;
+          typedef feature::L2_Vectorized<double> MetricT;
           typedef ArrayMatcher_bruteForce<double, MetricT> MatcherT;
           out.reset(new matching::RegionsMatcher<MatcherT>(regions, true));
         }
@@ -161,7 +161,7 @@ std::unique_ptr<IRegionsMatcher> createRegionsMatcher(const feature::Regions & r
     {
       case BRUTE_FORCE_HAMMING:
       {
-        typedef Hamming<unsigned char> Metric;
+        typedef feature::Hamming<unsigned char> Metric;
         typedef ArrayMatcher_bruteForce<unsigned char, Metric> MatcherT;
         out.reset(new matching::RegionsMatcher<MatcherT>(regions, false));
       }

diff --git a/src/aliceVision/sfm/pipeline/structureFromKnownPoses/StructureEstimationFromKnownPoses.cpp b/src/aliceVision/sfm/pipeline/structureFromKnownPoses/StructureEstimationFromKnownPoses.cpp
@@ -6,8 +6,8 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "StructureEstimationFromKnownPoses.hpp"
+#include <aliceVision/feature/metric.hpp>
 #include <aliceVision/matching/IndMatch.hpp>
-#include <aliceVision/matching/metric.hpp>
 #include <aliceVision/matching/guidedMatching.hpp>
 #include <aliceVision/multiview/relativePose/FundamentalError.hpp>
 #include <aliceVision/multiview/triangulation/Triangulation.hpp>