8000 Fix SIFT GPU match creation by ahojnnes · Pull Request #1757 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix SIFT GPU match creation #1757

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

Merged
merged 2 commits into from
Jan 15, 2023
Merged

Fix SIFT GPU match creation #1757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02801e4
Fix SIFT GPU match creation
ahojnnes Jan 12, 2023
6ff82f8
fix mac
ahojnnes Jan 15, 2023
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
6 changes: 5 additions & 1 deletion .azure-pipelines/build-mac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ jobs:
displayName: 'Configure and build'

- script: |
export DISPLAY=":99.0"
export QT_QPA_PLATFORM="offscreen"
Xvfb :99 &
sleep 3
cd build
ctest
ctest -E "(feature/sift_test)|(util/opengl_utils_test)|(mvs/gpu_mat_test)"
tests_pass=$?
if [ $tests_pass -ne 0 ]; then
echo "\n\n\nTests failed, rerunning with verbose output"
Expand Down
2 changes: 1 addition & 1 deletion src/feature/sift.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ bool CreateSiftGPUMatcher(const SiftMatchingOptions& match_options,
sift_match_gpu->SetLanguage(SiftMatchGPU::SIFTMATCH_GLSL);
#endif // CUDA_ENABLED

if (sift_match_gpu->VerifyContextGL() != SiftGPU::SIFTGPU_FULL_SUPPORTED) {
if (sift_match_gpu->VerifyContextGL() != 0) {
return false;
}

Expand Down
0