Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cd853a6270 | |||
| 2beb3cfbc9 | |||
| c8542bd70d | |||
| f84990e906 |
22
BUILD.md
22
BUILD.md
@ -441,7 +441,7 @@ you may have additional hurdles to using the newest versions of clang.
|
||||
| Name | Location
|
||||
|-----------------------|------------------------
|
||||
| [MESA][page mesa] | [download][link mesa] or [older 13][link mesa13], [older 11][link mesa11]
|
||||
| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56], [paraview-55][link ParaView55] or [binaries][download ParaView]
|
||||
| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56] or [binaries][download ParaView]
|
||||
| [Qt][page Qt] | [QT5][link Qt5] for ParaView-5.3.0 and later, or the [older qt-56][link Qt56] for older systems.
|
||||
|
||||
|
||||
@ -530,9 +530,9 @@ easier to use `grep` and find the relevant pages and links.
|
||||
|
||||
[page scotch]: https://www.labri.fr/perso/pelegrin/scotch/
|
||||
[repo scotch]: https://gitlab.inria.fr/scotch/scotch
|
||||
[link scotch61]: https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
|
||||
[link scotch]: https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
|
||||
[link scotch60_10]: https://gforge.inria.fr/frs/download.php/file/38350/scotch_6.0.10.tar.gz
|
||||
[link scotch]: https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz
|
||||
[link scotch60_9]: https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz
|
||||
[older scotch]: https://gforge.inria.fr/frs/download.php/file/38114/scotch_6.0.8.tar.gz
|
||||
[oldest scotch]: https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
|
||||
|
||||
@ -548,10 +548,10 @@ easier to use `grep` and find the relevant pages and links.
|
||||
[link openmpi]: https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.tar.bz2
|
||||
|
||||
[page mpich]: http://www.mpich.org/
|
||||
[link mpich]: http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz
|
||||
[link mpich]: http://www.mpich.org/static/downloads/3.4.2/mpich-3.4.2.tar.gz
|
||||
|
||||
[page mvpapich]: http://mvapich.cse.ohio-state.edu/
|
||||
[link mvpapich]: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.tar.gz
|
||||
[link mvpapich]: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.6.tar.gz
|
||||
|
||||
<!-- general -->
|
||||
[page cmake]: http://www.cmake.org/
|
||||
@ -567,7 +567,7 @@ easier to use `grep` and find the relevant pages and links.
|
||||
[link FFTW]: http://www.fftw.org/fftw-3.3.7.tar.gz
|
||||
|
||||
[page petsc]: https://www.mcs.anl.gov/petsc/
|
||||
[link petsc]: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.14.2.tar.gz
|
||||
[link petsc]: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.15.0.tar.gz
|
||||
|
||||
[page hypre]: https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/
|
||||
[repo hypre]: https://github.com/hypre-space/hypre/
|
||||
@ -589,9 +589,11 @@ easier to use `grep` and find the relevant pages and links.
|
||||
[page ParaView]: http://www.paraview.org/
|
||||
[download ParaView]: https://www.paraview.org/download/
|
||||
[link ParaView54]: http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz
|
||||
[link ParaView55]: http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz
|
||||
[link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.gz
|
||||
[link ParaView]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.gz
|
||||
[link ParaView55]: http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.xz
|
||||
[link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.xz
|
||||
[link ParaView57]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.xz
|
||||
[link ParaView58]: http://www.paraview.org/files/v5.8/ParaView-v5.8.1.tar.xz
|
||||
[link ParaView]: http://www.paraview.org/files/v5.9/ParaView-v5.9.1.tar.xz
|
||||
|
||||
[page mesa]: http://mesa3d.org/
|
||||
[link mesa]: ftp://ftp.freedesktop.org/pub/mesa/mesa-17.1.1.tar.xz
|
||||
@ -605,4 +607,4 @@ easier to use `grep` and find the relevant pages and links.
|
||||
|
||||
---
|
||||
|
||||
Copyright 2016-2020 OpenCFD Ltd
|
||||
Copyright 2016-2021 OpenCFD Ltd
|
||||
|
||||
@ -11,7 +11,7 @@ any third-party compilation.
|
||||
|
||||
For general functionality, the paraview version distributed with
|
||||
the operating system or a [binary package][download ParaView]
|
||||
is likely adequate for your needs.
|
||||
is likely [fully adequate for your needs][FAQ ParaView].
|
||||
|
||||
|
||||
***Please help us with keeping the information here up-to-date and accurate.***
|
||||
@ -28,11 +28,11 @@ sudo apt install paraview-dev
|
||||
```
|
||||
Depending on your setup, the following subset may also be enough:
|
||||
```
|
||||
sudo apt install cmake qt5base-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev
|
||||
sudo apt install cmake qtbase5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev
|
||||
```
|
||||
|
||||
|
||||
### openSUSE
|
||||
### openSUSE (eg, Leap-15.2)
|
||||
|
||||
The full dependency list for building ParaView can be found from the
|
||||
corresponding [rpm spec][suse spec] file.
|
||||
@ -46,8 +46,8 @@ sudo zypper install paraview-devel
|
||||
Depending on your setup, the following subset may also be enough:
|
||||
```
|
||||
sudo zypper install Mesa-libEGL-devel
|
||||
sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras
|
||||
sudo zypper install libXt-devel
|
||||
sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras-devel
|
||||
sudo zypper install libxcb-devel libXt-devel
|
||||
```
|
||||
|
||||
|
||||
@ -56,6 +56,7 @@ sudo zypper install libXt-devel
|
||||
[download ParaView]: https://www.paraview.org/download/
|
||||
[debian control]: https://salsa.debian.org/science-team/paraview/-/blob/master/debian/control
|
||||
[suse spec]: https://build.opensuse.org/package/view_file/science/paraview/paraview.spec
|
||||
[FAQ ParaView]: https://discourse.paraview.org/t/i-want-to-visualize-my-openfoam-simulation-results-with-paraview-but-im-confused-which-version-should-i-use
|
||||
|
||||
|
||||
<!-- OpenFOAM -->
|
||||
@ -69,4 +70,4 @@ sudo zypper install libXt-devel
|
||||
[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
|
||||
|
||||
---
|
||||
Copyright 2019-2020 OpenCFD Ltd
|
||||
Copyright 2019-2021 OpenCFD Ltd
|
||||
|
||||
13
SOURCES.txt
13
SOURCES.txt
@ -1,5 +1,18 @@
|
||||
Third-party software versions for recent OpenFOAM versions
|
||||
|
||||
OpenFOAM-2106
|
||||
---------------
|
||||
|
||||
ADIOS-2.6.0
|
||||
CGAL-4.12.2
|
||||
ParaView-5.9.1 *update*
|
||||
boost_1_66_0
|
||||
fftw-3.3.7
|
||||
openmpi-4.0.3
|
||||
scotch_6.1.0 *update*
|
||||
kahip-2.12
|
||||
|
||||
|
||||
OpenFOAM-2012
|
||||
---------------
|
||||
|
||||
|
||||
48
etc/patches/scotch_6.1.0
Normal file
48
etc/patches/scotch_6.1.0
Normal file
@ -0,0 +1,48 @@
|
||||
--- scotch_6.0.6/src/libscotch/Makefile.orig 2019-04-29 14:59:53.957103493 +0200
|
||||
+++ scotch_6.0.6/src/libscotch/Makefile 2019-04-29 18:50:42.560080675 +0200
|
||||
@@ -51,6 +51,12 @@
|
||||
|
||||
.PHONY : ptscotch scotch ptinstall install clean realclean
|
||||
|
||||
+ifeq ($(WM_OSTYPE),MSwindows)
|
||||
+
|
||||
+libscotch : libscotch$(LIB) scotch.h
|
||||
+
|
||||
+endif
|
||||
+
|
||||
scotch :
|
||||
$(MAKE) CC="$(CCS)" CCD="$(CCS)" \
|
||||
scotch.h \
|
||||
@@ -438,6 +444,11 @@
|
||||
wgraph_part_zr$(OBJ) \
|
||||
wgraph_store$(OBJ)
|
||||
|
||||
+ifeq ($(WM_OSTYPE),MSwindows)
|
||||
+## Add into libscotch instead of having a separate library
|
||||
+LIBSCOTCHDEPS += library_error_exit$(OBJ)
|
||||
+endif
|
||||
+
|
||||
##
|
||||
## Todo list.
|
||||
##
|
||||
--- scotch_6.0.6/src/Makefile.orig 2018-07-14 17:24:49.000000000 +0200
|
||||
+++ scotch_6.0.6/src/Makefile 2019-04-29 18:39:16.365132864 +0200
|
||||
@@ -89,9 +89,18 @@
|
||||
$(mandir)/man1 : $(mandir)
|
||||
-$(MKDIR) $(mandir)/man1
|
||||
|
||||
+ifeq ($(WM_OSTYPE),MSwindows)
|
||||
+
|
||||
+libscotch : required
|
||||
+ (cd libscotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
|
||||
+
|
||||
+else
|
||||
+
|
||||
libscotch : required
|
||||
(cd libscotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
|
||||
|
||||
+endif
|
||||
+
|
||||
scotch : libscotch
|
||||
(cd scotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
|
||||
(cd libscotchmetis ; $(MAKE) scotch && $(MAKE) install)
|
||||
@ -6,7 +6,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -114,18 +114,38 @@ setParaViewVersion()
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# Set CMake cache variables
|
||||
# Set CMake cache variables.
|
||||
# Automatically adds -D prefix it needed
|
||||
#
|
||||
addCMakeVariable()
|
||||
{
|
||||
local i
|
||||
for i
|
||||
do
|
||||
[ -n "$i" ] && CMAKE_VARIABLES="$CMAKE_VARIABLES -D$i"
|
||||
case "$i" in
|
||||
('') ;; # empty
|
||||
(-*) CMAKE_VARIABLES="${CMAKE_VARIABLES} ${i}" ;;
|
||||
(*) CMAKE_VARIABLES="${CMAKE_VARIABLES} -D${i}" ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# General settings (version-dependent)
|
||||
#
|
||||
addGeneral()
|
||||
{
|
||||
if printf "${ParaView_MAJOR}"'\n%s\n' 5.6 | sort -V -C
|
||||
then
|
||||
# Paraview 5.6 and older
|
||||
addCMakeVariable "BUILD_SHARED_LIBS=ON"
|
||||
else
|
||||
addCMakeVariable "PARAVIEW_BUILD_SHARED_LIBS=ON"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Verbose makefiles
|
||||
#
|
||||
@ -153,6 +173,10 @@ addMpiSupport()
|
||||
then
|
||||
addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
|
||||
fi
|
||||
|
||||
echo "----"
|
||||
echo "MPI information:"
|
||||
echo " home : $MPI_HOME"
|
||||
}
|
||||
|
||||
|
||||
@ -244,7 +268,13 @@ addPythonSupport()
|
||||
exit 1
|
||||
}
|
||||
|
||||
addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON"
|
||||
if printf "${ParaView_MAJOR}"'\n%s\n' 5.7 | sort -V -C
|
||||
then
|
||||
# Paraview 5.7 and older
|
||||
addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON"
|
||||
else
|
||||
addCMakeVariable "PARAVIEW_USE_PYTHON=ON"
|
||||
fi
|
||||
addCMakeVariable "PYTHON_INCLUDE_DIRS=$PYTHON_INCLUDE"
|
||||
addCMakeVariable "PYTHON_LIBRARY=$PYTHON_LIBRARY"
|
||||
|
||||
@ -304,20 +334,27 @@ addQtSupport()
|
||||
QT_VERSION=none
|
||||
: ${withQT:=true} # default is on
|
||||
|
||||
local qmake qtLib
|
||||
local cmakeVarName="PARAVIEW_USE_QT"
|
||||
|
||||
if printf "${ParaView_MAJOR}"'\n%s\n' 5.7 | sort -V -C
|
||||
then
|
||||
# Paraview 5.7 and older
|
||||
cmakeVarName="PARAVIEW_BUILD_QT_GUI"
|
||||
fi
|
||||
|
||||
if [ "$withQT" = false ]
|
||||
then
|
||||
# Explicitly disabled
|
||||
addCMakeVariable "PARAVIEW_BUILD_QT_GUI=OFF"
|
||||
addCMakeVariable "$cmakeVarName=OFF"
|
||||
return
|
||||
fi
|
||||
|
||||
local qmake qtLib
|
||||
|
||||
# Check qmake can be found and handle version differences
|
||||
qmake=$(findQMake)
|
||||
if QT_VERSION=$($qmake -query QT_VERSION 2>/dev/null)
|
||||
then
|
||||
addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
|
||||
addCMakeVariable "$cmakeVarName=ON"
|
||||
|
||||
case "$QT_VERSION" in
|
||||
(3.* | 4.[0-4]*)
|
||||
@ -495,7 +532,9 @@ INFO
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Start with these general settings
|
||||
addCMakeVariable "BUILD_SHARED_LIBS=ON" "BUILD_TESTING=OFF"
|
||||
|
||||
# No testing
|
||||
addCMakeVariable "BUILD_TESTING=OFF"
|
||||
|
||||
# Include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -430,12 +430,15 @@ setBuildSuffix()
|
||||
#
|
||||
# Mostly building without wmake
|
||||
# - disable wmakeScheduler variables
|
||||
# - use max number of cores for building
|
||||
# - use max number of cores for building, unless already defined
|
||||
#
|
||||
unset WM_HOSTS WM_SCHEDULER
|
||||
|
||||
WM_NCOMPPROCS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) || WM_NCOMPPROCS=1
|
||||
: ${WM_NCOMPPROCS:=1}
|
||||
if [ -z "$WM_NCOMPPROCS" ]
|
||||
then
|
||||
WM_NCOMPPROCS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
|
||||
: "${WM_NCOMPPROCS:=1}"
|
||||
fi
|
||||
export WM_NCOMPPROCS
|
||||
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -168,6 +168,10 @@ addMpiSupport()
|
||||
then
|
||||
addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
|
||||
fi
|
||||
|
||||
echo "----"
|
||||
echo "MPI information:"
|
||||
echo " home : $MPI_HOME"
|
||||
}
|
||||
|
||||
|
||||
|
||||
19
makeAdios2
19
makeAdios2
@ -63,6 +63,12 @@ _foamConfig adios2
|
||||
|
||||
adiosPACKAGE=${adios2_version:-adios-none}
|
||||
|
||||
# Hint for cmake findMPI
|
||||
if [ -d "$MPI_ARCH_PATH" ]
|
||||
then
|
||||
export MPI_HOME="$MPI_ARCH_PATH"
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
usage() {
|
||||
exec 1>&2
|
||||
@ -71,9 +77,10 @@ usage() {
|
||||
|
||||
usage: ${0##*/} [OPTION] [adios-VERSION]
|
||||
options:
|
||||
-force Force compilation, even if include/library already exists
|
||||
-gcc Force use of gcc/g++
|
||||
-cmake PATH With cmake from the given path
|
||||
-force Force compilation, even if include/library already exists
|
||||
-gcc Force use of gcc/g++
|
||||
-cmake PATH With cmake from the given path
|
||||
-mpi-home PATH With hint for MPI_HOME
|
||||
-help
|
||||
|
||||
* Build ADIOS2
|
||||
@ -102,6 +109,12 @@ do
|
||||
CMAKE_PATH="${2%%/}"
|
||||
shift
|
||||
;;
|
||||
-mpi-home) # mpi with hint
|
||||
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||
export MPI_HOME="${2%%/}"
|
||||
case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
|
||||
shift
|
||||
;;
|
||||
ADIOS2-[0-9]* | ADIOS2-git* | ADIOS-[0-9]* | ADIOS-git* | \
|
||||
adios2-[0-9]* | adios2-git* | adios-[0-9]* | adios-git*)
|
||||
adiosPACKAGE="${1%%/}"
|
||||
|
||||
135
makeMesa
135
makeMesa
@ -6,7 +6,7 @@
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2016-2019 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -23,6 +23,14 @@
|
||||
#
|
||||
# Building with mesa-11.x, mesa-13.x and mesa-17.x seems to be okay.
|
||||
#
|
||||
# Known dependencies (likely incomplete)
|
||||
#
|
||||
# openSUSE 15.2:
|
||||
#
|
||||
# dri2proto-devel
|
||||
# glproto-devel
|
||||
# libxshmfence-devel
|
||||
#
|
||||
# ----------------------------------------------
|
||||
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
|
||||
#------------------------------------------------------------------------------
|
||||
@ -132,6 +140,11 @@ fi
|
||||
#------------------------------------------------------------------------------
|
||||
# Locate third-party clang as required
|
||||
case "$withLLVM" in
|
||||
('' | none | false)
|
||||
withLLVM=none
|
||||
echo "No llvm"
|
||||
;;
|
||||
|
||||
(true | system)
|
||||
LLVM_ARCH_PATH="$(command -v clang)" || {
|
||||
echo "Error: could not properly locate llvm/clang"
|
||||
@ -141,25 +154,28 @@ case "$withLLVM" in
|
||||
# Root installation directory
|
||||
LLVM_ARCH_PATH="${LLVM_ARCH_PATH%/bin/clang}"
|
||||
|
||||
[ -d "$LLVM_ARCH_PATH" ] || {
|
||||
if [ -d "$LLVM_ARCH_PATH" ]
|
||||
then
|
||||
# Add to path (for llvm-config)
|
||||
PATH="$LLVM_ARCH_PATH/bin:$PATH"
|
||||
else
|
||||
echo "Error: could not properly locate llvm/clang"
|
||||
exit 2
|
||||
}
|
||||
;;
|
||||
|
||||
('' | none | false)
|
||||
withLLVM=none
|
||||
echo "No llvm"
|
||||
fi
|
||||
;;
|
||||
|
||||
(llvm-*)
|
||||
echo "check llvm = $withLLVM"
|
||||
LLVM_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$withLLVM"
|
||||
|
||||
[ -d "$LLVM_ARCH_PATH" ] || {
|
||||
if [ -d "$LLVM_ARCH_PATH" ]
|
||||
then
|
||||
# Add to path (for llvm-config)
|
||||
PATH="$LLVM_ARCH_PATH/bin:$PATH"
|
||||
else
|
||||
echo "Error: could not properly locate llvm/clang"
|
||||
exit 2
|
||||
}
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -172,20 +188,24 @@ esac
|
||||
# MESA_SOURCE_DIR : location of the original sources
|
||||
# MESA_ARCH_DIR : installation directory
|
||||
|
||||
MESA_SOURCE_DIR=$sourceBASE/$mesaPACKAGE
|
||||
MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
|
||||
MESA_SOURCE_DIR="$sourceBASE/$mesaPACKAGE"
|
||||
MESA_ARCH_PATH="$installBASE/$mesaPACKAGE"
|
||||
|
||||
#
|
||||
# Manual adjustments to mesa
|
||||
# - avoid GLES (GLES1) since <GLES/gl.h> may mask the <GL/gl.h> header
|
||||
adjustMESA()
|
||||
{
|
||||
pkgconfigAdjust $MESA_ARCH_PATH
|
||||
pkgconfigAdjust "$MESA_ARCH_PATH"
|
||||
|
||||
\rm -rf $MESA_ARCH_PATH/include/GLES $MESA_ARCH_PATH/include/GLES1
|
||||
\rm -rf "$MESA_ARCH_PATH"/include/GLES "$MESA_ARCH_PATH"/include/GLES1
|
||||
echo "removed all gles1 includes"
|
||||
}
|
||||
|
||||
# Old MESA with autoconfig
|
||||
|
||||
if [ -e "$MESA_SOURCE_DIR"/configure ]
|
||||
then
|
||||
(
|
||||
# Configuration options:
|
||||
unset configOpt compFlags
|
||||
@ -210,16 +230,16 @@ adjustMESA()
|
||||
|
||||
# End of configuration options
|
||||
# ----------------------------
|
||||
buildDIR=$buildBASE/$mesaPACKAGE
|
||||
buildDIR="$buildBASE/$mesaPACKAGE"
|
||||
|
||||
cd "$MESA_SOURCE_DIR" || exit
|
||||
export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
|
||||
|
||||
# Remove any existing build
|
||||
rm -rf $MESA_ARCH_PATH
|
||||
rm -rf $buildDIR
|
||||
mkdir -p $buildDIR
|
||||
cd $buildDIR
|
||||
rm -rf "$MESA_ARCH_PATH"
|
||||
rm -rf "$buildDIR"
|
||||
mkdir -p "$buildDIR"
|
||||
cd "$buildDIR"
|
||||
|
||||
echo "----"
|
||||
echo "Building $mesaPACKAGE"
|
||||
@ -240,7 +260,7 @@ adjustMESA()
|
||||
## autoreconf -fi
|
||||
set -x
|
||||
$MESA_SOURCE_DIR/configure \
|
||||
--prefix=$MESA_ARCH_PATH \
|
||||
--prefix="$MESA_ARCH_PATH" \
|
||||
--disable-xvmc \
|
||||
--disable-glx \
|
||||
--disable-dri \
|
||||
@ -260,4 +280,79 @@ adjustMESA()
|
||||
exit 1
|
||||
}
|
||||
|
||||
elif [ -e "$MESA_SOURCE_DIR"/meson.build ]
|
||||
then
|
||||
(
|
||||
# Configuration options:
|
||||
unset configOpt compFlags
|
||||
|
||||
# Sometimes for LLVM issues
|
||||
# compFlags="-D_GLIBCXX_USE_CXX11_ABI=0"
|
||||
|
||||
# Possibly for older mesa versions (see paraview wiki)
|
||||
# compFlags="-O2 -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
|
||||
|
||||
# Additional configure options
|
||||
if [ "$1" = "--" ]
|
||||
then
|
||||
shift
|
||||
configOpt="$configOpt $@"
|
||||
fi
|
||||
|
||||
# End of configuration options
|
||||
# ----------------------------
|
||||
buildDIR="$buildBASE/$mesaPACKAGE"
|
||||
|
||||
cd "$MESA_SOURCE_DIR" || exit
|
||||
export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
|
||||
|
||||
# Remove any existing build
|
||||
rm -rf $MESA_ARCH_PATH
|
||||
rm -rf $buildDIR
|
||||
mkdir -p $buildDIR
|
||||
cd $MESA_SOURCE_DIR
|
||||
|
||||
echo "----"
|
||||
echo "Building $mesaPACKAGE"
|
||||
echo " Source : $MESA_SOURCE_DIR"
|
||||
echo " Target : $MESA_ARCH_PATH"
|
||||
if [ -d "$LLVM_ARCH_PATH" ]
|
||||
then
|
||||
echo " llvm : $LLVM_ARCH_PATH"
|
||||
fi
|
||||
echo "----"
|
||||
|
||||
if [ -n "$compFlags" ]
|
||||
then
|
||||
CFLAGS="$CFLAGS $compFlags"
|
||||
CXXFLAGS="$CXXFLAGS $compFlags"
|
||||
fi
|
||||
|
||||
# Needs c++14 not c++11
|
||||
CXXFLAGS="$(echo "$CXXFLAGS" | sed 's/c++11/c++14/')"
|
||||
|
||||
set -x
|
||||
meson "$buildDIR" \
|
||||
--prefix="$MESA_ARCH_PATH" \
|
||||
-Dplatforms=x11 \
|
||||
-Dosmesa=gallium \
|
||||
-Dgallium-drivers=swrast \
|
||||
-Ddri-drivers=[] \
|
||||
-Dvulkan-drivers=[] \
|
||||
$configOpt \
|
||||
&& set +x \
|
||||
&& ninja -j $WM_NCOMPPROCS -C "$buildDIR" \
|
||||
&& ninja -C "$buildDIR" install \
|
||||
&& echo "Built $mesaPACKAGE" \
|
||||
&& adjustMESA
|
||||
) || {
|
||||
echo "Error building: MESA"
|
||||
exit 1
|
||||
}
|
||||
else
|
||||
echo "Error building: MESA. Not autoconfig or meson?"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
11
makePETSC
11
makePETSC
@ -6,7 +6,7 @@
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2018-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2018-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -185,7 +185,14 @@ fi
|
||||
echo
|
||||
(
|
||||
# Configuration options
|
||||
configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)"
|
||||
|
||||
# Compiler or MPI (but not both)
|
||||
# if [ -d "$MPI_ARCH_PATH" ]
|
||||
# then
|
||||
# configOpt="--with-mpi-dir=$MPI_ARCH_PATH"
|
||||
# else
|
||||
configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)"
|
||||
# fi
|
||||
|
||||
if [ "$optDebug" = true ]
|
||||
then
|
||||
|
||||
22
makeParaView
22
makeParaView
@ -7,7 +7,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -64,6 +64,12 @@ setParaViewVersion ${ParaView_VERSION:-none}
|
||||
# New rendering backend (starting with paraview 5.0).
|
||||
withGL2=auto # auto-config based on version
|
||||
|
||||
# Hint for cmake findMPI
|
||||
if [ -d "$MPI_ARCH_PATH" ]
|
||||
then
|
||||
export MPI_HOME="$MPI_ARCH_PATH"
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
usage() {
|
||||
exec 1>&2
|
||||
@ -83,6 +89,7 @@ options:
|
||||
-mesa-lib PATH path to mesa library (current: ${MESA_LIBRARY:-none})
|
||||
-mpi with mpi
|
||||
-mpi=N with max 'N' mpi processes. N=0 for no upper-limit.
|
||||
-mpi-home PATH with mpi and hint for MPI_HOME
|
||||
-python | -python2 | -python3
|
||||
with python
|
||||
-python-include DIR
|
||||
@ -90,13 +97,14 @@ options:
|
||||
-python-lib PATH path to python library (current: ${PYTHON_LIBRARY:-none})
|
||||
-qmake PATH with QT version corresponding to the qmake in given path
|
||||
-qt with extra Qt gui support (if not already enabled)
|
||||
-qt-VER with QT version corresponding to
|
||||
-qt-<VER> with QT version corresponding to
|
||||
\$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/qt-VER/bin/qmake
|
||||
-verbose verbose output in Makefiles
|
||||
-version VER specify an alternative version (current: $ParaView_VERSION)
|
||||
-major VER specify an alternative major version for special builds
|
||||
-buildType NAME specify the build type (default: Release)
|
||||
-suffix NAME specify a suffix to distinguish the build
|
||||
-DNAME=VALUE add cmake variable
|
||||
-help
|
||||
|
||||
The -no-FEATURE option can be used to forcibly disable these features:
|
||||
@ -147,7 +155,7 @@ do
|
||||
[0-9]* | paraview-[0-9]* | ParaView-[0-9]*) # paraview version
|
||||
setParaViewVersion "${1%%/}"
|
||||
;;
|
||||
[A-Z]*=*) # cmake variables
|
||||
-D[A-Z]*=* | [A-Z]*=*) # cmake variables
|
||||
addCMakeVariable "$1"
|
||||
;;
|
||||
-patch) # stage 0: patch sources
|
||||
@ -231,6 +239,13 @@ do
|
||||
withMPI=true
|
||||
MPI_MAX_PROCS="${1##*=}"
|
||||
;;
|
||||
-mpi-home) # mpi with hint
|
||||
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||
withMPI=true
|
||||
export MPI_HOME="${2%%/}"
|
||||
case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
|
||||
shift
|
||||
;;
|
||||
-no-mpi)
|
||||
withMPI=false
|
||||
;;
|
||||
@ -359,6 +374,7 @@ fi
|
||||
|
||||
# Set configure options
|
||||
#~~~~~~~~~~~~~~~~~~~~~~
|
||||
addGeneral # general settings (version-dependent)
|
||||
addVerbosity # verbose makefiles
|
||||
addMpiSupport # set MPI-specific options
|
||||
addPythonSupport # set Python-specific options
|
||||
|
||||
20
makeVTK
20
makeVTK
@ -6,7 +6,7 @@
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -53,10 +53,15 @@ case "$VTK_VERSION" in
|
||||
esac
|
||||
VTK_VERSION="${VTK_VERSION%%-*}" # Without suffix (eg, -mesa)
|
||||
|
||||
|
||||
# New rendering backend (starting with vtk 7?).
|
||||
withGL2=auto # auto-config based on version
|
||||
|
||||
# Hint for cmake findMPI
|
||||
if [ -d "$MPI_ARCH_PATH" ]
|
||||
then
|
||||
export MPI_HOME="$MPI_ARCH_PATH"
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
usage() {
|
||||
exec 1>&2
|
||||
@ -76,10 +81,12 @@ options:
|
||||
-osmesa with off-screen mesa only
|
||||
-mpi with mpi (VTK_Group_MPI=ON)
|
||||
-mpi=N with max 'N' mpi processes. N=0 for no upper-limit.
|
||||
-mpi-home PATH with mpi and hint for MPI_HOME
|
||||
-verbose verbose output in Makefiles
|
||||
-version VER specify an alternative version (current: $VTK_VERSION)
|
||||
-buildType NAME specify the build type (default: Release)
|
||||
-suffix NAME specify a suffix to distinguish the build
|
||||
-DNAME=VALUE add cmake variable
|
||||
-help
|
||||
|
||||
The -no-FEATURE option can be used to forcibly disable these features:
|
||||
@ -123,7 +130,7 @@ do
|
||||
[0-9]* | vtk-[0-9]* | VTK-[0-9]*) # VTK version
|
||||
setVtkVersion "${1%%/}"
|
||||
;;
|
||||
[A-Z]*=*) # cmake variables
|
||||
-D[A-Z]*=* | [A-Z]*=*) # cmake variables
|
||||
addCMakeVariable "$1"
|
||||
;;
|
||||
-patch) # stage 0: patch sources
|
||||
@ -204,6 +211,13 @@ do
|
||||
withMPI=true
|
||||
MPI_MAX_PROCS="${1##*=}"
|
||||
;;
|
||||
-mpi-home) # mpi with hint
|
||||
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||
withMPI=true
|
||||
export MPI_HOME="${2%%/}"
|
||||
case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
|
||||
shift
|
||||
;;
|
||||
-no-mpi)
|
||||
withMPI=false
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user