search

ecmwf-ifs / ectrans

Global spherical harmonics transforms library underpinning the IFS
Apache License 2.0
17 stars 33 forks source link

Preparation for merge of GPU codepath into main branch. #102

Closed marsdeno closed 4 months ago

marsdeno commented 4 months ago

This should be cosmetic only : move original codepath to cpu directory. Should make it obvious that subsequent GPU merge does not interact with CPU codepath

samhatfield commented 4 months ago

Just a quick check but it looks good to me. I guess you copied the contents of src/trans/CMakeLists.txt verbatim to src/trans/cpu/CMakeLists.txt?

Let's see what the CI says!

marsdeno commented 4 months ago

Hmm just realized it would have been cleaner from a commit point-of-view if I'd git mv'd that file alongside the git mv of the source folders.

samhatfield commented 4 months ago

All good to me. @wdeconinck can confirm, but shouldn't this be targeting develop?

marsdeno commented 4 months ago

All good to me. @wdeconinck can confirm, but shouldn't this be targeting develop?

Duh! Absolutely right ...

marsdeno commented 4 months ago

Closing to redo properly over develop

wdeconinck commented 4 months ago

By the way, @marsdeno, git will likely give merge conflicts for every file further down when merging the gpu branch if you first move the "develop" files to a "cpu" directory because this change is applied already on the gpu branch. Best course of action will likely be to just try to merge develop in the gpu branch. I had already tried this before with the amdgpu branch.

marsdeno commented 4 months ago

@wdeconinck you have a point, that would be a pain. I can try and rebase the gpu branch over this preparation branch, and see what happens, I guess.