port master commits to dev

alpaka-group / cupla

C++ User interface for the Platform independent Library Alpaka :arrows_clockwise:

Other

37 stars 18 forks source link

port master commits to dev #176

Closed psychocoderHPC closed 4 years ago

psychocoderHPC commented 4 years ago

And #175 and #170 was wrongly merged against the master branch.

This PR Ports the master branch PR to dev.

I will clean the master by hand.

SimeonEhrig commented 4 years ago

@psychocoderHPC The mirror was broken, because of your changes in the master. So the GitLab CI was not triggered. I think, I fixed it. Can you please push again.

psychocoderHPC commented 4 years ago

Ohh dam, will do it tonight

psychocoderHPC commented 4 years ago

There was an issue with the cherry pick because the master yaml was not equal to the dev yaml. I fixed it now. CI should now pass.