Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[software] remove "utils" from executables names #1318

Merged
merged 3 commits into from
Dec 21, 2022
Merged

[software] remove "utils" from executables names #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fd57dc
[software] remove "utils" from executables names
fabiencastan Dec 15, 2022
0c86385
[ci] Update SfM_quality_evaluation: renamed executable
fabiencastan Dec 19, 2022
fd8e0c6
[ci] Update SfM_quality_evaluation
fabiencastan Dec 21, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
git clone --branch master https://github.com/alicevision/SfM_quality_evaluation.git
cd SfM_quality_evaluation/
# checkout a specific commit to ensure repeatability
git checkout 130d12a0f59ebe1695dafdc42dfe109fe08407ea
git checkout 36e3bf2d05c64d1726cb4a0e770923794f203f98
export LD_LIBRARY_PATH=$PWD/../../../AV_install/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
echo "ldd aliceVision_cameraInit"
ldd $PWD/../../../AV_install/bin/aliceVision_cameraInit
Expand Down
50 changes: 25 additions & 25 deletions src/software/utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set(FOLDER_SOFTWARE_UTILS "Software/Utils")


if(ALICEVISION_HAVE_CUDA)
alicevision_add_software(aliceVision_utils_hardwareResources
alicevision_add_software(aliceVision_hardwareResources
SOURCE main_hardwareResources.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -18,7 +18,7 @@ endif()
if(ALICEVISION_BUILD_SFM)
# Uncertainty
if(ALICEVISION_HAVE_UNCERTAINTYTE)
alicevision_add_software(aliceVision_utils_computeUncertainty
alicevision_add_software(aliceVision_computeUncertainty
SOURCE main_computeUncertainty.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_sfm
Expand All @@ -36,7 +36,7 @@ if(ALICEVISION_HAVE_UNCERTAINTYTE)
# message(warning "CUDA_cusparse_LIBRARY: ${CUDA_cusparse_LIBRARY}")
endif()

alicevision_add_software(aliceVision_utils_imageProcessing
alicevision_add_software(aliceVision_imageProcessing
SOURCE main_imageProcessing.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -49,10 +49,10 @@ alicevision_add_software(aliceVision_utils_imageProcessing
)

if(ALICEVISION_HAVE_OPENCV)
target_link_libraries(aliceVision_utils_imageProcessing_exe PRIVATE ${OpenCV_LIBS})
target_link_libraries(aliceVision_imageProcessing_exe PRIVATE ${OpenCV_LIBS})
endif()

alicevision_add_software(aliceVision_utils_importMiddlebury
alicevision_add_software(aliceVision_importMiddlebury
SOURCE main_importMiddlebury.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS
Expand All @@ -65,7 +65,7 @@ alicevision_add_software(aliceVision_utils_importMiddlebury
)

# Voctree creation
alicevision_add_software(aliceVision_utils_voctreeCreation
alicevision_add_software(aliceVision_voctreeCreation
SOURCE main_voctreeCreation.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_voctree
Expand All @@ -77,7 +77,7 @@ alicevision_add_software(aliceVision_utils_voctreeCreation
)

# Voctree query utility
alicevision_add_software(aliceVision_utils_voctreeQueryUtility
alicevision_add_software(aliceVision_voctreeQueryUtility
SOURCE main_voctreeQueryUtility.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_voctree
Expand All @@ -91,7 +91,7 @@ alicevision_add_software(aliceVision_utils_voctreeQueryUtility
)

# Voctree statistics
alicevision_add_software(aliceVision_utils_voctreeStatistics
alicevision_add_software(aliceVision_voctreeStatistics
SOURCE main_voctreeStatistics.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_voctree
Expand All @@ -103,7 +103,7 @@ alicevision_add_software(aliceVision_utils_voctreeStatistics
)

# Frustrum filtering
alicevision_add_software(aliceVision_utils_frustumFiltering
alicevision_add_software(aliceVision_frustumFiltering
SOURCE main_frustumFiltering.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -118,7 +118,7 @@ alicevision_add_software(aliceVision_utils_frustumFiltering

# Transform rig
if(ALICEVISION_HAVE_ALEMBIC)
alicevision_add_software(aliceVision_utils_rigTransform
alicevision_add_software(aliceVision_rigTransform
SOURCE main_rigTransform.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_sfmData
Expand All @@ -134,7 +134,7 @@ endif()

# SfM quality evaluation
# - quality comparison against a GT camera path (MultiView Evaluation dataset)
alicevision_add_software(aliceVision_utils_qualityEvaluation
alicevision_add_software(aliceVision_qualityEvaluation
SOURCE main_qualityEvaluation.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -146,7 +146,7 @@ alicevision_add_software(aliceVision_utils_qualityEvaluation
)

# SfM alignment
alicevision_add_software(aliceVision_utils_sfmAlignment
alicevision_add_software(aliceVision_sfmAlignment
SOURCE main_sfmAlignment.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -158,7 +158,7 @@ alicevision_add_software(aliceVision_utils_sfmAlignment
)

# SfM transfer
alicevision_add_software(aliceVision_utils_sfmTransfer
alicevision_add_software(aliceVision_sfmTransfer
SOURCE main_sfmTransfer.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -170,7 +170,7 @@ alicevision_add_software(aliceVision_utils_sfmTransfer
)

# SfM transform
alicevision_add_software(aliceVision_utils_sfmTransform
alicevision_add_software(aliceVision_sfmTransform
SOURCE main_sfmTransform.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -182,7 +182,7 @@ alicevision_add_software(aliceVision_utils_sfmTransform
)

# SfM color harmonize
alicevision_add_software(aliceVision_utils_sfmColorHarmonize
alicevision_add_software(aliceVision_sfmColorHarmonize
SOURCE main_sfmColorHarmonize.cpp
sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp # TODO
FOLDER ${FOLDER_SOFTWARE_UTILS}
Expand All @@ -204,7 +204,7 @@ alicevision_add_software(aliceVision_utils_sfmColorHarmonize
)

# SfM localization
alicevision_add_software(aliceVision_utils_sfmLocalization
alicevision_add_software(aliceVision_sfmLocalization
SOURCE main_sfmLocalization.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -218,7 +218,7 @@ alicevision_add_software(aliceVision_utils_sfmLocalization

# Keyframe selection
# - export keyframes from video files / image sequence directories
alicevision_add_software(aliceVision_utils_keyframeSelection
alicevision_add_software(aliceVision_keyframeSelection
SOURCE main_keyframeSelection.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -230,7 +230,7 @@ alicevision_add_software(aliceVision_utils_keyframeSelection


# Print distances between 3D objects
alicevision_add_software(aliceVision_utils_sfmDistances
alicevision_add_software(aliceVision_sfmDistances
SOURCE main_sfmDistances.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_sfm
Expand All @@ -241,7 +241,7 @@ alicevision_add_software(aliceVision_utils_sfmDistances
)

# Split 360 images in input in order to export square images
alicevision_add_software(aliceVision_utils_split360Images
alicevision_add_software(aliceVision_split360Images
SOURCE main_split360Images.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -255,7 +255,7 @@ alicevision_add_software(aliceVision_utils_split360Images


# Project 180° fisheye images into equirectangular
alicevision_add_software(aliceVision_utils_fisheyeProjection
alicevision_add_software(aliceVision_fisheyeProjection
SOURCE main_fisheyeProjection.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -266,7 +266,7 @@ alicevision_add_software(aliceVision_utils_fisheyeProjection
)

# Lighting estimation from picture, albedo and geometry
alicevision_add_software(aliceVision_utils_lightingEstimation
alicevision_add_software(aliceVision_lightingEstimation
SOURCE main_lightingEstimation.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -281,7 +281,7 @@ alicevision_add_software(aliceVision_utils_lightingEstimation


# Lighting estimation from picture, albedo and geometry
alicevision_add_software(aliceVision_utils_generateSampleScene
alicevision_add_software(aliceVision_generateSampleScene
SOURCE main_generateSampleScene.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -295,7 +295,7 @@ alicevision_add_software(aliceVision_utils_generateSampleScene

# Perform color chart detection
if(ALICEVISION_HAVE_OPENCV_CONTRIB)
alicevision_add_software(aliceVision_utils_colorCheckerDetection
alicevision_add_software(aliceVision_colorCheckerDetection
SOURCE main_colorCheckerDetection.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -311,7 +311,7 @@ endif()

# Perform color correction
if(ALICEVISION_HAVE_OPENCV_CONTRIB)
alicevision_add_software(aliceVision_utils_colorCheckerCorrection
alicevision_add_software(aliceVision_colorCheckerCorrection
SOURCE main_colorCheckerCorrection.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand All @@ -329,7 +329,7 @@ endif() # ALICEVISION_BUILD_SFM
if(ALICEVISION_BUILD_MVS)

# Merge two meshes
alicevision_add_software(aliceVision_utils_mergeMeshes
alicevision_add_software(aliceVision_mergeMeshes
SOURCE main_mergeMeshes.cpp
FOLDER ${FOLDER_SOFTWARE_UTILS}
LINKS aliceVision_system
Expand Down