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.

Sign up for GitHub

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

Jump to bottom

grass, grass-dev: use libgomp for OpenMP support #24

Merged
merged 2 commits into from
Nov 19, 2024
Merged

grass, grass-dev: use libgomp for OpenMP support #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e444bf
grass-dev: drop usage of libomp
nilason Nov 19, 2024
cbab5ef
grass: drop usage of libomp
nilason Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/grass-dev/osgeo4w/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ pacman --noconfirm -Syu --needed \
mingw-w64-x86_64-pcre \
mingw-w64-x86_64-fftw \
mingw-w64-x86_64-openblas \
mingw-w64-x86_64-openmp \
mingw-w64-x86_64-readline

cd ../grass
Expand Down
35 changes: 4 additions & 31 deletions src/grass-dev/osgeo4w/patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
diff --git a/include/Make/Grass.make b/include/Make/Grass.make
index 137a45d19..4f26feda2 100644
--- a/include/Make/Grass.make
+++ b/include/Make/Grass.make
@@ -197,7 +197,7 @@ DSPFDEPS = $(GISLIB)
FORMDEPS = $(DBMILIB) $(GISLIB)
RASTER3DDEPS = $(RASTERLIB) $(GISLIB)
GISDEPS = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(BZIP2LIBPATH) $(BZIP2LIB) $(ZSTDLIBPATH) $(ZSTDLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
-GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OPENMP_CFLAGS) $(OPENMP_LIBPATH) $(OPENMP_LIB)
+GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) $(MATHLIB)
GPROJDEPS = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
HTMLDRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
diff --git a/include/Make/Platform.make.in b/include/Make/Platform.make.in
index a66ddf801..1f08f7771 100644
--- a/include/Make/Platform.make.in
+++ b/include/Make/Platform.make.in
@@ -228,7 +228,7 @@ USE_PTHREAD = @USE_PTHREAD@
#OpenMP
OPENMP_INCPATH = @OPENMP_INCPATH@
OPENMP_LIBPATH = @OPENMP_LIBPATH@
-OPENMP_LIB = @OPENMP_LIB@
+OPENMP_LIB = @OPENMP_CFLAGS@ @OPENMP_LIB@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
USE_OPENMP = @USE_OPENMP@

diff --git a/mswindows/osgeo4w/env.bat.tmpl b/mswindows/osgeo4w/env.bat.tmpl
index 200c86f26..86bf4a3a0 100644
--- a/mswindows/osgeo4w/env.bat.tmpl
Expand Down Expand Up @@ -52,10 +26,10 @@ index f00a136be..e8d8be2f6 100755
libdir="${prefix}/lib"
includedir="${prefix}/include/libpng${dll_version}"
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index c189cf92c..fcab3e242 100755
index c189cf92c9..fcb69a8ae3 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -108,26 +108,17 @@ exec 3>&1 > >(tee mswindows/osgeo4w/package.log) 2>&1
@@ -108,26 +108,16 @@ exec 3>&1 > >(tee mswindows/osgeo4w/package.log) 2>&1

DLLS="
/mingw64/bin/libblas.dll
Expand All @@ -78,13 +52,12 @@ index c189cf92c..fcab3e242 100755
- /mingw64/bin/libpcre-1.dll
- /mingw64/bin/libpixman-1-0.dll
- /mingw64/bin/libpng16-16.dll
+ /mingw64/bin/libomp.dll
/mingw64/bin/libquadmath-0.dll
+ /mingw64/bin/libreadline8.dll
/mingw64/bin/libstdc++-6.dll
/mingw64/bin/libsystre-0.dll
/mingw64/bin/libtre-5.dll
@@ -153,40 +144,41 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
@@ -153,40 +143,41 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then

log configure
./configure \
Expand Down Expand Up @@ -140,7 +113,7 @@ index c189cf92c..fcab3e242 100755
--with-regex \
--with-sqlite \
--with-sqlite-includes=$OSGEO4W_ROOT_MSYS/include \
@@ -248,7 +240,9 @@ if [ -n "$PACKAGE_PATCH" ]; then
@@ -248,7 +239,9 @@ if [ -n "$PACKAGE_PATCH" ]; then

# copy dependencies (TODO: to be reduced)
cp -uv $DLLS apps/grass/grass$POSTFIX/bin
Expand Down
1 change: 0 additions & 1 deletion src/grass/osgeo4w/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ pacman --noconfirm -Syu --needed \
mingw-w64-x86_64-pcre \
mingw-w64-x86_64-fftw \
mingw-w64-x86_64-lapack \
mingw-w64-x86_64-openmp \
mingw-w64-x86_64-readline

