From 78819144d372da8e4af2245bc23ab7728a54f5ee Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Jun 2020 13:43:09 +0200 Subject: [PATCH] DOC: add hint about scotch gitlab repo and paraview requirements (#52) - add download hints for -help of various make scripts --- BUILD.md | 7 ++++--- Requirements.md | 31 ++++++++++++++++++++++--------- etc/tools/ThirdPartyFunctions | 3 ++- makeAdios2 | 1 + makeCCMIO | 1 + makeCGAL | 2 ++ makeCmake | 1 + makeFFTW | 1 + makeGcc | 4 ++++ makeGperftools | 1 + makeKAHIP | 1 + makeLLVM | 1 + makeMETIS | 1 + makeMGridGen | 2 +- makeMPICH | 1 + makeMVAPICH | 1 + makeMesa | 1 + makeOPENMPI | 1 + makeParaView | 1 + makeQt | 1 + makeSCOTCH | 1 + makeVTK | 1 + 22 files changed, 51 insertions(+), 14 deletions(-) diff --git a/BUILD.md b/BUILD.md index 179e4fc..c6fa518 100644 --- a/BUILD.md +++ b/BUILD.md @@ -431,7 +431,7 @@ you may have additional hurdles to using the newest versions of clang. |-----------------------|------------------------ | [openmpi][page openmpi] | [download][link openmpi]. ***Some openmpi2/openmpi3 versions exhibit [stability issues](https://github.com/open-mpi/ompi/issues/5375)*** | [adios][page adios] | [repo][repo adios] or [github download][link adios] -| [scotch, ptscotch][page scotch] | [download][link scotch] or [older][older scotch] or [even older][oldest scotch] +| [scotch, ptscotch][page scotch] | [repo][repo scotch] or [download][link scotch] or [older][older scotch] or [even older][oldest scotch] | [kahip][page kahip] | [download][link kahip] or [older][older kahip] | [metis][page metis] | [download][link metis] @@ -529,9 +529,10 @@ easier to use `grep` and find the relevant pages and links. [page zfp]: http://computation.llnl.gov/projects/floating-point-compression/zfp-versions [page scotch]: https://www.labri.fr/perso/pelegrin/scotch/ -[oldest scotch]: https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz -[older scotch]: https://gforge.inria.fr/frs/download.php/file/38114/scotch_6.0.8.tar.gz +[repo scotch]: https://gitlab.inria.fr/scotch/scotch [link scotch]: 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 [page kahip]: http://algo2.iti.kit.edu/documents/kahip/ [older kahip]: http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz diff --git a/Requirements.md b/Requirements.md index aedcac9..bcd6213 100644 --- a/Requirements.md +++ b/Requirements.md @@ -18,10 +18,15 @@ is likely adequate for your needs. ### Ubuntu -The full dependency list for building ParaView can be -found from the corresponding [debian/control](https://salsa.debian.org/science-team/paraview/-/blob/master/debian/control) -file. -The following subset may be enough: +The full dependency list for building ParaView can be found from the +corresponding [debian/control][debian control] file. + +A ***quick*** way to get these dependencies on to your system is to +use the paraview development package: +``` +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 ``` @@ -29,10 +34,16 @@ sudo apt install cmake qt5base-dev qttools5-dev qttools5-dev-tools libqt5opengl5 ### openSUSE -The full dependency list for building ParaView can be -found from the corresponding [rpm spec](https://build.opensuse.org/package/view_file/science/paraview/paraview.spec) -file. -The following subset may be enough: +The full dependency list for building ParaView can be found from the +corresponding [rpm spec][suse spec] file. + +A ***quick*** way to get these dependencies on to your system is to +use the paraview development package: +``` +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 @@ -43,6 +54,8 @@ 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 @@ -56,4 +69,4 @@ sudo zypper install libXt-devel [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md --- -Copyright 2019 OpenCFD Ltd +Copyright 2019-2020 OpenCFD Ltd diff --git a/etc/tools/ThirdPartyFunctions b/etc/tools/ThirdPartyFunctions index 32f505a..70634e9 100644 --- a/etc/tools/ThirdPartyFunctions +++ b/etc/tools/ThirdPartyFunctions @@ -339,7 +339,8 @@ showDownloadHint() if [ -f "$WM_THIRD_PARTY_DIR/BUILD.md" ] then grep -i "$package" "$WM_THIRD_PARTY_DIR/BUILD.md" | \ - grep -E '(http|ftp)' | sed -ne 's/^ *\[.*\]: */ /p' + grep -E '(http|ftp)' | sed -ne 's/^ *\[.*\]: */ /p' | \ + uniq fi fi } diff --git a/makeAdios2 b/makeAdios2 index f6e7173..7b19844 100755 --- a/makeAdios2 +++ b/makeAdios2 @@ -67,6 +67,7 @@ options: $adiosPACKAGE USAGE + showDownloadHint ADIOS2 exit 1 } #------------------------------------------------------------------------------ diff --git a/makeCCMIO b/makeCCMIO index 3c98926..077b041 100755 --- a/makeCCMIO +++ b/makeCCMIO @@ -70,6 +70,7 @@ options: prior to running this script. USAGE + showDownloadHint CCMIO exit 1 } #------------------------------------------------------------------------------ diff --git a/makeCGAL b/makeCGAL index 47bebf0..bde8c1c 100755 --- a/makeCGAL +++ b/makeCGAL @@ -108,6 +108,8 @@ simply specify a 'system' version. For example, Use gmp-none to disable use of gmp/mpfr (eg, not available) USAGE + showDownloadHint BOOST + showDownloadHint CGAL exit 1 } #------------------------------------------------------------------------------ diff --git a/makeCmake b/makeCmake index a971f54..b35fdc8 100755 --- a/makeCmake +++ b/makeCmake @@ -53,6 +53,7 @@ options: ${cmakePACKAGE:-'unspecified'} USAGE + showDownloadHint CMAKE exit 1 } #------------------------------------------------------------------------------ diff --git a/makeFFTW b/makeFFTW index edb76f6..acd2afe 100755 --- a/makeFFTW +++ b/makeFFTW @@ -68,6 +68,7 @@ options: ${fftwPACKAGE:-'unspecified FFTW version'} USAGE + showDownloadHint FFTW exit 1 } #------------------------------------------------------------------------------ diff --git a/makeGcc b/makeGcc index 5ec8c0d..b041732 100755 --- a/makeGcc +++ b/makeGcc @@ -78,6 +78,10 @@ options: ${gccPACKAGE:-'unspecified GCC version'} USAGE + showDownloadHint GCC + showDownloadHint GMP + showDownloadHint MPFR + showDownloadHint MPC exit 1 } #------------------------------------------------------------------------------ diff --git a/makeGperftools b/makeGperftools index 4d3b0f5..0e71df6 100755 --- a/makeGperftools +++ b/makeGperftools @@ -51,6 +51,7 @@ options: $gperftoolsPACKAGE USAGE + showDownloadHint GPERFTOOLS exit 1 } #------------------------------------------------------------------------------ diff --git a/makeKAHIP b/makeKAHIP index 04fab4a..f29f8b6 100755 --- a/makeKAHIP +++ b/makeKAHIP @@ -85,6 +85,7 @@ options: $kahipPACKAGE USAGE + showDownloadHint KAHIP exit 1 } #------------------------------------------------------------------------------ diff --git a/makeLLVM b/makeLLVM index de3c483..cd474a6 100755 --- a/makeLLVM +++ b/makeLLVM @@ -73,6 +73,7 @@ options: ${llvmPACKAGE:-'unspecified LLVM version'} USAGE + showDownloadHint LLVM exit 1 } #------------------------------------------------------------------------------ diff --git a/makeMETIS b/makeMETIS index 6b81ac3..b5840ba 100755 --- a/makeMETIS +++ b/makeMETIS @@ -83,6 +83,7 @@ options: ${metisPACKAGE:-'unspecified metis version'} USAGE + showDownloadHint METIS exit 1 } #------------------------------------------------------------------------------ diff --git a/makeMGridGen b/makeMGridGen index d2c365b..f97730d 100755 --- a/makeMGridGen +++ b/makeMGridGen @@ -51,9 +51,9 @@ options: $mgridgenPACKAGE USAGE + # showDownloadHint GRIDGEN exit 1 } - #------------------------------------------------------------------------------ exportCompiler # Compiler info for CMake/configure diff --git a/makeMPICH b/makeMPICH index d971a95..f096607 100755 --- a/makeMPICH +++ b/makeMPICH @@ -80,6 +80,7 @@ options: ${mpiPACKAGE:-'unspecified mpich version'} USAGE + showDownloadHint MPICH exit 1 } #------------------------------------------------------------------------------ diff --git a/makeMVAPICH b/makeMVAPICH index 612194d..9a73709 100755 --- a/makeMVAPICH +++ b/makeMVAPICH @@ -84,6 +84,7 @@ The additional configure-options could include, for example, ${0##*/} -- --disable-mcast USAGE + showDownloadHint MVAPICH exit 1 } #------------------------------------------------------------------------------ diff --git a/makeMesa b/makeMesa index 6328206..7332b93 100755 --- a/makeMesa +++ b/makeMesa @@ -60,6 +60,7 @@ options: ${mesaPACKAGE:-'unspecified MESA version'} USAGE + showDownloadHint MESA exit 1 } #------------------------------------------------------------------------------ diff --git a/makeOPENMPI b/makeOPENMPI index a17cc8a..7172c9a 100755 --- a/makeOPENMPI +++ b/makeOPENMPI @@ -82,6 +82,7 @@ options: ${mpiPACKAGE:-'unspecified openmpi version'} USAGE + showDownloadHint OPENMPI exit 1 } #------------------------------------------------------------------------------ diff --git a/makeParaView b/makeParaView index c06d30d..2c1d31e 100755 --- a/makeParaView +++ b/makeParaView @@ -126,6 +126,7 @@ For example, Or change the \$WM_PROJECT_DIR/etc/config.sh/paraview settings. USAGE + showDownloadHint PARAVIEW exit 1 } #------------------------------------------------------------------------------ diff --git a/makeQt b/makeQt index 8c3b658..711fde8 100755 --- a/makeQt +++ b/makeQt @@ -44,6 +44,7 @@ options: * build $qtTYPE, version ${qtVERSION:-undefined} USAGE + showDownloadHint QT exit 1 } #------------------------------------------------------------------------------ diff --git a/makeSCOTCH b/makeSCOTCH index 21124e6..cc6d43f 100755 --- a/makeSCOTCH +++ b/makeSCOTCH @@ -63,6 +63,7 @@ options: $scotchPACKAGE USAGE + showDownloadHint SCOTCH exit 1 } #------------------------------------------------------------------------------ diff --git a/makeVTK b/makeVTK index d24d575..a5135f3 100755 --- a/makeVTK +++ b/makeVTK @@ -102,6 +102,7 @@ For finer control, the build stages can be selected or deselected individually: -> \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/VTK-$VTK_VERSION$BUILD_SUFFIX USAGE + # showDownloadHint VTK exit 1 } #------------------------------------------------------------------------------