* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-01-05 13:54 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-01-05 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 66db3c61843e58a56d2855f7b9445e3f19620bae
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Jan 5 13:46:02 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Tue Jan 5 13:46:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66db3c61
sci-physics/SU2: 7.0.8-r1, mv fix-python-optimize.patch to external repo
Due to large size of "SU2-7.0.8-fix-python-optimize.patch"
move it to external repository to fetch separately.
This patch is required only to generate ".pyc" files
during execution "python_optimize" command on "src_install()" phase
to fix "TabError: inconsistent use of tabs and spaces in indentation".
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/{SU2-7.0.8.ebuild => SU2-7.0.8-r1.ebuild} | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.0.8.ebuild b/sci-physics/SU2/SU2-7.0.8-r1.ebuild
similarity index 90%
rename from sci-physics/SU2/SU2-7.0.8.ebuild
rename to sci-physics/SU2/SU2-7.0.8-r1.ebuild
index 30feedd4..f7e5b83f 100644
--- a/sci-physics/SU2/SU2-7.0.8.ebuild
+++ b/sci-physics/SU2/SU2-7.0.8-r1.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
HOMEPAGE="https://su2code.github.io/"
SRC_URI="
https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/band-a-prend/gentoo-overlay/raw/master/sci-physics/${PN}/files/${P}-fix-python-optimize.patch
test? ( https://github.com/su2code/TestCases/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-TestCases.tar.gz )
tutorials? ( https://github.com/su2code/Tutorials/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-Tutorials.tar.gz )
"
@@ -42,12 +43,12 @@ DEPEND="
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${P}-fix-env.patch"
"${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
- "${FILESDIR}/${P}-fix-python-optimize.patch"
+ "${FILESDIR}/${P}-fix-env.patch"
+ "${DISTDIR}/${P}-fix-python-optimize.patch"
)
-DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" )
+DOCS=( "README.md" "SU2_PY/documentation.txt" )
src_unpack() {
unpack "${P}.tar.gz"
@@ -57,7 +58,7 @@ src_unpack() {
fi
if use tutorials ; then
einfo "Unpacking ${PN}-7.0.7-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
- mkdir "${P}"/Tutorials
+ mkdir "${P}"/Tutorials || die
tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${PN}-7.0.7-Tutorials.tar.gz" || die
fi
}
@@ -103,8 +104,8 @@ src_test() {
src_install() {
meson_src_install
- mkdir -p "${ED}$(python_get_sitedir)"
- mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)"
+ mkdir -p "${ED}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" || die
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-01-05 14:00 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-01-05 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 52ba7eb4ccd6c6e6d696ed3e039c7c9ca991cab6
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Jan 5 13:59:40 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Tue Jan 5 13:59:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52ba7eb4
sci-pythics/SU2: 7.0.8 fix Manifest file with patch info
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index 2fa24c27..10d45c06 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,3 +1,4 @@
DIST SU2-7.0.7-TestCases.tar.gz 448969006 BLAKE2B 6c886824b55d7f8516d2ea69e2f7bef36a40986f4f715da46d91f851eb59390329433c6941a280eca34ad675633b2f1b01a897d1db8d177a5c4f770b286d0625 SHA512 0884b4f750dbcfd3f2cb0e71d6005932e4edd90a50fa84eb484f6c0c523930ddebfb3ed4315161b8fdeff911a52fa72b6d79739c8e19cd634b9823e007520213
DIST SU2-7.0.7-Tutorials.tar.gz 64282235 BLAKE2B 7a6b780ee6f01d26a7a7d4751ca39798af56cfd7b99ca3e13fdff61aecd631a3aa4c98a487f48a8b2593c711ee25bd1ddc90a316bde2c287e95a383321f1d5e9 SHA512 189b5da96f08689b62ba3c42ee349edd2e145f371112895587e53497f16de3d6fdbf17308af39961775d76e3169c40872ced8e267146b6da5ae12d31a4c70fa9
DIST SU2-7.0.8.tar.gz 20554206 BLAKE2B ac291eeae696197f5875839defa98bde550c5250b5a5cff8049e0d1c8184c5ec6d225b77618d079a8fb3d5a7f4d0531a0b2931fd15e045299fa55c7dd03d9fd1 SHA512 26ed8c39d2dfcdb3fc4e1c986c64f683f44cd4123ce5f7a482c4557a82b04b4bd8ef1f04332ab36ad0f987cfb98053fb8b30ef81faf51c7c56aebc1a30467df9
+DIST SU2-7.0.8-fix-python-optimize.patch 104379 BLAKE2B e2cb9f58af5f600f25d01a082b55a344d3b05c455d44cfcb3370fc77546b6821d616e80f577b7af4b19ad519f086495eb6f6bde1f1712451ac477d6dd538fa0e SHA512 f21ed5fc1e61b78f3858a162a899c552777143118f05db009247c6224b06b922b6280de5725726afe21a3283a18ad9c38fc1c65dadb709d440e10cf3fe754d8c
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-03-10 20:02 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-03-10 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 9ae1019ee4e64113279f8b47830e7389944ff17c
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Mar 10 20:00:19 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Wed Mar 10 20:00:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9ae1019e
sci-physics/SU2: 7.1.1 version bump
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 3 +
sci-physics/SU2/SU2-7.1.1.ebuild | 127 +++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index dbfba89b..c5fb9ec1 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -5,4 +5,7 @@ DIST SU2-7.0.8.tar.gz 20554206 BLAKE2B ac291eeae696197f5875839defa98bde550c5250b
DIST SU2-7.1.0-TestCases.tar.gz 449701778 BLAKE2B 8a7cb400d330b4bbf62023525e6009a8c05af5a375b7479087b3b579d7f3162a11091f09294381fcd11d7bc358e77f10f69efc0999a304135f8850e3fe005000 SHA512 a0e354b073b4cfaeb47a9bd33ac66a636b12a065ca7caff4bd50c54e2b191809fd463f980568e0b7d4d559714d2dca99fe9a3e5854aa345be24010cd1239e772
DIST SU2-7.1.0-Tutorials.tar.gz 66570840 BLAKE2B fdbc23503abd7a250464ca8da52ab87f67069d2a3fca130038c1ea83c3b18aa476fed3a21f725b142a97923b101d7906a720f6dff28341a13915ed6216660d7f SHA512 7843a7ed5b3c606ea9821745390c70bbfd3cb66a17494360b4139e8735a8e83546acd0912462b7fc3b63ff9f2097610294c1c9af25d104962f727f599cdb8ae9
DIST SU2-7.1.0.tar.gz 20542933 BLAKE2B e6e6d82a990bf4043d1c6c58a5fe7a100a923b2c6ae6a29f7bb969e02279eeb5587f7930b2372cf67e26f451c598cf81e2515eeb7e516d6ab060ac7e986a0110 SHA512 309b4e06c5fc084ea2a06797ae400392b924c3654d354170c3159327c9e022081745bee28b1537ed3ad4e7c1333afb8c38a1ca033ff28662b8d5f5badfdc8465
+DIST SU2-7.1.1-TestCases.tar.gz 453640460 BLAKE2B 661349f1690eda1f9c4438a0c03c59d4bab7a1e49965a94d1e3ba6fe54ab5f14c9eae0ae93d5027068d5d02465af72cc39e8a4319de6b888d01b0e353a2bf296 SHA512 8a30160b9c6d7f2d23c7cd88e089bcefa98b1fdeeef43060da4fe4840a7061e790f250c656b44f2e491108cf5c2701fd0dbad67e651db3d59a79f8e521c2e36d
+DIST SU2-7.1.1-Tutorials.tar.gz 71446250 BLAKE2B 30d4f9dda28958da80617d5ddcf635304c19f7de68a1bd5dd52ac7df84bf643d028c2ee8d2e3425f4d8a4faa06e8ed95150c51293629453c0b27101c33278a1f SHA512 7f38588effa471f705c297c5a9fb6bca344932224453cb46021a715b58f9a0d45e16edb73df9a2a079dd7bd7909bbf0236fc0dc2df11b88bfb6f3a6c7769fdfe
+DIST SU2-7.1.1.tar.gz 20553973 BLAKE2B a8c7f851cf570c08c345725e6660fc84683a4a7b6982edc586661847dc0b0db06f1825170afc34d85adced512c5272a0632005838ae6952be4265eb05c921bab SHA512 5980c2a24821d5e8cc83a953377d2779a158da30b6c1d2ef5db8a2b4f7a2ba555d5a35d755216a5c860e48e97b325f9687f3b2bd0c741b2d21bbcfcd31689ea9
DIST mutationpp-1.0.1.tar.gz 4021945 BLAKE2B caae3ca155541a36822a950047efb867aab098bc9db311d675acca272d7f317ff35524086a0ea5eda524bbe125e4874f41dc1dbad92bfee4387e3a0c649bbd0a SHA512 ba8beeb7cdaf1b526571e27f745d8d53c1e20a96bd194a5949acb8b6d5f75553867158a63bfc7198502177a9e8a91bf82a67d450a3ba72b21f8490539f45ef01
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
new file mode 100644
index 00000000..f4ad34dd
--- /dev/null
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
+HOMEPAGE="https://su2code.github.io/"
+SRC_URI="
+ https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
+ test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
+ tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# cgns, metis, parmetis are bundled;
+# omp is disable as it's experimental;
+# pastix is disabled as it's try to find bundled libs;
+IUSE="cgns -mkl +mpi mpp openblas tecio test tutorials"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ mkl? ( !openblas )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ mpi? ( virtual/mpi[cxx] )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ tecio? ( dev-libs/boost:= )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
+ "${FILESDIR}/${PN}-7.1.0-fix-env.patch"
+)
+
+DOCS=( "README.md" "SU2_PY/documentation.txt" )
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ if use mpp ; then
+ einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
+ tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
+ fi
+ if use test ; then
+ einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
+ tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
+ fi
+ if use tutorials ; then
+ einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
+ mkdir "${P}"/Tutorials || die
+ tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
+ fi
+}
+
+src_prepare(){
+ default
+ # boost Geometry requires c++14 since >=boost-1.75
+ if has_version ">=dev-libs/boost-1.75.0" ; then
+ sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ -Denable-autodiff=false
+ -Denable-directdiff=false
+ -Denable-pastix=false
+ -Denable-pywrapper=false
+ -Dwith-omp=false
+ $(meson_feature mpi with-mpi)
+ $(meson_use cgns enable-cgns)
+ $(meson_use mkl enable-mkl)
+ $(meson_use mpp enable-mpp)
+ $(meson_use openblas enable-openblas)
+ $(meson_use tecio enable-tecio)
+ $(meson_use test enable-tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
+
+ export SU2_RUN="${S}/SU2_PY"
+ export SU2_HOME="${S}"
+ export PATH=$PATH:$SU2_RUN
+ export PYTHONPATH=$PYTHONPATH:$SU2_RUN
+
+ einfo "Running UnitTests ..."
+ ../${P}-build/UnitTests/test_driver
+
+ pushd TestCases/
+ use mpi && python parallel_regression.py
+ use mpi || python serial_regression.py
+ use tutorials && use mpi && python tutorials.py
+ popd
+}
+
+src_install() {
+ meson_src_install
+ mkdir -p "${ED}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${ED}$(python_get_sitedir)" || die
+ python_optimize "${D}/$(python_get_sitedir)"
+
+ if use tutorials ; then
+ insinto "/usr/share/${P}"
+ doins -r Tutorials
+ fi
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-03-22 20:14 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-03-22 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 4f15d50c3efc79bbaae115bf6af576568564b8b9
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Mar 22 20:13:58 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Mon Mar 22 20:13:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4f15d50c
sci-physics/SU2: drop old 7.1.0
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 3 -
sci-physics/SU2/SU2-7.1.0.ebuild | 119 ---------------------------------------
2 files changed, 122 deletions(-)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index 9fc17003..7148f13f 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,6 +1,3 @@
-DIST SU2-7.1.0-TestCases.tar.gz 449701778 BLAKE2B 8a7cb400d330b4bbf62023525e6009a8c05af5a375b7479087b3b579d7f3162a11091f09294381fcd11d7bc358e77f10f69efc0999a304135f8850e3fe005000 SHA512 a0e354b073b4cfaeb47a9bd33ac66a636b12a065ca7caff4bd50c54e2b191809fd463f980568e0b7d4d559714d2dca99fe9a3e5854aa345be24010cd1239e772
-DIST SU2-7.1.0-Tutorials.tar.gz 66570840 BLAKE2B fdbc23503abd7a250464ca8da52ab87f67069d2a3fca130038c1ea83c3b18aa476fed3a21f725b142a97923b101d7906a720f6dff28341a13915ed6216660d7f SHA512 7843a7ed5b3c606ea9821745390c70bbfd3cb66a17494360b4139e8735a8e83546acd0912462b7fc3b63ff9f2097610294c1c9af25d104962f727f599cdb8ae9
-DIST SU2-7.1.0.tar.gz 20542933 BLAKE2B e6e6d82a990bf4043d1c6c58a5fe7a100a923b2c6ae6a29f7bb969e02279eeb5587f7930b2372cf67e26f451c598cf81e2515eeb7e516d6ab060ac7e986a0110 SHA512 309b4e06c5fc084ea2a06797ae400392b924c3654d354170c3159327c9e022081745bee28b1537ed3ad4e7c1333afb8c38a1ca033ff28662b8d5f5badfdc8465
DIST SU2-7.1.1-TestCases.tar.gz 453640460 BLAKE2B 661349f1690eda1f9c4438a0c03c59d4bab7a1e49965a94d1e3ba6fe54ab5f14c9eae0ae93d5027068d5d02465af72cc39e8a4319de6b888d01b0e353a2bf296 SHA512 8a30160b9c6d7f2d23c7cd88e089bcefa98b1fdeeef43060da4fe4840a7061e790f250c656b44f2e491108cf5c2701fd0dbad67e651db3d59a79f8e521c2e36d
DIST SU2-7.1.1-Tutorials.tar.gz 71446250 BLAKE2B 30d4f9dda28958da80617d5ddcf635304c19f7de68a1bd5dd52ac7df84bf643d028c2ee8d2e3425f4d8a4faa06e8ed95150c51293629453c0b27101c33278a1f SHA512 7f38588effa471f705c297c5a9fb6bca344932224453cb46021a715b58f9a0d45e16edb73df9a2a079dd7bd7909bbf0236fc0dc2df11b88bfb6f3a6c7769fdfe
DIST SU2-7.1.1.tar.gz 20553973 BLAKE2B a8c7f851cf570c08c345725e6660fc84683a4a7b6982edc586661847dc0b0db06f1825170afc34d85adced512c5272a0632005838ae6952be4265eb05c921bab SHA512 5980c2a24821d5e8cc83a953377d2779a158da30b6c1d2ef5db8a2b4f7a2ba555d5a35d755216a5c860e48e97b325f9687f3b2bd0c741b2d21bbcfcd31689ea9
diff --git a/sci-physics/SU2/SU2-7.1.0.ebuild b/sci-physics/SU2/SU2-7.1.0.ebuild
deleted file mode 100644
index 0357fd63..00000000
--- a/sci-physics/SU2/SU2-7.1.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-single-r1
-
-DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
-HOMEPAGE="https://su2code.github.io/"
-SRC_URI="
- https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
- test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
- tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# cgns, metis, parmetis are bundled;
-# omp is disable as it's experimental;
-# pastix is disabled as it's try to find bundled libs;
-IUSE="cgns -mkl +mpi mpp openblas tecio test tutorials"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- mkl? ( !openblas )
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- mpi? ( virtual/mpi[cxx] )
- mkl? ( sci-libs/mkl )
- openblas? ( sci-libs/openblas )
-"
-DEPEND="
- ${RDEPEND}
- tecio? ( dev-libs/boost:= )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
- "${FILESDIR}/${P}-fix-env.patch"
-)
-
-DOCS=( "README.md" "SU2_PY/documentation.txt" )
-
-src_unpack() {
- unpack "${P}.tar.gz"
- if use mpp ; then
- einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
- tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
- fi
- if use test ; then
- einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
- tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
- fi
- if use tutorials ; then
- einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
- mkdir "${P}"/Tutorials || die
- tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
- fi
-}
-
-src_configure() {
- local emesonargs=(
- -Denable-autodiff=false
- -Denable-directdiff=false
- -Denable-pastix=false
- -Denable-pywrapper=false
- -Dwith-omp=false
- $(meson_feature mpi with-mpi)
- $(meson_use cgns enable-cgns)
- $(meson_use mkl enable-mkl)
- $(meson_use mpp enable-mpp)
- $(meson_use openblas enable-openblas)
- $(meson_use tecio enable-tecio)
- $(meson_use test enable-tests)
- )
- meson_src_configure
-}
-
-src_test() {
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
-
- export SU2_RUN="${S}/SU2_PY"
- export SU2_HOME="${S}"
- export PATH=$PATH:$SU2_RUN
- export PYTHONPATH=$PYTHONPATH:$SU2_RUN
-
- einfo "Running UnitTests ..."
- ../${P}-build/UnitTests/test_driver
-
- pushd TestCases/
- use mpi && python parallel_regression.py
- use mpi || python serial_regression.py
- use tutorials && use mpi && python tutorials.py
- popd
-}
-
-src_install() {
- meson_src_install
- mkdir -p "${ED}$(python_get_sitedir)" || die
- mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${ED}$(python_get_sitedir)" || die
- python_optimize "${D}/$(python_get_sitedir)"
-
- if use tutorials ; then
- insinto "/usr/share/${P}"
- doins -r Tutorials
- fi
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-03-28 10:52 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2021-03-28 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 5f828672da60d30f9bc59f39ed4a547dc6ca1717
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Mar 28 10:45:54 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Mar 28 10:45:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f828672
sci-physics/SU2: fix DoublePrefixInPath
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-physics/SU2/SU2-7.1.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
index f4ad34dd9..49799f412 100644
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -116,8 +116,8 @@ src_test() {
src_install() {
meson_src_install
- mkdir -p "${ED}$(python_get_sitedir)" || die
- mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${ED}$(python_get_sitedir)" || die
+ mkdir -p "${D}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
2021-05-30 15:59 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
@ 2021-05-30 15:59 ` Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2021-05-30 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 191b8e50a82197ce23904c2cef882953271367b9
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 15:58:05 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 30 15:58:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=191b8e50
sci-physics/SU2: fix BadDefaultUseFlags
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-physics/SU2/SU2-7.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
index 49799f412..a10b2a489 100644
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64"
# cgns, metis, parmetis are bundled;
# omp is disable as it's experimental;
# pastix is disabled as it's try to find bundled libs;
-IUSE="cgns -mkl +mpi mpp openblas tecio test tutorials"
+IUSE="cgns mkl +mpi mpp openblas tecio test tutorials"
RESTRICT="!test? ( test )"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-08-31 14:07 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-08-31 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 45a78f0f3225bd116211894e6f19eeffb68d5e90
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Aug 31 13:58:33 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Tue Aug 31 14:06:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45a78f0f
sci-physics/SU2: update LICENSE set and PYTHON_COMPAT
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.1.1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
index a10b2a489..4817101c3 100644
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
inherit meson python-single-r1
@@ -16,7 +16,9 @@ SRC_URI="
tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
"
-LICENSE="LGPL-2.1"
+# SU2: LGPL-2.1; cgnslib: ZLIB, TecIO: all-rights-reserved;
+# Metis: Apache-2.0; Parmetis: all-rights-reserved, free-noncomm; Mutationpp: LGPL-3.0.
+LICENSE="Apache-2.0 LGPL-2.1 LGPL-3 ZLIB all-rights-reserved free-noncomm"
SLOT="0"
KEYWORDS="~amd64"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-08-31 14:07 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-08-31 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 2ad0e8d212342dc865f04cec8ce8fba3b64006fc
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Aug 31 14:01:55 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Tue Aug 31 14:06:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ad0e8d2
sci-physics/SU2: 7.2.0 version bump
Parmetis has free-non-comm licence type and as configure.ac
has explicit configuration option for this therefore
the USE="parmetis" introduced with forced removing of parmetis
enabling from meson.build file in scr-prepare phase.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 3 +
sci-physics/SU2/SU2-7.2.0.ebuild | 131 +++++++++++++++++++++++++++++++++++++++
sci-physics/SU2/metadata.xml | 1 +
3 files changed, 135 insertions(+)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index 7148f13f0..d50e3c990 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,4 +1,7 @@
DIST SU2-7.1.1-TestCases.tar.gz 453640460 BLAKE2B 661349f1690eda1f9c4438a0c03c59d4bab7a1e49965a94d1e3ba6fe54ab5f14c9eae0ae93d5027068d5d02465af72cc39e8a4319de6b888d01b0e353a2bf296 SHA512 8a30160b9c6d7f2d23c7cd88e089bcefa98b1fdeeef43060da4fe4840a7061e790f250c656b44f2e491108cf5c2701fd0dbad67e651db3d59a79f8e521c2e36d
DIST SU2-7.1.1-Tutorials.tar.gz 71446250 BLAKE2B 30d4f9dda28958da80617d5ddcf635304c19f7de68a1bd5dd52ac7df84bf643d028c2ee8d2e3425f4d8a4faa06e8ed95150c51293629453c0b27101c33278a1f SHA512 7f38588effa471f705c297c5a9fb6bca344932224453cb46021a715b58f9a0d45e16edb73df9a2a079dd7bd7909bbf0236fc0dc2df11b88bfb6f3a6c7769fdfe
DIST SU2-7.1.1.tar.gz 20553973 BLAKE2B a8c7f851cf570c08c345725e6660fc84683a4a7b6982edc586661847dc0b0db06f1825170afc34d85adced512c5272a0632005838ae6952be4265eb05c921bab SHA512 5980c2a24821d5e8cc83a953377d2779a158da30b6c1d2ef5db8a2b4f7a2ba555d5a35d755216a5c860e48e97b325f9687f3b2bd0c741b2d21bbcfcd31689ea9
+DIST SU2-7.2.0-TestCases.tar.gz 464156192 BLAKE2B 405a5ccdd13bc5109feca1462b6ac434a4d817adbaca964465678683d5593fa940579e364e33414da5f059a89b2919fbc0baed82967246356da49c87ac9ce63f SHA512 d75894c285ac7cb4c72eece10a02f014fb2d85b585c08d1a9bbf12ab51f6004be99c368bde98734891dc45446d0656b21317b50d7d14af95b6ce4bfe72871f11
+DIST SU2-7.2.0-Tutorials.tar.gz 72845754 BLAKE2B ef670a77d0189e9fd8ad48d96bd4617de558311d0df0d81a10dd3cbf8b97b7fbcb0e6725746d8451ce12a923f6895a392582fa980f4054b3b1306609431900ff SHA512 c91cfbdfb26169fc36575f60ec3133ea4a6f39c8433e276840a0f96c7508f3ee898020179ac01d606da9c5e10ee2ad263a642ff6f6b7400d75f4eb03ee7e1cf8
+DIST SU2-7.2.0.tar.gz 15356101 BLAKE2B e52f09d0451c200f6fd6874d55bedf7733f934cb2cee378ca286107960bd82332adc932cae57e9052654b34972717a4f8969db216acdcef8a6816b648119df94 SHA512 5600ebb97ef5939333907f75cda58a02810642439309fc8626ed974dfbfaffdf0cd7d9cc81de310cb12e6f92f98b64c58d607ad93095bd86cc583768947ccf6b
DIST mutationpp-1.0.1.tar.gz 4021945 BLAKE2B caae3ca155541a36822a950047efb867aab098bc9db311d675acca272d7f317ff35524086a0ea5eda524bbe125e4874f41dc1dbad92bfee4387e3a0c649bbd0a SHA512 ba8beeb7cdaf1b526571e27f745d8d53c1e20a96bd194a5949acb8b6d5f75553867158a63bfc7198502177a9e8a91bf82a67d450a3ba72b21f8490539f45ef01
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild
new file mode 100644
index 000000000..84dfe6e00
--- /dev/null
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
+HOMEPAGE="https://su2code.github.io/"
+SRC_URI="
+ https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
+ test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
+ tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
+"
+
+# SU2: LGPL-2.1; cgnslib: ZLIB, TecIO: all-rights-reserved;
+# Metis: Apache-2.0; Parmetis: all-rights-reserved, free-noncomm; Mutationpp: LGPL-3.0.
+LICENSE="Apache-2.0 LGPL-2.1 LGPL-3 ZLIB all-rights-reserved free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# cgns, metis, parmetis are bundled;
+# omp is disable as it's experimental;
+# pastix is disabled as it's require additional external bundled libs;
+# autodiff (medi), directdiff (opti) features require additional external bundled libs.
+IUSE="cgns mkl +mpi mpp openblas parmetis tecio test tutorials"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ mkl? ( !openblas )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ mpi? ( virtual/mpi[cxx] )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ tecio? ( >=dev-libs/boost-1.76.0:= )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
+ "${FILESDIR}/${PN}-7.1.0-fix-env.patch"
+)
+
+DOCS=( "README.md" "SU2_PY/documentation.txt" )
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ if use mpp ; then
+ einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
+ tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
+ fi
+ if use test ; then
+ einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
+ tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
+ fi
+ if use tutorials ; then
+ einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
+ mkdir "${P}"/Tutorials || die
+ tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
+ fi
+}
+
+src_prepare(){
+ default
+ # boost Geometry requires c++14 since >=boost-1.75
+ sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
+
+ # Force Disable parmetis support in meson.build (configure.ac has optional switch)
+ use !parmetis && { sed -i -e "/parmetis/Id" meson.build || die ; }
+}
+
+src_configure() {
+ local emesonargs=(
+ -Denable-autodiff=false
+ -Denable-directdiff=false
+ -Denable-pastix=false
+ -Denable-pywrapper=false
+ -Dwith-omp=false
+ $(meson_feature mpi with-mpi)
+ $(meson_use cgns enable-cgns)
+ $(meson_use mkl enable-mkl)
+ $(meson_use mpp enable-mpp)
+ $(meson_use openblas enable-openblas)
+ $(meson_use tecio enable-tecio)
+ $(meson_use test enable-tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
+
+ export SU2_RUN="${S}/SU2_PY"
+ export SU2_HOME="${S}"
+ export PATH=$PATH:$SU2_RUN
+ export PYTHONPATH=$PYTHONPATH:$SU2_RUN
+
+ einfo "Running UnitTests ..."
+ ../${P}-build/UnitTests/test_driver
+
+ pushd TestCases/
+ use mpi && python parallel_regression.py
+ use mpi || python serial_regression.py
+ use tutorials && use mpi && python tutorials.py
+ popd
+}
+
+src_install() {
+ meson_src_install
+ mkdir -p "${D}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
+ python_optimize "${D}/$(python_get_sitedir)"
+
+ if use tutorials ; then
+ insinto "/usr/share/${P}"
+ doins -r Tutorials
+ fi
+}
diff --git a/sci-physics/SU2/metadata.xml b/sci-physics/SU2/metadata.xml
index 377649313..8d14e595d 100644
--- a/sci-physics/SU2/metadata.xml
+++ b/sci-physics/SU2/metadata.xml
@@ -10,6 +10,7 @@
<flag name="mkl">Enable Intel MKL support</flag>
<flag name="mpp">Enable Mutation++ library support</flag>
<flag name="openblas">Enable OpenBLAS support</flag>
+ <flag name="parmetis">Enable Parmetis support (Metis support is always on)</flag>
<flag name="tecio">Enable TECIO support</flag>
<flag name="tutorials">Install Tutorials files</flag>
</use>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-09-05 10:45 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-09-05 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 6e5b0fc2e48d639cda21b7f313085ed3024f2cf3
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Sep 5 10:43:39 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sun Sep 5 10:43:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e5b0fc2
sci-physics/SU2: replace 'python' with '${EPYTHON}'. Add 'die' commands
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.1.1.ebuild | 29 +++++++++++++++++------------
sci-physics/SU2/SU2-7.2.0.ebuild | 29 +++++++++++++++++------------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
index 4817101c3..87b3d2328 100644
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -95,11 +95,11 @@ src_configure() {
}
src_test() {
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
@@ -107,13 +107,18 @@ src_test() {
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
einfo "Running UnitTests ..."
- ../${P}-build/UnitTests/test_driver
-
- pushd TestCases/
- use mpi && python parallel_regression.py
- use mpi || python serial_regression.py
- use tutorials && use mpi && python tutorials.py
- popd
+ ../${P}-build/UnitTests/test_driver || die
+
+ pushd TestCases/ || die
+ if use mpi ; then
+ ${EPYTHON} parallel_regression.py || die
+ if use tutorials ; then
+ ${EPYTHON} tutorials.py || die
+ fi
+ else
+ ${EPYTHON} serial_regression.py || die
+ fi
+ popd || die
}
src_install() {
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild
index 84dfe6e00..e211c5388 100644
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -97,11 +97,11 @@ src_configure() {
}
src_test() {
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
@@ -109,13 +109,18 @@ src_test() {
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
einfo "Running UnitTests ..."
- ../${P}-build/UnitTests/test_driver
-
- pushd TestCases/
- use mpi && python parallel_regression.py
- use mpi || python serial_regression.py
- use tutorials && use mpi && python tutorials.py
- popd
+ ../${P}-build/UnitTests/test_driver || die
+
+ pushd TestCases/ || die
+ if use mpi ; then
+ ${EPYTHON} parallel_regression.py || die
+ if use tutorials ; then
+ ${EPYTHON} tutorials.py || die
+ fi
+ else
+ ${EPYTHON} serial_regression.py || die
+ fi
+ popd || die
}
src_install() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-09-15 21:43 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-09-15 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 8dc8d4025018d2db2c1ceffdfa6a3f1daec872a8
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Sep 15 21:37:23 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Wed Sep 15 21:37:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8dc8d402
sci-physics/SU2: Disable pywrapper tests. Fix axi_visccone test
USE="tutorials" tests now run before parallel_regression.py tests
as turorials tests have no fails currently.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.1.1.ebuild | 5 ++++-
sci-physics/SU2/SU2-7.2.0.ebuild | 10 +++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
index 87b3d2328..899b5d72f 100644
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild
@@ -74,6 +74,9 @@ src_prepare(){
if has_version ">=dev-libs/boost-1.75.0" ; then
sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
fi
+
+ # Disable python-wrapper tests
+ sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
}
src_configure() {
@@ -111,10 +114,10 @@ src_test() {
pushd TestCases/ || die
if use mpi ; then
- ${EPYTHON} parallel_regression.py || die
if use tutorials ; then
${EPYTHON} tutorials.py || die
fi
+ ${EPYTHON} parallel_regression.py || die
else
${EPYTHON} serial_regression.py || die
fi
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild
index e211c5388..7b3091907 100644
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -76,6 +76,14 @@ src_prepare(){
# Force Disable parmetis support in meson.build (configure.ac has optional switch)
use !parmetis && { sed -i -e "/parmetis/Id" meson.build || die ; }
+
+ # Disable python-wrapper tests
+ sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
+
+ # Copy absence mesh file
+ if use test ; then
+ cp "${S}/TestCases/nonequilibrium/viscwedge/viscwedge.su2" "${S}/TestCases/nonequilibrium/axi_visccone/" || die
+ fi
}
src_configure() {
@@ -113,10 +121,10 @@ src_test() {
pushd TestCases/ || die
if use mpi ; then
- ${EPYTHON} parallel_regression.py || die
if use tutorials ; then
${EPYTHON} tutorials.py || die
fi
+ ${EPYTHON} parallel_regression.py || die
else
${EPYTHON} serial_regression.py || die
fi
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-10-15 16:20 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-10-15 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 5893ea57d8065fd5fb57894af204056759f0d7e7
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Oct 15 16:19:37 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Fri Oct 15 16:19:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5893ea57
sci-physics/SU2: drop old
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 3 -
sci-physics/SU2/SU2-7.1.1.ebuild | 137 ---------------------------------------
2 files changed, 140 deletions(-)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index d50e3c990..3b721ab82 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,6 +1,3 @@
-DIST SU2-7.1.1-TestCases.tar.gz 453640460 BLAKE2B 661349f1690eda1f9c4438a0c03c59d4bab7a1e49965a94d1e3ba6fe54ab5f14c9eae0ae93d5027068d5d02465af72cc39e8a4319de6b888d01b0e353a2bf296 SHA512 8a30160b9c6d7f2d23c7cd88e089bcefa98b1fdeeef43060da4fe4840a7061e790f250c656b44f2e491108cf5c2701fd0dbad67e651db3d59a79f8e521c2e36d
-DIST SU2-7.1.1-Tutorials.tar.gz 71446250 BLAKE2B 30d4f9dda28958da80617d5ddcf635304c19f7de68a1bd5dd52ac7df84bf643d028c2ee8d2e3425f4d8a4faa06e8ed95150c51293629453c0b27101c33278a1f SHA512 7f38588effa471f705c297c5a9fb6bca344932224453cb46021a715b58f9a0d45e16edb73df9a2a079dd7bd7909bbf0236fc0dc2df11b88bfb6f3a6c7769fdfe
-DIST SU2-7.1.1.tar.gz 20553973 BLAKE2B a8c7f851cf570c08c345725e6660fc84683a4a7b6982edc586661847dc0b0db06f1825170afc34d85adced512c5272a0632005838ae6952be4265eb05c921bab SHA512 5980c2a24821d5e8cc83a953377d2779a158da30b6c1d2ef5db8a2b4f7a2ba555d5a35d755216a5c860e48e97b325f9687f3b2bd0c741b2d21bbcfcd31689ea9
DIST SU2-7.2.0-TestCases.tar.gz 464156192 BLAKE2B 405a5ccdd13bc5109feca1462b6ac434a4d817adbaca964465678683d5593fa940579e364e33414da5f059a89b2919fbc0baed82967246356da49c87ac9ce63f SHA512 d75894c285ac7cb4c72eece10a02f014fb2d85b585c08d1a9bbf12ab51f6004be99c368bde98734891dc45446d0656b21317b50d7d14af95b6ce4bfe72871f11
DIST SU2-7.2.0-Tutorials.tar.gz 72845754 BLAKE2B ef670a77d0189e9fd8ad48d96bd4617de558311d0df0d81a10dd3cbf8b97b7fbcb0e6725746d8451ce12a923f6895a392582fa980f4054b3b1306609431900ff SHA512 c91cfbdfb26169fc36575f60ec3133ea4a6f39c8433e276840a0f96c7508f3ee898020179ac01d606da9c5e10ee2ad263a642ff6f6b7400d75f4eb03ee7e1cf8
DIST SU2-7.2.0.tar.gz 15356101 BLAKE2B e52f09d0451c200f6fd6874d55bedf7733f934cb2cee378ca286107960bd82332adc932cae57e9052654b34972717a4f8969db216acdcef8a6816b648119df94 SHA512 5600ebb97ef5939333907f75cda58a02810642439309fc8626ed974dfbfaffdf0cd7d9cc81de310cb12e6f92f98b64c58d607ad93095bd86cc583768947ccf6b
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild
deleted file mode 100644
index 899b5d72f..000000000
--- a/sci-physics/SU2/SU2-7.1.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit meson python-single-r1
-
-DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
-HOMEPAGE="https://su2code.github.io/"
-SRC_URI="
- https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
- test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
- tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
-"
-
-# SU2: LGPL-2.1; cgnslib: ZLIB, TecIO: all-rights-reserved;
-# Metis: Apache-2.0; Parmetis: all-rights-reserved, free-noncomm; Mutationpp: LGPL-3.0.
-LICENSE="Apache-2.0 LGPL-2.1 LGPL-3 ZLIB all-rights-reserved free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# cgns, metis, parmetis are bundled;
-# omp is disable as it's experimental;
-# pastix is disabled as it's try to find bundled libs;
-IUSE="cgns mkl +mpi mpp openblas tecio test tutorials"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- mkl? ( !openblas )
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- mpi? ( virtual/mpi[cxx] )
- mkl? ( sci-libs/mkl )
- openblas? ( sci-libs/openblas )
-"
-DEPEND="
- ${RDEPEND}
- tecio? ( dev-libs/boost:= )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
- "${FILESDIR}/${PN}-7.1.0-fix-env.patch"
-)
-
-DOCS=( "README.md" "SU2_PY/documentation.txt" )
-
-src_unpack() {
- unpack "${P}.tar.gz"
- if use mpp ; then
- einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
- tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
- fi
- if use test ; then
- einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
- tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
- fi
- if use tutorials ; then
- einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
- mkdir "${P}"/Tutorials || die
- tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
- fi
-}
-
-src_prepare(){
- default
- # boost Geometry requires c++14 since >=boost-1.75
- if has_version ">=dev-libs/boost-1.75.0" ; then
- sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
- fi
-
- # Disable python-wrapper tests
- sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
-}
-
-src_configure() {
- local emesonargs=(
- -Denable-autodiff=false
- -Denable-directdiff=false
- -Denable-pastix=false
- -Denable-pywrapper=false
- -Dwith-omp=false
- $(meson_feature mpi with-mpi)
- $(meson_use cgns enable-cgns)
- $(meson_use mkl enable-mkl)
- $(meson_use mpp enable-mpp)
- $(meson_use openblas enable-openblas)
- $(meson_use tecio enable-tecio)
- $(meson_use test enable-tests)
- )
- meson_src_configure
-}
-
-src_test() {
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die
-
- export SU2_RUN="${S}/SU2_PY"
- export SU2_HOME="${S}"
- export PATH=$PATH:$SU2_RUN
- export PYTHONPATH=$PYTHONPATH:$SU2_RUN
-
- einfo "Running UnitTests ..."
- ../${P}-build/UnitTests/test_driver || die
-
- pushd TestCases/ || die
- if use mpi ; then
- if use tutorials ; then
- ${EPYTHON} tutorials.py || die
- fi
- ${EPYTHON} parallel_regression.py || die
- else
- ${EPYTHON} serial_regression.py || die
- fi
- popd || die
-}
-
-src_install() {
- meson_src_install
- mkdir -p "${D}$(python_get_sitedir)" || die
- mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
- python_optimize "${D}/$(python_get_sitedir)"
-
- if use tutorials ; then
- insinto "/usr/share/${P}"
- doins -r Tutorials
- fi
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-10-24 21:07 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-10-24 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 584e239fa636150d6680c82fb0a21c7a764ba650
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Oct 24 20:56:36 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sun Oct 24 21:05:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=584e239f
sci-physics/SU2: restrict with MPI 3.1 impl. Add custom-mpi option
Meson.build script isn't properly detect mpich as MPI impl.,
therefore meson option 'custom-mpi' is used now with export
of CC=mpicc and CXX=mpicxx as compilers.
Mpi implementations is restricted with MPI 3.1 within ebuild.
FEATURES="-network-sandbox" could be required to run tests
for some mpi implementations/versions.
Closes: https://bugs.gentoo.org/819060
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.2.0.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild
index 7b3091907..32027c04f 100644
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- mpi? ( virtual/mpi[cxx] )
+ mpi? ( || ( >=sys-cluster/openmpi-1.10.7[cxx] >=sys-cluster/mpich-3.3[cxx] ) )
mkl? ( sci-libs/mkl )
openblas? ( sci-libs/openblas )
"
@@ -87,6 +87,11 @@ src_prepare(){
}
src_configure() {
+ if use mpi ; then
+ export CC=mpicc
+ export CXX=mpicxx
+ fi
+
local emesonargs=(
-Denable-autodiff=false
-Denable-directdiff=false
@@ -94,6 +99,7 @@ src_configure() {
-Denable-pywrapper=false
-Dwith-omp=false
$(meson_feature mpi with-mpi)
+ $(meson_use mpi custom-mpi)
$(meson_use cgns enable-cgns)
$(meson_use mkl enable-mkl)
$(meson_use mpp enable-mpp)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2021-10-27 20:55 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2021-10-27 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 85c4f567a9f07f9075c864b636f9245ed600fc49
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Oct 27 20:53:10 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Wed Oct 27 20:53:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=85c4f567
sci-physics/SU2: switch to EAPI-8. Enable MPI network tests
Use EAPI-8 option PROPERTIES="test_network" to enable
network testing that is required by MPI.
Closes: https://bugs.gentoo.org/820293
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.2.0.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild
index 32027c04f..8c0012dae 100644
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
@@ -27,7 +27,13 @@ KEYWORDS="~amd64"
# pastix is disabled as it's require additional external bundled libs;
# autodiff (medi), directdiff (opti) features require additional external bundled libs.
IUSE="cgns mkl +mpi mpp openblas parmetis tecio test tutorials"
+
+# Tests fail with FEATURES="network-sandbox" for most versions of openmpi and mpich it with error:
+# "No network interfaces were found for out-of-band communications.
+# We require at least one available network for out-of-band messaging."
+PROPERTIES="test_network"
RESTRICT="!test? ( test )"
+
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
mkl? ( !openblas )
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2022-05-28 13:45 Alessandro Barbieri
0 siblings, 0 replies; 19+ messages in thread
From: Alessandro Barbieri @ 2022-05-28 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 932235ce7ccf64152e38a5c3c4bc2be4753abac9
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat May 28 13:45:03 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat May 28 13:45:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=932235ce
sci-physics/SU2: enable py3.10
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-physics/SU2/SU2-7.2.0-r1.ebuild | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.2.0-r1.ebuild b/sci-physics/SU2/SU2-7.2.0-r1.ebuild
index 2d2ce7361..b0c8a21e9 100644
--- a/sci-physics/SU2/SU2-7.2.0-r1.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-single-r1
@@ -26,7 +26,7 @@ IUSE="autodiff cgns directdiff librom mixed-precision mkl +mpi mpp openblas open
RDEPEND="
${PYTHON_DEPS}
- cgns? ( sci-libs/cgnslib:= )
+ cgns? ( >=sci-libs/cgnslib-4 )
librom? ( sci-libs/libROM )
mkl? ( sci-libs/mkl )
mpi? (
@@ -40,21 +40,29 @@ RDEPEND="
<sci-libs/pastix-6[mpi?]
sci-libs/scotch
)
- python? ( $(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]') )
+ python? ( $(python_gen_cond_dep '
+ dev-python/mpi4py[${PYTHON_USEDEP}]
+ dev-python/wxpython[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
"
DEPEND="
${RDEPEND}
dev-cpp/catch:0
- dev-cpp/cli11
+ dev-cpp/cli11:=
autodiff? (
- sci-libs/CoDiPack
- mpi? ( >sci-libs/MeDiPack-1.2 )
- openmp? ( sci-libs/OpDiLib )
+ sci-libs/CoDiPack:=
+ mpi? ( >sci-libs/MeDiPack-1.2:= )
+ openmp? ( sci-libs/OpDiLib:= )
)
directdiff? (
- sci-libs/CoDiPack
- mpi? ( >sci-libs/MeDiPack-1.2 )
+ sci-libs/CoDiPack:=
+ mpi? ( >sci-libs/MeDiPack-1.2:= )
)
tecio? ( >=dev-libs/boost-1.76.0:= )
test? ( dev-cpp/catch:0 )
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2022-12-08 22:44 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2022-12-08 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 7af8494682fb2d4f6bf0f1d0e2791dd305901a3c
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Dec 8 22:15:02 2022 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Thu Dec 8 22:15:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7af84946
sci-physics/SU2: 7.2.0-r2 bump; unbundle some deps and fix build
Thanks to Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
for unbundling patch.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
.../SU2/{SU2-7.2.0.ebuild => SU2-7.2.0-r2.ebuild} | 37 ++++++++++++++--------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
similarity index 83%
rename from sci-physics/SU2/SU2-7.2.0.ebuild
rename to sci-physics/SU2/SU2-7.2.0-r2.ebuild
index 8c0012dae..1bc85bf7e 100644
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-single-r1
@@ -11,7 +11,6 @@ DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
HOMEPAGE="https://su2code.github.io/"
SRC_URI="
https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
"
@@ -22,7 +21,7 @@ LICENSE="Apache-2.0 LGPL-2.1 LGPL-3 ZLIB all-rights-reserved free-noncomm"
SLOT="0"
KEYWORDS="~amd64"
-# cgns, metis, parmetis are bundled;
+# metis, parmetis are bundled;
# omp is disable as it's experimental;
# pastix is disabled as it's require additional external bundled libs;
# autodiff (medi), directdiff (opti) features require additional external bundled libs.
@@ -37,33 +36,38 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
mkl? ( !openblas )
+ parmetis? ( mpi )
+ test? ( parmetis tutorials )
"
RDEPEND="
${PYTHON_DEPS}
- mpi? ( || ( >=sys-cluster/openmpi-1.10.7[cxx] >=sys-cluster/mpich-3.3[cxx] ) )
+ cgns? ( >=sci-libs/cgnslib-4 )
mkl? ( sci-libs/mkl )
+ mpi? ( virtual/mpi[cxx] )
+ mpp? ( sci-libs/Mutationpp:= )
openblas? ( sci-libs/openblas )
"
DEPEND="
${RDEPEND}
+ dev-cpp/cli11:=
tecio? ( >=dev-libs/boost-1.76.0:= )
+ test? ( <dev-cpp/catch-3:0 )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
"${FILESDIR}/${PN}-7.1.0-fix-env.patch"
+ "${FILESDIR}/${PN}-7.2.0-system-libraries.patch"
+ "${FILESDIR}/${PN}-7.2.0-DESTDIR.patch"
+ "${FILESDIR}/${PN}-7.2.0-fix-headers.patch"
)
DOCS=( "README.md" "SU2_PY/documentation.txt" )
src_unpack() {
unpack "${P}.tar.gz"
- if use mpp ; then
- einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
- tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
- fi
if use test ; then
einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
@@ -77,6 +81,9 @@ src_unpack() {
src_prepare(){
default
+
+ rm -rf externals/{CLI11,autotools,catch2,cgns,codi,medi,meson,ninja,opdi} || die
+
# boost Geometry requires c++14 since >=boost-1.75
sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
@@ -85,6 +92,9 @@ src_prepare(){
# Disable python-wrapper tests
sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
+ # Disable failed tests
+ sed -i "/append(dyn_fsi/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(fd_sp_pinArray_cht_2d_dp_hf/s/./#&/" TestCases/parallel_regression.py || die
# Copy absence mesh file
if use test ; then
@@ -125,8 +135,8 @@ src_test() {
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
- export PATH=$PATH:$SU2_RUN
- export PYTHONPATH=$PYTHONPATH:$SU2_RUN
+ export PATH="${PATH}:${SU2_RUN}"
+ export PYTHONPATH="${PYTHONPATH}:${SU2_RUN}"
einfo "Running UnitTests ..."
../${P}-build/UnitTests/test_driver || die
@@ -144,13 +154,14 @@ src_test() {
}
src_install() {
- meson_src_install
+ DESTDIR="${D}" meson_src_install
+
mkdir -p "${D}$(python_get_sitedir)" || die
mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
- insinto "/usr/share/${P}"
+ insinto "/usr/share/${PN}"
doins -r Tutorials
fi
}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2022-12-09 16:52 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2022-12-09 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 6e77cc7037fb293ce3fa48f8153b4764f84c45ce
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Dec 9 16:48:04 2022 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Fri Dec 9 16:48:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e77cc70
sci-physics/SU2: cleanup Manifest
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index 3b721ab82..128d0d5aa 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,4 +1,3 @@
DIST SU2-7.2.0-TestCases.tar.gz 464156192 BLAKE2B 405a5ccdd13bc5109feca1462b6ac434a4d817adbaca964465678683d5593fa940579e364e33414da5f059a89b2919fbc0baed82967246356da49c87ac9ce63f SHA512 d75894c285ac7cb4c72eece10a02f014fb2d85b585c08d1a9bbf12ab51f6004be99c368bde98734891dc45446d0656b21317b50d7d14af95b6ce4bfe72871f11
DIST SU2-7.2.0-Tutorials.tar.gz 72845754 BLAKE2B ef670a77d0189e9fd8ad48d96bd4617de558311d0df0d81a10dd3cbf8b97b7fbcb0e6725746d8451ce12a923f6895a392582fa980f4054b3b1306609431900ff SHA512 c91cfbdfb26169fc36575f60ec3133ea4a6f39c8433e276840a0f96c7508f3ee898020179ac01d606da9c5e10ee2ad263a642ff6f6b7400d75f4eb03ee7e1cf8
DIST SU2-7.2.0.tar.gz 15356101 BLAKE2B e52f09d0451c200f6fd6874d55bedf7733f934cb2cee378ca286107960bd82332adc932cae57e9052654b34972717a4f8969db216acdcef8a6816b648119df94 SHA512 5600ebb97ef5939333907f75cda58a02810642439309fc8626ed974dfbfaffdf0cd7d9cc81de310cb12e6f92f98b64c58d607ad93095bd86cc583768947ccf6b
-DIST mutationpp-1.0.1.tar.gz 4021945 BLAKE2B caae3ca155541a36822a950047efb867aab098bc9db311d675acca272d7f317ff35524086a0ea5eda524bbe125e4874f41dc1dbad92bfee4387e3a0c649bbd0a SHA512 ba8beeb7cdaf1b526571e27f745d8d53c1e20a96bd194a5949acb8b6d5f75553867158a63bfc7198502177a9e8a91bf82a67d450a3ba72b21f8490539f45ef01
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2022-12-09 16:52 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2022-12-09 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 01d691c3d7f455d6c3a2e52856446c599c754cf7
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Dec 9 16:50:53 2022 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Fri Dec 9 16:50:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01d691c3
sci-physics/SU2: update src_test and src_install
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/SU2-7.2.0-r100.ebuild | 17 ++++++++---------
sci-physics/SU2/SU2-7.2.0-r2.ebuild | 12 ++++++++++--
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/sci-physics/SU2/SU2-7.2.0-r100.ebuild b/sci-physics/SU2/SU2-7.2.0-r100.ebuild
index 97dceb66e..482a29200 100644
--- a/sci-physics/SU2/SU2-7.2.0-r100.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r100.ebuild
@@ -165,6 +165,7 @@ src_test() {
if use autodiff ; then
ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_AD SU2_PY/SU2_CFD_AD || die
ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT_AD SU2_PY/SU2_DOT_AD || die
+ ln -s ../../${P}-build/SU2_PY/pySU2/pysu2ad.py SU2_PY/pysu2ad.py || die
ln -s ../../${P}-build/SU2_PY/pySU2/_pysu2ad.so SU2_PY/_pysu2ad.so || die
if use directdiff ; then
ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_DIRECTDIFF SU2_PY/SU2_CFD_DIRECTDIFF || die
@@ -187,15 +188,13 @@ src_test() {
fi
if use autodiff ; then
${EPYTHON} parallel_regression_AD.py || die
- else
- ${EPYTHON} parallel_regression.py || die
fi
+ ${EPYTHON} parallel_regression.py || die
else
if use autodiff ; then
${EPYTHON} serial_regression_AD.py || die
- else
- ${EPYTHON} serial_regression.py || die
fi
+ ${EPYTHON} serial_regression.py || die
fi
popd || die
}
@@ -205,7 +204,7 @@ src_install() {
mkdir -p "${D}$(python_get_sitedir)/SU2_PY" || die
if use python; then
- mv "${ED}"/usr/bin/{pysu2.py,_pysu2.so} -t "${D}$(python_get_sitedir)/SU2_PY" || die
+ mv "${ED}"/usr/bin/*.so -t "${D}$(python_get_sitedir)/SU2_PY" || die
fi
mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran} -t "${D}$(python_get_sitedir)" || die
mv "${ED}"/usr/bin/*.py -t "${D}$(python_get_sitedir)/SU2_PY" || die
@@ -217,9 +216,9 @@ src_install() {
fi
local SU2_RUN="$(python_get_sitedir)/SU2_PY"
- echo SU2_RUN="${SU2_RUN}" > 99_SU2
- echo PATH="${SU2_RUN}" >> 99_SU2
- echo PYTHONPATH="${SU2_RUN}" >> 99_SU2
+ echo SU2_RUN="${SU2_RUN}" > 99SU2
+ echo PATH="${SU2_RUN}" >> 99SU2
+ echo PYTHONPATH="${SU2_RUN}" >> 99SU2
- doenvd 99_SU2
+ doenvd 99SU2
}
diff --git a/sci-physics/SU2/SU2-7.2.0-r2.ebuild b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
index 1bc85bf7e..adc8adfd5 100644
--- a/sci-physics/SU2/SU2-7.2.0-r2.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
@@ -156,12 +156,20 @@ src_test() {
src_install() {
DESTDIR="${D}" meson_src_install
- mkdir -p "${D}$(python_get_sitedir)" || die
- mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
+ mkdir -p "${D}$(python_get_sitedir)/SU2_PY" || die
+ mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran} -t "${D}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/*.py -t "${D}$(python_get_sitedir)/SU2_PY" || die
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
insinto "/usr/share/${PN}"
doins -r Tutorials
fi
+
+ local SU2_RUN="$(python_get_sitedir)/SU2_PY"
+ echo SU2_RUN="${SU2_RUN}" > 99SU2
+ echo PATH="${SU2_RUN}" >> 99SU2
+ echo PYTHONPATH="${SU2_RUN}" >> 99SU2
+
+ doenvd 99SU2
}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2023-04-23 9:48 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2023-04-23 9:48 UTC (permalink / raw
To: gentoo-commits
commit: cf711bb21aa134f12be8077fbe1812de8042ff42
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Apr 23 09:48:01 2023 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sun Apr 23 09:48:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf711bb2
sci-physics/SU2: 7.5.1 version bump
Closes: https://bugs.gentoo.org/897660
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/Manifest | 3 +
sci-physics/SU2/SU2-7.5.1.ebuild | 253 +++++++++++++++++++++++++++++++++++++++
2 files changed, 256 insertions(+)
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest
index 128d0d5aa..ade030808 100644
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,3 +1,6 @@
DIST SU2-7.2.0-TestCases.tar.gz 464156192 BLAKE2B 405a5ccdd13bc5109feca1462b6ac434a4d817adbaca964465678683d5593fa940579e364e33414da5f059a89b2919fbc0baed82967246356da49c87ac9ce63f SHA512 d75894c285ac7cb4c72eece10a02f014fb2d85b585c08d1a9bbf12ab51f6004be99c368bde98734891dc45446d0656b21317b50d7d14af95b6ce4bfe72871f11
DIST SU2-7.2.0-Tutorials.tar.gz 72845754 BLAKE2B ef670a77d0189e9fd8ad48d96bd4617de558311d0df0d81a10dd3cbf8b97b7fbcb0e6725746d8451ce12a923f6895a392582fa980f4054b3b1306609431900ff SHA512 c91cfbdfb26169fc36575f60ec3133ea4a6f39c8433e276840a0f96c7508f3ee898020179ac01d606da9c5e10ee2ad263a642ff6f6b7400d75f4eb03ee7e1cf8
DIST SU2-7.2.0.tar.gz 15356101 BLAKE2B e52f09d0451c200f6fd6874d55bedf7733f934cb2cee378ca286107960bd82332adc932cae57e9052654b34972717a4f8969db216acdcef8a6816b648119df94 SHA512 5600ebb97ef5939333907f75cda58a02810642439309fc8626ed974dfbfaffdf0cd7d9cc81de310cb12e6f92f98b64c58d607ad93095bd86cc583768947ccf6b
+DIST SU2-7.5.1-TestCases.tar.gz 491384375 BLAKE2B f43b605a578cac948c95a35407de4f21a0acbb6befd93fc3f79fba6a3967b64500c7d8cf055051c67dac16176790ae7aca2064c6e24a9777131a6fd01783128a SHA512 e7b67d5ca3792133680828e243b19346ba4fdadb4bf599d76d25b6525e5262d7014dd28ed8dc7558c38534a78d40048269ef71882b0e6961be19b65a13135cab
+DIST SU2-7.5.1-Tutorials.tar.gz 98615786 BLAKE2B 906934ada10f60c14aab6d78d742514f008ce833afc53bbd94ba833db6e4734b77d682ce927e989c80829f88858563cd07033e8cc5f80f73bd9bb8eeff4ebba6 SHA512 f59777bc4cecd4b6100bb42ab5f4f30c3119d626f47b0fe7d4c02268af5273ed1f0215a69b78579b5c8ea93d8f01b8533e96ee002c402ae4c0515861ee87dcac
+DIST SU2-7.5.1.tar.gz 18894402 BLAKE2B a5e1be7e84765b1d4d3bfa05f60756ec0fb7f50be795836f2e37f83cbb6fd2304b5f572891e69be6e627b972e28fbd975a1cc6cfcf840acc975a02de672706b7 SHA512 863955d95d816fad551254e8d12d71baec771f28e0321705c4fe5f49b72890b079509b716e1274f28fcfaaba00c5d40a10d1cf5b910b71d7836d618fd770fec0
diff --git a/sci-physics/SU2/SU2-7.5.1.ebuild b/sci-physics/SU2/SU2-7.5.1.ebuild
new file mode 100644
index 000000000..b46260f66
--- /dev/null
+++ b/sci-physics/SU2/SU2-7.5.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
+HOMEPAGE="https://su2code.github.io/"
+SRC_URI="
+ https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
+ tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
+"
+
+LICENSE="
+ LGPL-2.1
+ tecio? ( tecio_license_agreement )
+ parmetis? ( all-rights-reserved free-noncomm )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="autodiff cgns directdiff librom mixed-precision mkl +mpi mpp openblas openmp parmetis pastix python tecio test tutorials"
+# TODO: do not force openblas
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ parmetis? ( mpi )
+ pastix? (
+ mpi
+ || ( openblas mkl )
+ )
+ test? ( mpi python tutorials )
+ ?? ( openblas mkl )
+ ?? ( directdiff pastix )
+"
+
+# Tests fail with FEATURES="network-sandbox" for most versions of openmpi and mpich it with error:
+# "No network interfaces were found for out-of-band communications.
+# We require at least one available network for out-of-band messaging."
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ cgns? ( >=sci-libs/cgnslib-4 )
+ librom? ( sci-libs/libROM )
+ mkl? ( sci-libs/mkl )
+ mpi? ( virtual/mpi[cxx] )
+ mpp? ( sci-libs/Mutationpp:= )
+ openblas? ( sci-libs/openblas )
+ pastix? (
+ <sci-libs/pastix-6[mpi?]
+ sci-libs/scotch
+ )
+ python? ( $(python_gen_cond_dep '
+ dev-python/mpi4py[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/cli11:=
+ dev-cpp/MEL:=
+ autodiff? (
+ sci-libs/CoDiPack:=
+ mpi? ( >sci-libs/MeDiPack-1.2:= )
+ openmp? ( sci-libs/OpDiLib:= )
+ )
+ directdiff? (
+ sci-libs/CoDiPack:=
+ mpi? ( >sci-libs/MeDiPack-1.2:= )
+ )
+ tecio? ( >=dev-libs/boost-1.76.0:= )
+ test? ( <dev-cpp/catch-3:0 )
+"
+BDEPEND="
+ python? ( dev-lang/swig )
+ virtual/pkgconfig
+"
+
+DOCS=( "README.md" "SU2_PY/documentation.txt" )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
+ "${FILESDIR}/${PN}-7.1.0-fix-env.patch"
+ "${FILESDIR}/${P}-system-libraries.patch"
+ "${FILESDIR}/${PN}-7.2.0-DESTDIR.patch"
+ "${FILESDIR}/${PN}-7.2.0-fix-headers.patch"
+
+)
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ if use test ; then
+ einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
+ tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
+ fi
+ if use tutorials ; then
+ einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
+ mkdir "${P}"/Tutorials || die
+ tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
+ fi
+}
+
+src_prepare(){
+ rm -rf externals/{CLI11,autotools,catch2,cgns,codi,medi,mel,meson,ninja,opdi} || die
+
+ default
+ # boost Geometry requires c++14 since >=boost-1.75
+ sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
+
+ # Force Disable parmetis support in meson.build (configure.ac has optional switch)
+ use !parmetis && { sed -i -e "/parmetis/Id" meson.build || die ; }
+
+ # Replace platform.processor() with platform.machine()
+ # to get 'x86_64' in common case instead of full CPU name
+ sed -i "s/processor()/machine()/" TestCases/TestCase.py || die
+
+ # Fix python3.11 test compatibility (drop universal newline parameter - it's used by default)
+ sed -i "s/'U'//g" TestCases/TestCase.py || die
+
+ # Disable failed tests
+ sed -i "/append(tutorial_unst_naca0012)/s/./#&/" TestCases/tutorials.py || die # reasults sligtly differs
+
+ sed -i "/append(turbmod_sa_neg_rae2822/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(dyn_fsi/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(fd_sp_pinArray_cht_2d_dp_hf/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(fd_sp_pinArray_cht_2d_dp_hf/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(coolprop_fluidModel/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(coolprop_transportModel/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(uniform_flow/s/./#&/" TestCases/parallel_regression.py || die
+ sed -i "/append(pywrapper_square_cylinder/s/./#&/" TestCases/parallel_regression.py || die
+
+ sed -i "/append(discadj_fsi2/s/./#&/" TestCases/parallel_regression_AD.py || die
+ sed -i "/append(dyn_discadj_fsi/s/./#&/" TestCases/parallel_regression_AD.py || die
+}
+
+src_configure() {
+ if use mpi ; then
+ export CC=mpicc
+ export CXX=mpicxx
+ fi
+
+ local emesonargs=(
+ $(meson_feature mpi with-mpi)
+ $(meson_use autodiff enable-autodiff)
+ $(meson_use cgns enable-cgns)
+ $(meson_use directdiff enable-directdiff)
+ $(meson_use librom enable-librom)
+ $(meson_use mixed-precision enable-mixedprec)
+ $(meson_use mkl enable-mkl)
+ $(meson_use mpi custom-mpi)
+ $(meson_use mpp enable-mpp)
+ $(meson_use openblas enable-openblas)
+ $(meson_use openmp with-omp)
+ $(meson_use pastix enable-pastix)
+ $(meson_use python enable-pywrapper)
+ $(meson_use tecio enable-tecio)
+ $(meson_use test enable-tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ ln -sf ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die
+ ln -sf ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die
+ ln -sf ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die
+ ln -sf ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die
+ ln -sf ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die
+ ln -sf ../../${P}-build/SU2_PY/pySU2/pysu2.py SU2_PY/pysu2.py || die
+ ln -sf ../../${P}-build/SU2_PY/pySU2/_pysu2.so SU2_PY/_pysu2.so || die
+ if use autodiff ; then
+ ln -sf ../../${P}-build/SU2_CFD/src/SU2_CFD_AD SU2_PY/SU2_CFD_AD || die
+ ln -sf ../../${P}-build/SU2_DOT/src/SU2_DOT_AD SU2_PY/SU2_DOT_AD || die
+ ln -sf ../../${P}-build/SU2_PY/pySU2/pysu2ad.py SU2_PY/pysu2ad.py || die
+ ln -sf ../../${P}-build/SU2_PY/pySU2/_pysu2ad.so SU2_PY/_pysu2ad.so || die
+ if use directdiff ; then
+ ln -sf ../../${P}-build/SU2_CFD/src/SU2_CFD_DIRECTDIFF SU2_PY/SU2_CFD_DIRECTDIFF || die
+ fi
+ fi
+
+ export SU2_RUN="${S}/SU2_PY"
+ export SU2_HOME="${S}"
+ export PATH="${PATH}:${SU2_RUN}"
+ export PYTHONPATH="${PYTHONPATH}:${SU2_RUN}"
+
+ if use autodiff ; then
+ einfo "Running UnitTests ..."
+ ../${P}-build/UnitTests/test_driver_AD || die
+ ../${P}-build/UnitTests/test_driver_DD || die
+# else
+ ## Failed for SU2-7.5.1 with error:
+ ## application called MPI_Abort(MPI_COMM_WORLD, 1) - process 0
+ ## [unset]: write_line error; fd=-1 buf=:cmd=abort exitcode=1
+ ## system msg for write_line failure : Bad file descriptor
+# ../${P}-build/UnitTests/test_driver || die
+ fi
+
+ pushd TestCases/ || die
+ # Currently Tests always use mpi.
+ # Description on the page https://su2code.github.io/docs/Test-Cases/ states:
+ # "Note: While many of the cases are used for regression testing, the test case suite
+ # is provided without any guarantees on performance or expected results.
+ # Tutorials (which are more thoroughly checked for convergence and results) can be found here."
+ # Therefore bundled parmetis/metis are used otherwise it results in numerous Tutorials tests failures.
+ if use mpi ; then
+ # Running Tutorials tests is preferred than TestCases
+ if use tutorials ; then
+ ${EPYTHON} tutorials.py || die
+ fi
+ if use autodiff ; then
+ ${EPYTHON} parallel_regression_AD.py || die
+ fi
+ ${EPYTHON} parallel_regression.py || die
+ else
+ if use autodiff ; then
+ ${EPYTHON} serial_regression_AD.py || die
+ fi
+ ${EPYTHON} serial_regression.py || die
+ fi
+ popd || die
+}
+
+src_install() {
+ DESTDIR="${D}" meson_src_install
+
+ mkdir -p "${D}$(python_get_sitedir)/SU2_PY" || die
+ if use python; then
+ mv "${ED}"/usr/bin/*.so -t "${D}$(python_get_sitedir)/SU2_PY" || die
+ fi
+ mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran} -t "${D}$(python_get_sitedir)" || die
+ mv "${ED}"/usr/bin/*.py -t "${D}$(python_get_sitedir)/SU2_PY" || die
+ python_optimize "${D}/$(python_get_sitedir)"
+
+ if use tutorials ; then
+ insinto "/usr/share/${PN}"
+ doins -r Tutorials
+ fi
+
+ local SU2_RUN="$(python_get_sitedir)/SU2_PY"
+ echo SU2_RUN="${SU2_RUN}" > 99SU2
+ echo PATH="${SU2_RUN}" >> 99SU2
+ echo PYTHONPATH="${SU2_RUN}" >> 99SU2
+
+ doenvd 99SU2
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/
@ 2023-04-23 10:44 Sergey Torokhov
0 siblings, 0 replies; 19+ messages in thread
From: Sergey Torokhov @ 2023-04-23 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 987255bb055277a4b0cbadab98ba2905d77a202d
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Apr 23 10:29:22 2023 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sun Apr 23 10:29:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=987255bb
sci-physics/SU2: maintainer-needed
Unfortunately I have no time to maintain this package
in acceptable quality and provide needed updates on time.
Before droping of maintaining I tried to bump version to 7.5.1
and fix python 3.11 compatibility.
If anyone interesting to grub this package please note:
1. The test phase currently depends on one-header dev-cpp/catch lib,
i.e. <dev-cpp/catch-3.0:0 (starting 3.0 the header was splitted).
2. Description on the page
https://su2code.github.io/docs/Test-Cases/ states:
"Note: While many of the cases are used for regression testing,
the test case suite is provided without any guarantees on performance
or expected results. Tutorials (which are more thoroughly checked
for convergence and results) can be found here."
Therefore bundled parmetis/metis are used otherwise it
results in numerous Tutorials tests failures.
Thus it better to pass Tutorials tests than brake the package at all.
P.S.
Great thanks to Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
for work on unbundle of thirdparty libraries.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
sci-physics/SU2/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sci-physics/SU2/metadata.xml b/sci-physics/SU2/metadata.xml
index 361d8a68f..41dce6ab0 100644
--- a/sci-physics/SU2/metadata.xml
+++ b/sci-physics/SU2/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>torokhov-s-a@yandex.ru</email>
- <name>Sergey Torokhov</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="autodiff">Enable support for reverse automatic differentiation</flag>
<flag name="cgns">Build with CGNS support</flag>
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2023-04-23 10:44 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-08 22:44 [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/ Sergey Torokhov
-- strict thread matches above, loose matches on Subject: below --
2023-04-23 10:44 Sergey Torokhov
2023-04-23 9:48 Sergey Torokhov
2022-12-09 16:52 Sergey Torokhov
2022-12-09 16:52 Sergey Torokhov
2022-05-28 13:45 Alessandro Barbieri
2021-10-27 20:55 Sergey Torokhov
2021-10-24 21:07 Sergey Torokhov
2021-10-15 16:20 Sergey Torokhov
2021-09-15 21:43 Sergey Torokhov
2021-09-05 10:45 Sergey Torokhov
2021-08-31 14:07 Sergey Torokhov
2021-08-31 14:07 Sergey Torokhov
2021-05-30 15:59 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-05-30 15:59 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-28 10:52 Andrew Ammerlaan
2021-03-22 20:14 Sergey Torokhov
2021-03-10 20:02 Sergey Torokhov
2021-01-05 14:00 Sergey Torokhov
2021-01-05 13:54 Sergey Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox