[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/, sys-cluster/scr/files/
commit: db8d00fb900eb88470bcbeaee7c3b92d5e8c5df9
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Mar 26 09:14:02 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Mar 26 09:14:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=db8d00fb
sys-cluster/scr: also link yogrt for serial library
Closes: https://bugs.gentoo.org/821457
Signed-off-by: Alessandro Barbieri gmail.com>
sys-cluster/scr/Manifest | 1 -
...GRT_LIBRARIES-to-SCR_EXTERNAL_SERIAL_LIBS.patch | 15 +++
sys-cluster/scr/scr-3.0.ebuild | 1 +
sys-cluster/scr/scr-3.0_pre2.ebuild| 104 -
4 files changed, 16 insertions(+), 105 deletions(-)
diff --git a/sys-cluster/scr/Manifest b/sys-cluster/scr/Manifest
index 0eafc8db1..9f5785127 100644
--- a/sys-cluster/scr/Manifest
+++ b/sys-cluster/scr/Manifest
@@ -1,2 +1 @@
DIST scr-3.0.tar.gz 1235509 BLAKE2B
3a470c1f55d633993db6ca7c7980e6b8b34513370a8233202ac21d625f64c1630eafd6084735e81fe60e05f182b71114f51f8f4fe69df8cf609b1e6d6ded01f5
SHA512
168bffb7c0280094075879fa5c626dfc57f9004c9ebe09a97cf0d2b0e67c3979f31c7b39466586eb20562e6768ce576625a6d4d99f9ad9fe5ae02a82cfbc988f
-DIST scr-3.0_pre2.tar.gz 1231943 BLAKE2B
a4d8e779edc4b48a5b13a0cff851496068076a8ae901f3c3d3ad2344708a0abc6b69ce71bd7313286a91844a87930e6fa5c097d1c5b15ebbc12247ba293f843f
SHA512
7b90b14cfbb6fa3020b6c3c3a7f5568963374d9fe7ad0b6962632f776c3699d6c38fa04800736d423350190542896ca9240033dca1e820f7f698c336518c891a
diff --git
a/sys-cluster/scr/files/scr-3.0-add-YOGRT_LIBRARIES-to-SCR_EXTERNAL_SERIAL_LIBS.patch
b/sys-cluster/scr/files/scr-3.0-add-YOGRT_LIBRARIES-to-SCR_EXTERNAL_SERIAL_LIBS.patch
new file mode 100644
index 0..c430cc90a
--- /dev/null
+++
b/sys-cluster/scr/files/scr-3.0-add-YOGRT_LIBRARIES-to-SCR_EXTERNAL_SERIAL_LIBS.patch
@@ -0,0 +1,15 @@
+From e842ed30c49d26cc818600fd794354103f99c5fe Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 26 Mar 2022 10:10:01 +0100
+Subject: [PATCH] add YOGRT_LIBRARIES to SCR_EXTERNAL_SERIAL_LIBS
+
+--- a/cmake/SCR_DEPENDENCIES.cmake
b/cmake/SCR_DEPENDENCIES.cmake
+@@ -46,6 +46,7 @@ IF(ENABLE_YOGRT)
+ SET(HAVE_LIBYOGRT TRUE)
+ INCLUDE_DIRECTORIES(${YOGRT_INCLUDE_DIRS})
+ LIST(APPEND SCR_EXTERNAL_LIBS ${YOGRT_LIBRARIES})
++ LIST(APPEND SCR_EXTERNAL_SERIAL_LIBS ${YOGRT_LIBRARIES})
+ LIST(APPEND SCR_LINK_LINE " -L${WITH_YOGRT_PREFIX}/lib -lyogrt")
+ENDIF(YOGRT_FOUND)
+ ENDIF(ENABLE_YOGRT)
diff --git a/sys-cluster/scr/scr-3.0.ebuild b/sys-cluster/scr/scr-3.0.ebuild
index 436162f74..ca08463fd 100644
--- a/sys-cluster/scr/scr-3.0.ebuild
+++ b/sys-cluster/scr/scr-3.0.ebuild
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0_pre2-shared-libscr_base.patch"
"${FILESDIR}/${PN}-3.0_pre2-no-static.patch"
+ "${FILESDIR}/${P}-add-YOGRT_LIBRARIES-to-SCR_EXTERNAL_SERIAL_LIBS.patch"
)
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
diff --git a/sys-cluster/scr/scr-3.0_pre2.ebuild
b/sys-cluster/scr/scr-3.0_pre2.ebuild
deleted file mode 100644
index 4812b3799..0
--- a/sys-cluster/scr/scr-3.0_pre2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="${S}/doc/rst"
-FORTRAN_NEEDED="fortran"
-MYPV="${PV/_pre/rc}"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit cmake python-single-r1 fortran-2 docs
-
-DESCRIPTION="Scalable Checkpoint / Restart Library"
-HOMEPAGE="
- https://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
- https://github.com/LLNL/scr
-"
-SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz ->
${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MYPV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples fcntl +flock +fortran mysql slurm syslog test txt-log
+yogrt"
-
-RDEPEND="
- ${PYTHON_DEPS}
-
- app-shells/pdsh
- >=sys-cluster/AXL-0.5.0
- sys-cluster/dtcmp
- sys-cluster/er
- sys-cluster/KVTree
- sys-cluster/rankstr
- sys-cluster/redset
- sys-cluster/spath
- sys-libs/zlib
- virtual/mpi
-
- mysql? ( dev-db/mysql-connector-c )
- slurm? ( sys-cluster/slurm )
- yogrt? ( sys-cluster/libyogrt[slurm?] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-shared-libscr_base.patch"
- "${FILESDIR}/${P}-no-static.patch"
-)
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-
- ?? ( fcntl flock )
-"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_configure() {
- local lock="NONE"
- use fcntl && lock="FCNTL"
- use flock && lock="FLOCK"
-
- local log="0"
- use syslog && log="1"
- use txt-log && log="1"
-
- local resman="NONE"
- use slurm && resman="SLURM"
-
- local mycmakeargs=(
-
[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/
commit: 52bbea6a3f316d735b036f0e087dc8bfee041fed
Author: Alessandro Barbieri gmail com>
AuthorDate: Mon Oct 4 23:09:49 2021 +
Commit: Theo Anderson posteo de>
CommitDate: Mon Oct 4 23:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52bbea6a
sys-cluster/scr: use https
Signed-off-by: Alessandro Barbieri gmail.com>
sys-cluster/scr/scr-3.0_pre1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild
b/sys-cluster/scr/scr-3.0_pre1.ebuild
index b640a48d2..08524304d 100644
--- a/sys-cluster/scr/scr-3.0_pre1.ebuild
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -13,7 +13,7 @@ inherit cmake python-single-r1 fortran-2 docs
DESCRIPTION="Scalable Checkpoint / Restart Library"
HOMEPAGE="
- http://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
+ https://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
https://github.com/LLNL/scr
"
SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz ->
${P}.tar.gz"
[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/
commit: 836e96f19b6e413691b8e0f73112fa61ce370851
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Aug 3 08:38:36 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Aug 3 08:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=836e96f1
sys-cluster/scr: remove einstalldocs
Signed-off-by: Alessandro Barbieri gmail.com>
sys-cluster/scr/scr-3.0_pre1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild
b/sys-cluster/scr/scr-3.0_pre1.ebuild
index 69f58522b..16f4ec9ad 100644
--- a/sys-cluster/scr/scr-3.0_pre1.ebuild
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -102,6 +102,5 @@ src_compile() {
src_install() {
cmake_src_install
- einstalldocs
find "${ED}" -name '*.a' -delete || die
}
[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/
commit: 89de1321c6c29f71dde57c6765ddf260459d9323
Author: Alessandro Barbieri gmail com>
AuthorDate: Sun Aug 1 23:57:35 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Aug 1 23:57:35 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89de1321
sys-cluster/scr: initial import
Signed-off-by: Alessandro Barbieri gmail.com>
sys-cluster/scr/Manifest| 1 +
sys-cluster/scr/metadata.xml| 27 ++
sys-cluster/scr/scr-3.0_pre1.ebuild | 105
3 files changed, 133 insertions(+)
diff --git a/sys-cluster/scr/Manifest b/sys-cluster/scr/Manifest
new file mode 100644
index 0..a69a9230c
--- /dev/null
+++ b/sys-cluster/scr/Manifest
@@ -0,0 +1 @@
+DIST scr-3.0_pre1.tar.gz 1629041 BLAKE2B
c7922e208964b8456c65393c0f9b17530b3eb66ceab38bc682b1fb78b29f77f2d3a6c51c9c8380720c88606a8da3b34f9a088ed80198f3c4f2bfe6906faac6ef
SHA512
3bf290a41cb8abbd7e08ab02580f1e4dd73758946fe0ba7bd861a5099f8396e382dc8b80a0a33b0d45ee929efa069bd7a6381e9ca6f11d9049e113ac9aec6793
diff --git a/sys-cluster/scr/metadata.xml b/sys-cluster/scr/metadata.xml
new file mode 100644
index 0..35b2de595
--- /dev/null
+++ b/sys-cluster/scr/metadata.xml
@@ -0,0 +1,27 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+https://github.com/LLNL/scr/issues
+LLNL/scr
+
+
+The Scalable Checkpoint / Restart (SCR) library enables MPI applications to
utilize distributed storage on Linux clusters to attain high file I/O bandwidth
for checkpointing, restarting, and output in large-scale jobs. With SCR, jobs
run more efficiently, recompute less work upon a failure, and reduce load on
critical shared resources such as the parallel file system.
+
+
+use fcntl as a file locking type
+use flock as a file locking type
+Enables Fortran support
+Enable use of mysql for logging SCR activities
+Enable use of pdsh for scalable restart and
scavenge
+use pmix as resource manager
+use slurm as resource manager
+Whether to enable syslog logging
+Whether to enable text file logging
+Enable use of yogrt for time remaining in a job
allocation
+
+
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild
b/sys-cluster/scr/scr-3.0_pre1.ebuild
new file mode 100644
index 0..9671df9d7
--- /dev/null
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="${S}/doc/rst"
+FORTRAN_NEEDED="fortran"
+MYPV="${PV/_pre/rc}"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit cmake python-single-r1 fortran-2 docs
+
+DESCRIPTION="Scalable Checkpoint / Restart Library"
+HOMEPAGE="
+ http://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
+ https://github.com/LLNL/scr
+"
+SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples fcntl +flock +fortran mysql pdsh pmix slurm syslog txt-log
+yogrt"
+
+#cppr
+RDEPEND="
+ ${PYTHON_DEPS}
+
+ sys-cluster/AXL
+ sys-cluster/dtcmp
+ sys-cluster/er
+ sys-cluster/KVTree
+ sys-cluster/rankstr
+ sys-cluster/redset
+ sys-cluster/spath
+ sys-libs/zlib
+ virtual/mpi
+
+ mysql? ( dev-db/mysql-connector-c )
+ pdsh? ( app-shells/pdsh )
+ pmix? ( sys-cluster/pmix )
+ slurm? ( sys-cluster/slurm )
+ yogrt? ( sys-cluster/libyogrt[slurm?] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+
+ ?? ( pmix slurm )
+ ?? ( fcntl flock )
+"
+
+pkg_setup() {
+ fortran-2_pkg_setup
+}
+
+src_configure() {
+ local asyncapi="NONE" #INTEL_CPPR
+
+ local lock="NONE"
+ use fcntl && lock="FCNTL"
+ use flock && lock="FLOCK"
+
+ local log="0"
+ use syslog && log="1"
+ use txt-log && log="1"
+
+ local resman="NONE" #APRUN LSF
+ use pmix && resman="PMIX"
+ use slurm && resman="SLURM"
+
+ local mycmakeargs=(
+ -DBUILD_PDSH=OFF
+ -DENABLE_INTEL_CPPR=OFF
+ -DENABLE_ENABLE_CRAY_DW=OFF
+ -DENABLE_IBM_BBAPI=OF
+ -DSCR_ASYNC_API="${asyncapi}"
+ -DSCR_FILE_LOCK="${lock}"
+ -DSCR_LINK_STATIC=OFF
+ -DSCR_LOG_ENABLE="${log}"
+ -DSCR_RESOURCE_MANAGER="${resman}"
+
+ -DENABLE_EXAMPLES=$(usex examples)
+ -DENABLE_FORTRAN=$(usex fortran)
+ -DENABLE_PDSH=$(usex pdsh)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_YOGRT=$(usex yogrt)
+ -DSCR_LOG_SYSLOG_ENABLE=$(usex syslog 0 1)
+ -DSCR_LOG_TXT_ENABLE=$(usex txt-log 0 1)
+ )
+ cmake_src_configure
+}
+
[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/
commit: c232c90452d6d3a0b6b0dacde963539d33fbcdb4
Author: Alessandro Barbieri gmail com>
AuthorDate: Mon Aug 2 22:53:49 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon Aug 2 22:54:46 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c232c904
sys-cluster/scr: fix S, pdsh mandatory
Signed-off-by: Alessandro Barbieri gmail.com>
sys-cluster/scr/metadata.xml| 1 -
sys-cluster/scr/scr-3.0_pre1.ebuild | 10 ++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/scr/metadata.xml b/sys-cluster/scr/metadata.xml
index 35b2de595..d5d5447f4 100644
--- a/sys-cluster/scr/metadata.xml
+++ b/sys-cluster/scr/metadata.xml
@@ -17,7 +17,6 @@ The Scalable Checkpoint / Restart (SCR) library enables MPI
applications to util
use flock as a file locking type
Enables Fortran support
Enable use of mysql for logging SCR activities
-Enable use of pdsh for scalable restart and
scavenge
use pmix as resource manager
use slurm as resource manager
Whether to enable syslog logging
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild
b/sys-cluster/scr/scr-3.0_pre1.ebuild
index 9671df9d7..69f58522b 100644
--- a/sys-cluster/scr/scr-3.0_pre1.ebuild
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -17,16 +17,18 @@ HOMEPAGE="
https://github.com/LLNL/scr
"
SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MYPV}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc examples fcntl +flock +fortran mysql pdsh pmix slurm syslog txt-log
+yogrt"
+IUSE="doc examples fcntl +flock +fortran mysql pmix slurm syslog test txt-log
+yogrt"
#cppr
RDEPEND="
${PYTHON_DEPS}
+ app-shells/pdsh
sys-cluster/AXL
sys-cluster/dtcmp
sys-cluster/er
@@ -38,7 +40,6 @@ RDEPEND="
virtual/mpi
mysql? ( dev-db/mysql-connector-c )
- pdsh? ( app-shells/pdsh )
pmix? ( sys-cluster/pmix )
slurm? ( sys-cluster/slurm )
yogrt? ( sys-cluster/libyogrt[slurm?] )
@@ -51,6 +52,7 @@ REQUIRED_USE="
?? ( pmix slurm )
?? ( fcntl flock )
"
+RESTRICT="!test? ( test )"
pkg_setup() {
fortran-2_pkg_setup
@@ -75,7 +77,8 @@ src_configure() {
-DBUILD_PDSH=OFF
-DENABLE_INTEL_CPPR=OFF
-DENABLE_ENABLE_CRAY_DW=OFF
- -DENABLE_IBM_BBAPI=OF
+ -DENABLE_IBM_BBAPI=OFF
+ -DENABLE_PDSH=ON
-DSCR_ASYNC_API="${asyncapi}"
-DSCR_FILE_LOCK="${lock}"
-DSCR_LINK_STATIC=OFF
@@ -84,7 +87,6 @@ src_configure() {
-DENABLE_EXAMPLES=$(usex examples)
-DENABLE_FORTRAN=$(usex fortran)
- -DENABLE_PDSH=$(usex pdsh)
-DENABLE_TESTS=$(usex test)
-DENABLE_YOGRT=$(usex yogrt)
-DSCR_LOG_SYSLOG_ENABLE=$(usex syslog 0 1)
