Skip to content

FIX: Fix compilation error due to DirectionType redifinition#2

Merged
Sunderlandkyl merged 1 commit into
SlicerRt:slicerrt-1.9.3-2022.06.15-77b40bd3from
MichaelColonel:comp-fix
Oct 17, 2022
Merged

FIX: Fix compilation error due to DirectionType redifinition#2
Sunderlandkyl merged 1 commit into
SlicerRt:slicerrt-1.9.3-2022.06.15-77b40bd3from
MichaelColonel:comp-fix

Conversation

@MichaelColonel

Copy link
Copy Markdown

@Sunderlandkyl

Copy link
Copy Markdown

Thanks!

@gregsharp

Copy link
Copy Markdown
Member

Thanks Michael. Is there an easy way for me to merge this into the gitlab repo?

@MichaelColonel

Copy link
Copy Markdown
Author

I will make a PR into gitlab repository.

@MichaelColonel

Copy link
Copy Markdown
Author

@gregsharp

Merge request in gitlab

@gregsharp

Copy link
Copy Markdown
Member

Unfortunately this breaks CUDA. I will work on an alternate solution.

@gregsharp

Copy link
Copy Markdown
Member

Apparently I cannot re-open an issue that I didn't create. But please consider it to be re-opened.

@MichaelColonel

Copy link
Copy Markdown
Author

I can't re-open it, but i can create a new pull request to revert these changes.

@gregsharp

gregsharp commented Nov 1, 2022

Copy link
Copy Markdown
Member

I have a new fix for this in 753f6ad and eeb0884. Can you check if this will work?

How can I easily make a pull request from gitlab?

@gregsharp

Copy link
Copy Markdown
Member

I think there is no need to revert, I merged yours, this will update from there.

@MichaelColonel

MichaelColonel commented Nov 2, 2022

Copy link
Copy Markdown
Author

I've checked gitlab updates, and both SlicerRT and Plastimatch were compiled successfully.
Tests are OK too.

@MichaelColonel

Copy link
Copy Markdown
Author

Update: I've only tested in Linux, and i don't have CUDA.

@MichaelColonel

Copy link
Copy Markdown
Author

How can I easily make a pull request from gitlab?

I've cherry picked these two cuda commits, and i will try to create a pull request, and eventually update SlicerRT Plastimatch cmake file.

@MichaelColonel

Copy link
Copy Markdown
Author

@gregsharp Could you check that #3 is OK, and my cherry picking is correct?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants