Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
60c0b13
Add AdaptiveCpp to src/CMakeLists.txt dependency checks
Dec 26, 2025
79d0ba1
Split off directory for SYCL port and add necessary cmake plumbing
Dec 26, 2025
e514a90
Port computeOnMultiGPUs (CUDA) to computeOnMultiDevices (SYCL)
Dec 27, 2025
851a17a
Replace CUDA's float2 and float3 with sycl::vec
Dec 30, 2025
2a517a6
Port cuda/host/memory.hpp to sycl/memory.hpp
Dec 31, 2025
98bd46f
Port Refine.hpp and Sgm.hpp to SYCL (but not their respective .cpp fi…
Jan 1, 2026
ca1397b
Port DeviceMipmapImage.hpp and DeviceCache.hpp to SYCL (but not their…
Jan 2, 2026
618150b
Remove default sycl::event constructors to make queue dependencies ex…
Jan 2, 2026
627acc6
Port DepthMapEstimator to SYCL (both .cpp and .hpp)
Jan 2, 2026
b698d8a
Various bugfixes
Jan 3, 2026
d84fe66
Replace explicit sycl::vec<float, n> syntax with sycl::floatn shorthand
Jan 3, 2026
2d25821
Port depthMapUtils to SYCL (both .cpp and .hpp)
Jan 3, 2026
0142e79
Port NormalMapEstimator to SYCL (both .cpp and .hpp) and fix bugs in …
Jan 3, 2026
4834ceb
Port deviceDepthSimilarityMap.hpp to SYCL (but not cuda host code or …
Jan 4, 2026
042be2e
Port Refine to SYCL (both .cpp and .hpp)
Jan 5, 2026
c4b89ee
Port deviceSimilarityVolume.hpp to SYCL (but not cuda host code or ke…
Jan 5, 2026
f75a4c4
Port Sgm to SYCL (both .cpp and .hpp)
Jan 8, 2026
a33c5cb
Port volumeIO to SYCL (both .cpp and .hpp)
Jan 8, 2026
047e477
Cleanup: remove unnecessary cmake define, drop requirement of in-orde…
Jan 8, 2026
6d23903
Add files and CMake plumbing to port deviceSimilarityVolume Kernels
Jan 9, 2026
a300688
Port utility headers (buffer, color, SimStat, PatchPattern, CameraPar…
Jan 10, 2026
e4d8ccf
Rework how CameraParams and mipmap image sampling works
Jan 11, 2026
a89a555
Port custom PatchPattern as a reference singleton
Jan 13, 2026
298ddc8
Implement lookup, nearest sampling and linear sampling for SyclDevice…
Jan 15, 2026
c0d5ed0
Replace INFINITY macro with the more correct std::numeric_limits<floa…
Jan 18, 2026
1918d6f
Create minimal shell "accessor" objects for copying over to device, w…
Jan 18, 2026
1b10cd5
Rework memory layout of multidimensional arrays to allow easy use of …
Jan 21, 2026
68ce0c6
Pass queues by reference
Jan 23, 2026
fcb98a1
Port deviceSimilarityVolume.cpp, including all device code and interf…
Jan 25, 2026
60bc721
Port depthMapEstimantion and depthMapFiltering to be compatible with …
Jan 26, 2026
7aed5c1
Various bugfixes 2: debug statement boogaloo
Jan 28, 2026
c00cf8f
Poort DeviceCache.cpp to SYCL
Jan 30, 2026
6aeb134
Port DeviceMipmapImage.cpp to SYCL
Jan 31, 2026
9144e27
Finish device implementation of DeviceMipmapImage, along fixing some
Jan 31, 2026
3bdb8a2
Fix mismatched symbols between deviceSimilarityVolume.cpp and deviceS…
Feb 2, 2026
e40ae5d
Misc formatting cleanup and bug fixes
Feb 4, 2026
100a2e4
Rework construction, storage and destruction of Sgm and Refine object…
Feb 5, 2026
668bbcb
Swap device cache from using std::map (ordered red-black tree, logari…
Feb 5, 2026
7824a41
Consolidate all multi-dimensional array coordinate to address calcula…
Feb 5, 2026
308e579
Fix bug in DepthMapEstimator.cpp that could result in dereferencing a…
Feb 6, 2026
f3a59a1
Port deviceDepthSimilarityMap to SYCL
Feb 7, 2026
ea45053
Fix miscelanous memory access and allocation issues
Feb 8, 2026
7bdcda2
Collection of minor correctness and performance improvements (with a …
Feb 12, 2026
742de60
General cleanup while tracking down an issue (which will be fixed in …
Feb 15, 2026
81a971b
Fix mipmap images
Feb 17, 2026
2735970
General cleanup
Feb 21, 2026
b4f849e
Performance improvements
Mar 4, 2026
43b38fc
Correctness fixes. The port now produces equivalent results to the or…
Mar 9, 2026
9de43e5
Fix compile error after rebasing
Mar 11, 2026
5d19e4a
Fix CUDA build
Mar 12, 2026
9f1f18f
Correctness fixes
Mar 16, 2026
bbe35a1
Rework build and library system to allow building cuda and sycl backe…
Mar 20, 2026
deac5e3
Fix build to conform to upstream changes in depthmap
Mar 25, 2026
e9aa07d
Fix minor glitches due to having previous versions of aliceVision ins…
Mar 30, 2026
a8fbf0d
Properly break out of switch statement when selecting backend
Mar 30, 2026
e83034c
Performance: seperate kernels for computation with custom patch patte…
Mar 31, 2026
57fd435
Performance: optimize MipmapImageAccess struct
Mar 31, 2026
fe92797
Refactor DepthMapEstimator to simplify logic with the use of omp asyn…
Apr 2, 2026
bbaaf21
Performance (minor): replace loop with std::fill
Apr 2, 2026
17cb095
Performance: condense memory access of DeviceMipmapImage
Apr 2, 2026
a2c2a5b
Performance: minor tweaks
Apr 3, 2026
1948504
Fix: ensure DeviceCache is threadsafe by using locks to protect modif…
Apr 3, 2026
74c40e5
Generalize per-device logic embedded in DeviceCache to it's own PerDe…
Apr 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ if(APPLE)
else()
trilean_option(ALICEVISION_USE_CUDA "Enable CUDA" ON)
endif()
trilean_option(ALICEVISION_USE_SYCL "Enable SYCL" AUTO)
option(ALICEVISION_DEPTHMAP_BACKEND "Compile DepthMap component with support for CUDA or SYCL or both" AUTO)
trilean_option(ALICEVISION_USE_OPENCV "Enable use of OpenCV algorithms" OFF)
trilean_option(ALICEVISION_USE_OPENCV_CONTRIB "Enable use of OpenCV algorithms from extra modules" AUTO)
trilean_option(ALICEVISION_USE_USD "Enable USD" AUTO)
Expand Down Expand Up @@ -779,6 +781,21 @@ if (ALICEVISION_HAVE_CUDA)
endif()
endif()

# ==============================================================================
# SYCL/AdaptiveCpp
# ==============================================================================

if (NOT ALICEVISION_USE_SYCL STREQUAL OFF)
set(ACPP_TARGETS generic) # Use runtime compilation for selected hardware device. Supports host CPU and GPUs from NVIDIA, AMD and Intel
find_package(AdaptiveCpp)
if (AdaptiveCpp_FOUND)
set(ALICEVISION_HAVE_SYCL 1)
message(STATUS "AdaptiveCpp found.")
elseif(ALICEVISION_USE_SYCL STREQUAL ON)
message(SEND_ERROR "Failed to find AdaptiveCpp, required for SYCL compilation.")
endif()
endif()

# ==============================================================================
# SWIG
# ==============================================================================
Expand Down Expand Up @@ -992,6 +1009,7 @@ message("** Build SWIG Python binding: " ${ALICEVISION_BUILD_SWIG_BINDING})
message("** Enable code coverage generation: " ${ALICEVISION_BUILD_COVERAGE})
message("** Enable OpenMP parallelization: " ${ALICEVISION_HAVE_OPENMP})
message("** Use CUDA: " ${ALICEVISION_HAVE_CUDA})
message("** Use SYCL: " ${ALICEVISION_HAVE_SYCL})
message("** Use OpenCV SIFT features: " ${ALICEVISION_HAVE_OCVSIFT})
message("** Use PopSift feature extractor: " ${ALICEVISION_HAVE_POPSIFT})
message("** Use CCTAG markers: " ${ALICEVISION_HAVE_CCTAG})
Expand Down Expand Up @@ -1036,6 +1054,43 @@ add_subdirectory(dependencies)
# ==============================================================================
# AliceVision modules
# ==============================================================================
# Backend selection for depthmap module
set(ALICEVISION_DEPTHMAP_BACKEND_CUDA 0)
set(ALICEVISION_DEPTHMAP_BACKEND_SYCL 0)
if(ALICEVISION_DEPTHMAP_BACKEND STREQUAL "CUDA")
if(NOT ALICEVISION_HAVE_CUDA)
message(FATAL_ERROR "CUDA backend was requested for depthmap stages but could not be found!")
endif()
set(ALICEVISION_DEPTHMAP_BACKEND_CUDA 1)
set(ALICEVISION_DEPTHMAP_BACKEND_SYCL 0)
elseif(ALICEVISON_DEPTHMAP_BACKEND STREQUAL "SYCL")
if(NOT ALICEVISION_HAVE_SYCL)
message(FATAL_ERROR "SYCL backend was requested for depthmap stages but could not be found!")
endif()
set(ALICEVISION_DEPTHMAP_BACKEND_SYCL 1)
set(ALICEVISION_DEPTHMAP_BACKEND_CUDA 0)
elseif(ALICEVISION_DEPTHMAP_BACKEND STREQUAL "BOTH")
if(NOT ALICEVISION_HAVE_CUDA)
message(FATAL_ERROR "CUDA backend was requested for depthmap stages but could not be found!")
endif()
if(NOT ALICEVISION_HAVE_SYCL)
message(FATAL_ERROR "SYCL backend was requested for depthmap stages but could not be found!")
endif()
set(ALICEVISION_DEPTHMAP_BACKEND_CUDA 1)
set(ALICEVISION_DEPTHMAP_BACKEND_SYCL 1)
else() # AUTO or unrecognosied option
set(ALICEVISION_DEPTHMAP_BACKEND_CUDA ${ALICEVISION_HAVE_CUDA})
set(ALICEVISION_DEPTHMAP_BACKEND_SYCL ${ALICEVISION_HAVE_SYCL})
endif()

# Add libraries based on selected backend
set(ALICEVISION_DEPTHMAP_LIBRARY "aliceVision_depthMapCommon")
if(ALICEVISION_DEPTHMAP_BACKEND_CUDA)
list(APPEND ALICEVISION_DEPTHMAP_LIBRARY "aliceVision_depthMap_cuda")
endif()
if(ALICEVISION_DEPTHMAP_BACKEND_SYCL)
list(APPEND ALICEVISION_DEPTHMAP_LIBRARY "aliceVision_depthMap_sycl")
endif()

# Initial global target list is empty, will be added by target helper functions
set(ALICEVISION_GLOBAL_TARGET_LIST "" CACHE INTERNAL "Global list of all AliceVision targets enabled")
Expand Down
8 changes: 7 additions & 1 deletion src/aliceVision/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,15 @@ if (ALICEVISION_BUILD_MVS)
add_subdirectory(mvsUtils)
add_subdirectory(fuseCut)

if (ALICEVISION_HAVE_CUDA)
if (ALICEVISION_DEPTHMAP_BACKEND_CUDA OR ALICEVISION_DEPTHMAP_BACKEND_SYCL)
add_subdirectory(depthMapCommon)
endif()
if (ALICEVISION_DEPTHMAP_BACKEND_CUDA)
add_subdirectory(depthMap)
endif()
if(ALICEVISION_DEPTHMAP_BACKEND_SYCL)
add_subdirectory(depthMap_sycl)
endif()
endif()

if (ALICEVISION_HAVE_ONNX)
Expand Down
7 changes: 1 addition & 6 deletions src/aliceVision/depthMap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@
set(depthMap_files_headers
BufPtr.hpp
computeOnMultiGPUs.hpp
CustomPatchPatternParams.hpp
DepthMapEstimator.hpp
DepthMapParams.hpp
depthMapUtils.hpp
NormalMapEstimator.hpp
Refine.hpp
RefineParams.hpp
Sgm.hpp
SgmDepthList.hpp
SgmParams.hpp
Tile.hpp
volumeIO.hpp
)

# Sources
set(depthMap_files_sources
computeOnMultiGPUs.cpp
CustomPatchPatternParams.cpp
DepthMapEstimator.cpp
depthMapUtils.cpp
NormalMapEstimator.cpp
Expand Down Expand Up @@ -118,7 +113,7 @@ set(depthMap_cuda_files_sources
${depthMap_cuda_planeSweeping_sources}
)

alicevision_add_library(aliceVision_depthMap
alicevision_add_library(aliceVision_depthMap_cuda
USE_CUDA
SOURCES
${depthMap_files_headers}
Expand Down
47 changes: 0 additions & 47 deletions src/aliceVision/depthMap/CustomPatchPatternParams.hpp

This file was deleted.

8 changes: 4 additions & 4 deletions src/aliceVision/depthMap/DepthMapEstimator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <aliceVision/mvsUtils/mapIO.hpp>
#include <aliceVision/mvsUtils/MultiViewParams.hpp>
#include <aliceVision/depthMap/depthMapUtils.hpp>
#include <aliceVision/depthMap/DepthMapParams.hpp>
#include <aliceVision/depthMapCommon/DepthMapParams.hpp>
#include <aliceVision/depthMap/SgmDepthList.hpp>
#include <aliceVision/depthMap/Sgm.hpp>
#include <aliceVision/depthMap/Refine.hpp>
Expand All @@ -27,9 +27,9 @@ namespace depthMap {

DepthMapEstimator::DepthMapEstimator(const mvsUtils::MultiViewParams& mp,
const mvsUtils::TileParams& tileParams,
const DepthMapParams& depthMapParams,
const SgmParams& sgmParams,
const RefineParams& refineParams)
const depthMapCommon::DepthMapParams& depthMapParams,
const depthMapCommon::SgmParams& sgmParams,
const depthMapCommon::RefineParams& refineParams)
: _mp(mp),
_tileParams(tileParams),
_depthMapParams(depthMapParams),
Expand Down
18 changes: 9 additions & 9 deletions src/aliceVision/depthMap/DepthMapEstimator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <aliceVision/mvsUtils/MultiViewParams.hpp>
#include <aliceVision/mvsUtils/TileParams.hpp>
#include <aliceVision/depthMap/DepthMapParams.hpp>
#include <aliceVision/depthMap/SgmParams.hpp>
#include <aliceVision/depthMap/RefineParams.hpp>
#include <aliceVision/depthMapCommon/DepthMapParams.hpp>
#include <aliceVision/depthMapCommon/SgmParams.hpp>
#include <aliceVision/depthMapCommon/RefineParams.hpp>
#include <aliceVision/depthMap/computeOnMultiGPUs.hpp>
#include <aliceVision/depthMap/Tile.hpp>

Expand All @@ -37,9 +37,9 @@ class DepthMapEstimator : public IGPUJob
*/
DepthMapEstimator(const mvsUtils::MultiViewParams& mp,
const mvsUtils::TileParams& tileParams,
const DepthMapParams& depthMapParams,
const SgmParams& sgmParams,
const RefineParams& refineParams);
const depthMapCommon::DepthMapParams& depthMapParams,
const depthMapCommon::SgmParams& sgmParams,
const depthMapCommon::RefineParams& refineParams);

// no copy constructor
DepthMapEstimator(DepthMapEstimator const&) = delete;
Expand Down Expand Up @@ -78,9 +78,9 @@ class DepthMapEstimator : public IGPUJob

const mvsUtils::MultiViewParams& _mp; //< multi-view parameters
const mvsUtils::TileParams& _tileParams; //< tiling parameters
const DepthMapParams& _depthMapParams; //< depth map estimation parameters
const SgmParams& _sgmParams; //< parameters of Sgm process
const RefineParams& _refineParams; //< parameters of Refine process
const depthMapCommon::DepthMapParams& _depthMapParams; //< depth map estimation parameters
const depthMapCommon::SgmParams& _sgmParams; //< parameters of Sgm process
const depthMapCommon::RefineParams& _refineParams; //< parameters of Refine process
std::vector<ROI> _tileRoiList; //< depth maps region-of-interest list
};

Expand Down
2 changes: 1 addition & 1 deletion src/aliceVision/depthMap/Refine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
namespace aliceVision {
namespace depthMap {

Refine::Refine(const mvsUtils::MultiViewParams& mp, const mvsUtils::TileParams& tileParams, const RefineParams& refineParams, cudaStream_t stream)
Refine::Refine(const mvsUtils::MultiViewParams& mp, const mvsUtils::TileParams& tileParams, const depthMapCommon::RefineParams& refineParams, cudaStream_t stream)
: _mp(mp),
_tileParams(tileParams),
_refineParams(refineParams),
Expand Down
6 changes: 3 additions & 3 deletions src/aliceVision/depthMap/Refine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <aliceVision/mvsUtils/MultiViewParams.hpp>
#include <aliceVision/mvsUtils/TileParams.hpp>
#include <aliceVision/depthMap/Tile.hpp>
#include <aliceVision/depthMap/RefineParams.hpp>
#include <aliceVision/depthMapCommon/RefineParams.hpp>
#include <aliceVision/depthMap/cuda/host/memory.hpp>
#include <aliceVision/depthMap/cuda/planeSweeping/similarity.hpp>

Expand All @@ -34,7 +34,7 @@ class Refine
* @param[in] refineParams the Refine parameters
* @param[in] stream the stream for gpu execution
*/
Refine(const mvsUtils::MultiViewParams& mp, const mvsUtils::TileParams& tileParams, const RefineParams& refineParams, cudaStream_t stream);
Refine(const mvsUtils::MultiViewParams& mp, const mvsUtils::TileParams& tileParams, const depthMapCommon::RefineParams& refineParams, cudaStream_t stream);

// no default constructor
Refine() = delete;
Expand Down Expand Up @@ -101,7 +101,7 @@ class Refine

const mvsUtils::MultiViewParams& _mp; //< Multi-view parameters
const mvsUtils::TileParams& _tileParams; //< tile workflow parameters
const RefineParams& _refineParams; //< Refine parameters
const depthMapCommon::RefineParams& _refineParams; //< Refine parameters

// private members in device memory

Expand Down
4 changes: 2 additions & 2 deletions src/aliceVision/depthMap/Sgm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace depthMap {

Sgm::Sgm(const mvsUtils::MultiViewParams& mp,
const mvsUtils::TileParams& tileParams,
const SgmParams& sgmParams,
const depthMapCommon::SgmParams& sgmParams,
bool computeDepthSimMap,
bool computeNormalMap,
cudaStream_t stream)
Expand Down Expand Up @@ -187,7 +187,7 @@ void Sgm::sgmRc(const Tile& tile, const SgmDepthList& tileDepthList)
ALICEVISION_LOG_INFO(tile << "SGM depth/thickness map done.");
}

void Sgm::smoothThicknessMap(const Tile& tile, const RefineParams& refineParams)
void Sgm::smoothThicknessMap(const Tile& tile, const depthMapCommon::RefineParams& refineParams)
{
ALICEVISION_LOG_INFO(tile << "SGM Smooth thickness map.");

Expand Down
10 changes: 5 additions & 5 deletions src/aliceVision/depthMap/Sgm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <aliceVision/mvsUtils/MultiViewParams.hpp>
#include <aliceVision/mvsUtils/TileParams.hpp>
#include <aliceVision/depthMap/Tile.hpp>
#include <aliceVision/depthMap/RefineParams.hpp>
#include <aliceVision/depthMap/SgmParams.hpp>
#include <aliceVision/depthMapCommon/RefineParams.hpp>
#include <aliceVision/depthMapCommon/SgmParams.hpp>
#include <aliceVision/depthMap/SgmDepthList.hpp>
#include <aliceVision/depthMap/cuda/host/memory.hpp>
#include <aliceVision/depthMap/cuda/planeSweeping/similarity.hpp>
Expand Down Expand Up @@ -40,7 +40,7 @@ class Sgm
*/
Sgm(const mvsUtils::MultiViewParams& mp,
const mvsUtils::TileParams& tileParams,
const SgmParams& sgmParams,
const depthMapCommon::SgmParams& sgmParams,
bool computeDepthSimMap,
bool computeNormalMap,
cudaStream_t stream);
Expand Down Expand Up @@ -85,7 +85,7 @@ class Sgm
* @param[in] tile The given tile for SGM computation
* @param[in] refineParams the Refine parameters
*/
void smoothThicknessMap(const Tile& tile, const RefineParams& refineParams);
void smoothThicknessMap(const Tile& tile, const depthMapCommon::RefineParams& refineParams);

private:
// private methods
Expand Down Expand Up @@ -130,7 +130,7 @@ class Sgm

const mvsUtils::MultiViewParams& _mp; //< Multi-view parameters
const mvsUtils::TileParams& _tileParams; //< tile workflow parameters
const SgmParams& _sgmParams; //< Semi Global Matching parameters
const depthMapCommon::SgmParams& _sgmParams; //< Semi Global Matching parameters
const bool _computeDepthSimMap; //< needs to compute a final depth/sim map
const bool _computeNormalMap; //< needs to compute a final normal map

Expand Down
2 changes: 1 addition & 1 deletion src/aliceVision/depthMap/SgmDepthList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ int indexOfNearestSorted(const std::vector<float>& in_vector, const float value)
return std::distance(in_vector.begin(), it);
}

SgmDepthList::SgmDepthList(const mvsUtils::MultiViewParams& mp, const SgmParams& sgmParams, const Tile& tile)
SgmDepthList::SgmDepthList(const mvsUtils::MultiViewParams& mp, const depthMapCommon::SgmParams& sgmParams, const Tile& tile)
: _mp(mp),
_sgmParams(sgmParams),
_tile(tile)
Expand Down
6 changes: 3 additions & 3 deletions src/aliceVision/depthMap/SgmDepthList.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <aliceVision/mvsData/Pixel.hpp>
#include <aliceVision/mvsUtils/MultiViewParams.hpp>
#include <aliceVision/depthMap/SgmParams.hpp>
#include <aliceVision/depthMapCommon/SgmParams.hpp>
#include <aliceVision/depthMap/Tile.hpp>

namespace aliceVision {
Expand All @@ -26,7 +26,7 @@ class SgmDepthList
* @param[in] sgmParams the Semi Global Matching parameters
* @param[in] tile The given tile for depth list computation
*/
SgmDepthList(const mvsUtils::MultiViewParams& mp, const SgmParams& sgmParams, const Tile& tile);
SgmDepthList(const mvsUtils::MultiViewParams& mp, const depthMapCommon::SgmParams& sgmParams, const Tile& tile);

// default destructor
~SgmDepthList() = default;
Expand Down Expand Up @@ -118,7 +118,7 @@ class SgmDepthList
// private members

const mvsUtils::MultiViewParams& _mp; //< Multi-view parameters
const SgmParams& _sgmParams; //< Semi Global Matching parameters
const depthMapCommon::SgmParams& _sgmParams; //< Semi Global Matching parameters
const Tile& _tile; //< Tile for depth list computation

std::vector<float> _depths; //< R camera depth list
Expand Down
2 changes: 1 addition & 1 deletion src/aliceVision/depthMap/cuda/host/patchPattern.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
namespace aliceVision {
namespace depthMap {

void buildCustomPatchPattern(const CustomPatchPatternParams& patchParams)
void buildCustomPatchPattern(const depthMapCommon::CustomPatchPatternParams& patchParams)
{
// check at least one patch subpart
if (patchParams.subpartsParams.empty())
Expand Down
4 changes: 2 additions & 2 deletions src/aliceVision/depthMap/cuda/host/patchPattern.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#pragma once

#include <aliceVision/depthMap/CustomPatchPatternParams.hpp>
#include <aliceVision/depthMapCommon/CustomPatchPatternParams.hpp>

namespace aliceVision {
namespace depthMap {
Expand All @@ -15,7 +15,7 @@ namespace depthMap {
* @brief Build user custom patch pattern in CUDA constant memory.
* @param[in] patchParams the user custom patch pattern parameters
*/
void buildCustomPatchPattern(const CustomPatchPatternParams& patchParams);
void buildCustomPatchPattern(const depthMapCommon::CustomPatchPatternParams& patchParams);

} // namespace depthMap
} // namespace aliceVision
Loading