win: patch from OSGeo4W applied #4121
Conversation
|
A dependency yet missing? From the CI log: |
Not a dependency, but https://github.com/OSGeo/grass/blob/main/mswindows/osgeo4w/libpng-config (see #2679). |
Add basic tests for GeoPackage and Shapefile export which use import to test the result (so they test round trip but focus on the export).
This reverts commit 42ef646.
|
Note that build_osgeo4w.sh and osgeo4w.yml are GRASS things, that are not used in osgeo4w - they were just aligned with package.sh, which actually is. |
|
After reintroducing mingw-w64-x86_64-libpng the CI pass successfully. @jef-n Please could you elaborate why you are removing this dependency in the workflow (https://github.com/jef-n/OSGeo4W/blob/master/src/grass/osgeo4w/patch#L9)? On the other side it's installed in |
um, osgeo4w has libpng. not sure why it was only removed from build_osgeo4w.sh. As said I don't use that. Maybe I wanted to replace msys libpng with's OSGeo4W's png, replaced it in both and failed to re-add it in build_osgeo4w.sh, when I found that it was not working. But I don't recall… In OSGeo4W it's just a patch to an unused file ;) |
…geo4w's libpng (refs OSGeo/grass#4121)
|
There was a change in libpng that broke our copy of libpng-config - adapted. |
|
Any idea why osgeo4w CI is failing on tests while compilation is successful? It seems to be unrelated to this PR... |
|
There were a lot more failed files, like 58% of files passed, instead of 81% |
github-actions
bot
added
GUI
|
I solved the conflicts by sorting the two conflicting files of the PR in same way as #4563, then comparing the two sides of the merge making sure changes present in the PR (on GitHub) were still present even if moved. It was all ok, nothing is lost. |
I've reread on a fresh mind. Isn't libomp the llvm OpenMP runtime library (https://packages.msys2.org/packages/mingw-w64-x86_64-openmp, files section at the very end of https://packages.msys2.org/packages/mingw-w64-x86_64-llvm-openmp) And libgomp the gcc OpenMP library (And libiomp the intel OpenMP one, not in msys2). So, following the often linked advice that multiple OpenMP runtimes shouldn't be mixed (https://cpufun.substack.com/p/is-mixing-openmp-runtimes-safe), and that we are using the gcc toolchain, I think we should be removing all references to libomp.dll, and go all-in with libgomp-1.dll, and work until fixing all the issues. |
|
I've implemented the suggested changes here: echoix#285 But since our CI doesn't use the package.sh script, I've reimplemented the patches that I've been waiting and wanting to do after this PR is merged here: echoix#286 It showed that we were missing some dlls for lapack and libblas. I didn't find (only on my phone) what branch I had solved the issue that the msys2 couldn't run the Linux print_versions.sh, where some extra paths need to be added so an msys2 shell finds inside the OSGeo4W install. At least, in these CI runs, it uploads the compiled package that can be downloaded and installed with the OSGeo4W installer (pointing the download dir to a dir with the package from the artifact) for local testing. We could test if the two or three bugs with OpenMP linked are solved by that |
|
OpenMP related fix (hopefully) is added with jef-n/OSGeo4W@06d4d83 and jef-n/OSGeo4W@c678c71. |
|
Conflicts to solve |
nilason
removed
the
backport to 8.4
|
OpenBLAS issue for main has been addressed with 9984205, which doesn't need to backport. OpenMP issues have been addressed (as mentioned above), but doesn't need changes in GRASS source (and thus no need to backport). I removed backport label for this PR, as the build issues have likely been addressed. |
|
@landam Could you please check if the win build server is working, as there has been no build log since end of |
|
I'm still processing the changed patch 16 hours ago in the OSGeo4W repo |
|
In the last commit I'm keeping (for now) the |
There was a problem hiding this comment.
I've gone through the remaining conversations to resolve. Like I mention in these, I would really like to have this finished, so I could resume some other work that I rebased on this (as a couple weeks before this PR I already did a similar effort and continued on this), but I've been waiting 4 months since. Recently we solved one of the blockers, so there's not much left to think here.
…ent-specific packages
The dll files are copied with the following line, which doesn't need to use that list anymore # copy dependencies cp -uv $(/usr/bin/find apps/grass/grass$POSTFIX -iname "*.dll" -o -iname "*.exe" | PATH=$PWD/apps/grass/grass$POSTFIX/lib:$PWD/bin:/mingw64/bin:/usr/bin /usr/bin/xargs /usr/bin/ldd | /usr/bin/sed -ne 's#^.* => \(/mingw64/bin/.*\) (.*)$#\1#p' | /usr/bin/sort -u) apps/grass/grass$POSTFIX/bin
|
Thanks for checking all these improvements. |
|
@jef-n The daily grass-dev builds seems to have stopped after this got merged, no new builds were made since december 15, 2024. I wanted to let you know |
This PR applies https://github.com/jef-n/OSGeo4W/blob/master/src/grass/osgeo4w/patch (author: @jef-n)