cd ../$p
Expand Down
44 changes: 10 additions & 34 deletions src/grass/osgeo4w/patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
diff -ur grass-8.4.0/include/Make/Grass.make ../grass-8.4.0/include/Make/Grass.make
--- grass-8.4.0/include/Make/Grass.make 2024-07-27 13:27:22.000000000 +0200
+++ ../grass-8.4.0/include/Make/Grass.make 2024-08-05 11:27:31.639581200 +0200
@@ -197,7 +197,7 @@
FORMDEPS = $(DBMILIB) $(GISLIB)
RASTER3DDEPS = $(RASTERLIB) $(GISLIB)
GISDEPS = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(BZIP2LIBPATH) $(BZIP2LIB) $(ZSTDLIBPATH) $(ZSTDLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
-GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OPENMP_CFLAGS) $(OPENMP_LIBPATH) $(OPENMP_LIB)
+GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) $(MATHLIB)
GPROJDEPS = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
HTMLDRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
diff -ur grass-8.4.0/include/Make/Platform.make.in ../grass-8.4.0/include/Make/Platform.make.in
--- grass-8.4.0/include/Make/Platform.make.in 2024-07-27 13:27:22.000000000 +0200
+++ ../grass-8.4.0/include/Make/Platform.make.in 2024-08-05 11:27:31.648583300 +0200
@@ -234,7 +234,7 @@
#OpenMP
OPENMP_INCPATH = @OPENMP_INCPATH@
OPENMP_LIBPATH = @OPENMP_LIBPATH@
-OPENMP_LIB = @OPENMP_LIB@
+OPENMP_LIB = @OPENMP_CFLAGS@ @OPENMP_LIB@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
USE_OPENMP = @USE_OPENMP@

diff -ur grass-8.4.0/mswindows/osgeo4w/env.bat.tmpl ../grass-8.4.0/mswindows/osgeo4w/env.bat.tmpl
--- grass-8.4.0/mswindows/osgeo4w/env.bat.tmpl 2024-07-27 13:27:22.000000000 +0200
+++ ../grass-8.4.0/mswindows/osgeo4w/env.bat.tmpl 2024-08-05 11:27:31.656582900 +0200
Expand All @@ -47,9 +23,9 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/libpng-config ../grass-8.4.0/mswindows/os
libdir="${prefix}/lib"
includedir="${prefix}/include/libpng${dll_version}"
diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo4w/package.sh
--- grass-8.4.0/mswindows/osgeo4w/package.sh 2024-07-27 13:27:22.000000000 +0200
+++ ../grass-8.4.0/mswindows/osgeo4w/package.sh 2024-08-05 11:27:31.672090000 +0200
@@ -110,29 +110,20 @@
--- grass-8.4.0/mswindows/osgeo4w/package.sh 2024-07-27 13:27:22
+++ ../grass-8.4.0/mswindows/osgeo4w/package.sh 2024-11-19 11:21:38
@@ -110,29 +110,19 @@
/mingw64/bin/zlib1.dll
/mingw64/bin/libbz2-1.dll
/mingw64/bin/libiconv-2.dll
Expand All @@ -70,7 +46,6 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo
/mingw64/bin/libgomp-1.dll
- /mingw64/bin/libgraphite2.dll
- /mingw64/bin/libpcre-1.dll
+ /mingw64/bin/libomp.dll
/mingw64/bin/libstdc++-6.dll
/mingw64/bin/libgcc_s_seh-1.dll
/mingw64/bin/libfftw3-3.dll
Expand All @@ -81,7 +56,7 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo
"

if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
@@ -148,18 +139,18 @@
@@ -148,18 +138,18 @@
cp -uv $DLLS dist.x86_64-w64-mingw32/bin

mkdir -p mswindows/osgeo4w/lib
Expand All @@ -107,7 +82,7 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo
--with-opengl=windows \
--without-x \
--with-cxx \
@@ -167,15 +158,16 @@
@@ -167,15 +157,16 @@
--enable-largefile \
--with-fftw \
--with-freetype \
Expand All @@ -130,7 +105,7 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo
--with-sqlite \
--with-sqlite-includes=$OSGEO4W_ROOT_MSYS/include \
--with-sqlite-libs=$PWD/mswindows/osgeo4w/lib \
@@ -189,10 +181,11 @@
@@ -189,10 +180,11 @@
--with-lapack-includes=/mingw64/include \
--with-openmp \
--with-cairo \
Expand All @@ -144,14 +119,15 @@ diff -ur grass-8.4.0/mswindows/osgeo4w/package.sh ../grass-8.4.0/mswindows/osgeo
--without-pdal

touch mswindows/osgeo4w/configure-stamp
@@ -248,7 +241,9 @@
@@ -248,8 +240,10 @@

# copy dependencies (TODO: to be reduced)
cp -uv $DLLS apps/grass/grass$POSTFIX/bin
- cp -uv /mingw64/etc/fonts/fonts.conf apps/grass/grass$POSTFIX/etc
+
+ # copy R batch files
+ cp -uv $SRC/mswindows/external/rbatch/* apps/grass/grass$POSTFIX/bin
+
# creating grass package
/bin/tar -cjf $PDIR/grass$PACKAGE_POSTFIX-$VERSION-$PACKAGE_PATCH.tar.bz2 \
apps/grass/grass$POSTFIX \