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.

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

[workspace] Upgrade vtk_internal to latest commit #21799

Merged
merged 7 commits into from
Aug 22, 2024

Conversation

BetsyMcPhail
Copy link
Contributor

@BetsyMcPhail BetsyMcPhail commented Aug 8, 2024

  • Remove patches that have been upstreamed to VTK.
  • Add more printouts when verbose mode has been enabled.
  • Prune out some new dependencies that cause trouble / waste.
  • Adjust image loading to avoid a VTK segfault.

The commit message subject line should be the PR title.

The commit message body should be the text from the above stanza.

Towards #21759.


This change is Reviewable

@BetsyMcPhail BetsyMcPhail mentioned this pull request Aug 8, 2024
8 tasks
@jwnimmer-tri jwnimmer-tri self-assigned this Aug 12, 2024
Remove patches that have been upstreamed to VTK.
@jwnimmer-tri
Copy link
Collaborator

I'll take this one over. There's more subtle work involved than just disabling the patches. We also need to trim some deps.

@jwnimmer-tri
Copy link
Collaborator

jwnimmer-tri commented Aug 12, 2024

For the record, here's the VTK segfault this works around:

[ RUN      ] ImageIoTest.LoadNoSuchFileError
ERROR: In vtkExecutive.cxx, line 729
vtkCompositeDataPipeline (0x555555d6fb00): Algorithm vtkPNGReader (0x555555d6e2c0) returned failure for request: vtkInformation (0x555555d780a0)
  Debug: Off
  Modified Time: 2331
  Reference Count: 1
  Registered Events: (none)
  Request: REQUEST_INFORMATION
  ALGORITHM_AFTER_FORWARD: 1
  FORWARD_DIRECTION: 0
Segmentation fault

Stack:

Program received signal SIGSEGV, Segmentation fault.
0x0000555555728524 in drake_vendor::vtkStructuredData::SetExtent(int const*, int*) ()
(gdb) bt
#0  0x0000555555728524 in drake_vendor::vtkStructuredData::SetExtent(int const*, int*) ()
#1  0x00005555557bc61f in drake_vendor::vtkImageData::SetExtent(int*) ()
#2  0x00005555556dcd38 in drake_vendor::vtkImageAlgorithm::AllocateOutputData(drake_vendor::vtkImageData*, drake_vendor::vtkInformation*, int*) ()
#3  0x00005555556dcff9 in drake_vendor::vtkImageAlgorithm::AllocateOutputData(drake_vendor::vtkDataObject*, drake_vendor::vtkInformation*) ()
#4  0x00005555556b375e in drake_vendor::vtkPNGReader::ExecuteDataWithInformation(drake_vendor::vtkDataObject*, drake_vendor::vtkInformation*) ()
#5  0x00005555556dd17c in drake_vendor::vtkImageAlgorithm::RequestData(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#6  0x00005555556ddeb6 in drake_vendor::vtkImageAlgorithm::ProcessRequest(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#7  0x00005555556dae5a in drake_vendor::vtkExecutive::CallAlgorithm(drake_vendor::vtkInformation*, int, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#8  0x00005555556d43f5 in drake_vendor::vtkDemandDrivenPipeline::ExecuteData(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#9  0x00005555556d7af2 in drake_vendor::vtkDemandDrivenPipeline::ProcessRequest(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#10 0x00005555556e0bc9 in drake_vendor::vtkStreamingDemandDrivenPipeline::ProcessRequest(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#11 0x00005555556d0f45 in drake_vendor::vtkCompositeDataPipeline::ForwardUpstream(drake_vendor::vtkInformation*) ()
#12 0x00005555556d783c in drake_vendor::vtkDemandDrivenPipeline::ProcessRequest(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#13 0x00005555556e0bc9 in drake_vendor::vtkStreamingDemandDrivenPipeline::ProcessRequest(drake_vendor::vtkInformation*, drake_vendor::vtkInformationVector**, drake_vendor::vtkInformationVector*) ()
#14 0x00005555556d5dd6 in drake_vendor::vtkDemandDrivenPipeline::UpdateData(int) ()
#15 0x00005555556e2393 in drake_vendor::vtkStreamingDemandDrivenPipeline::Update(int, drake_vendor::vtkInformationVector*) ()
#16 0x00005555556644fe in drake::systems::sensors::ImageIo::MakeLoaderTools(std::variant<std::filesystem::__cxx11::path const*, drake::systems::sensors::ImageIo::ByteSpan>, std::optional<drake::systems::sensors::ImageFileFormat>) const ()
#17 0x00005555556648d0 in drake::systems::sensors::ImageIo::LoadMetadataImpl(std::variant<std::filesystem::__cxx11::path const*, drake::systems::sensors::ImageIo::ByteSpan>) const ()
#18 0x000055555565bf14 in drake::systems::sensors::internal::(anonymous namespace)::ImageIoTest_LoadNoSuchFileError_Test::TestBody() ()

@jwnimmer-tri jwnimmer-tri added status: single reviewer ok https://drake.mit.edu/reviewable.html release notes: fix This pull request contains fixes (no new features) labels Aug 22, 2024
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1, 1 of 3 files at r2, 2 of 2 files at r3, all commit messages.
Reviewable status: LGTM missing from assignee jwnimmer-tri(platform), commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @BetsyMcPhail)

@jwnimmer-tri
Copy link
Collaborator

+@xuchenhan-tri for both reviews per schedule, please.

Copy link
Contributor

@xuchenhan-tri xuchenhan-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FTR I'm not familiar with the what we need or don't need when building VTK. Please find an additional reviewer if you want more scrutiny on that.

Otherwise :lgtm:

Reviewed 4 of 4 files at r1, 1 of 3 files at r2, 2 of 2 files at r3, all commit messages.
Reviewable status: commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @BetsyMcPhail)

@jwnimmer-tri
Copy link
Collaborator

Thanks, I'm okay with just your review. The rule of thumb is that when CI is passing, then everything we need is being correctly built.

@jwnimmer-tri jwnimmer-tri merged commit e9102a8 into RobotLocomotion:master Aug 22, 2024
8 of 9 checks passed
@jwnimmer-tri jwnimmer-tri added the status: squashing now https://drake.mit.edu/reviewable.html#curated-commits label Aug 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: low release notes: fix This pull request contains fixes (no new features) status: single reviewer ok https://drake.mit.edu/reviewable.html status: squashing now https://drake.mit.edu/reviewable.html#curated-commits
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants