Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
openmpi
Commits:
0848dd09 by Jakub Klinkovský at 2024-12-23T08:57:25+01:00
upgpkg: 5.0.6-1
- add a patch to fix CUDA build
- remove unnecessary workaround for old glibc
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix-cuda-build.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = openmpi
pkgdesc = High performance message passing library (MPI)
- pkgver = 5.0.5
- pkgrel = 2
+ pkgver = 5.0.6
+ pkgrel = 1
url = https://www.open-mpi.org
arch = x86_64
license = BSD-3-Clause AND LicenseRef-MPICH
@@ -21,9 +21,12 @@ pkgbase = openmpi
makedepends = prrte
makedepends = valgrind
makedepends = zlib
- source =
https://www.open-mpi.org/software/ompi/v5.0/downloads/openmpi-5.0.5.tar.bz2
- sha256sums =
6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776
- b2sums =
740e5dbc7e54b8f4eac4fa2c40fb5a0ccfba201dff15ccc84899f28dfad0147078ef6c2b0585615c93fc6edb70b665b3f7a9adea5e5e53a7563ae4c7a6ccbada
+ source =
https://www.open-mpi.org/software/ompi/v5.0/downloads/openmpi-5.0.6.tar.bz2
+ source = fix-cuda-build.patch
+ sha256sums =
bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157
+ sha256sums =
7acee1f8fd6b592b5e3ff09ed0f059a49387c0d00418430a67e5e6d849c8fbea
+ b2sums =
72418c4d2cdc0628214e0c2db2e8d2dd52234a3888d7344eff23576b19de94d4cb74b168120d72cedeea8c835db363d83b61319fcdf13277c541003606f4558a
+ b2sums =
51c5dfd4d7ca5b3f650efab4f0d8b383f8767ecfdb192272c796b00608cb412c7cc5ad1231af27be639b238d1e55be34e411aa40efbb37a6a3a99b83e3c2a1f9
pkgname = openmpi
depends = gcc-libs
=====================================
PKGBUILD
=====================================
@@ -9,8 +9,8 @@ pkgname=(
openmpi
openmpi-docs
)
-pkgver=5.0.5
-pkgrel=2
+pkgver=5.0.6
+pkgrel=1
pkgdesc='High performance message passing library (MPI)'
arch=(x86_64)
url='https://www.open-mpi.org'
@@ -34,9 +34,13 @@ makedepends=(
zlib
)
source=(
-
https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/$pkgbase-$pkgver.tar.bz2)
-sha256sums=('6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776')
-b2sums=('740e5dbc7e54b8f4eac4fa2c40fb5a0ccfba201dff15ccc84899f28dfad0147078ef6c2b0585615c93fc6edb70b665b3f7a9adea5e5e53a7563ae4c7a6ccbada')
+
https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/$pkgbase-$pkgver.tar.bz2
+ fix-cuda-build.patch
+)
+sha256sums=('bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157'
+ '7acee1f8fd6b592b5e3ff09ed0f059a49387c0d00418430a67e5e6d849c8fbea')
+b2sums=('72418c4d2cdc0628214e0c2db2e8d2dd52234a3888d7344eff23576b19de94d4cb74b168120d72cedeea8c835db363d83b61319fcdf13277c541003606f4558a'
+
'51c5dfd4d7ca5b3f650efab4f0d8b383f8767ecfdb192272c796b00608cb412c7cc5ad1231af27be639b238d1e55be34e411aa40efbb37a6a3a99b83e3c2a1f9')
_pick() {
local p="$1" f d; shift
@@ -54,6 +58,9 @@ prepare() {
sed -i 's|WRAPPER__FCFLAGS|WRAPPER_FCFLAGS|g' configure
sed -i 's|WRAPPER_EXTRA_FCFLAGS|WRAPPER_FCFLAGS|g' configure
sed -i 's|"-I/usr/include",||' opal/tools/wrappers/opal_wrapper.c
+
+ # fix regression in 5.0.6 https://github.com/open-mpi/ompi/issues/12924
+ patch -Np1 -i ../fix-cuda-build.patch
}
build() {
@@ -90,8 +97,7 @@ build() {
export HOSTNAME=buildhost
export USER=builduser
- # TODO: remove ac_cv_func_sem_open=no when there is a glibc release fixing
https://sourceware.org/bugzilla/show_bug.cgi?id=30789
- ac_cv_func_sem_open=no ./configure "${configure_options[@]}"
+ ./configure "${configure_options[@]}"
# prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make V=1
=====================================
fix-cuda-build.patch
=====================================
@@ -0,0 +1,26 @@
+diff --git a/ompi/mca/coll/cuda/coll_cuda.h b/ompi/mca/coll/cuda/coll_cuda.h
+index afedc632ee..4b3ecc647e 100644
+--- a/ompi/mca/coll/cuda/coll_cuda.h
++++ b/ompi/mca/coll/cuda/coll_cuda.h
+@@ -54,7 +54,7 @@ int mca_coll_cuda_reduce(const void *sbuf, void *rbuf, int
count,
+ struct ompi_communicator_t *comm,
+ mca_coll_base_module_t *module);
+
+-int mca_coll_cuda_reduce_local(const void *sbuf, void *rbuf, size_t count,
++int mca_coll_cuda_reduce_local(const void *sbuf, void *rbuf, int count,
+ struct ompi_datatype_t *dtype,
+ struct ompi_op_t *op,
+ mca_coll_base_module_t *module);
+diff --git a/ompi/mca/coll/cuda/coll_cuda_reduce.c
b/ompi/mca/coll/cuda/coll_cuda_reduce.c
+index 7743a07874..e165a1d9bb 100644
+--- a/ompi/mca/coll/cuda/coll_cuda_reduce.c
++++ b/ompi/mca/coll/cuda/coll_cuda_reduce.c
+@@ -85,7 +85,7 @@ mca_coll_cuda_reduce(const void *sbuf, void *rbuf, int count,
+ }
+
+ int
+-mca_coll_cuda_reduce_local(const void *sbuf, void *rbuf, size_t count,
++mca_coll_cuda_reduce_local(const void *sbuf, void *rbuf, int count,
+ struct ompi_datatype_t *dtype,
+ struct ompi_op_t *op,
+ mca_coll_base_module_t *module)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/openmpi/-/commit/0848dd09c8286800e4e8f01c28736cc2ddcf69e2
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/openmpi/-/commit/0848dd09c8286800e4e8f01c28736cc2ddcf69e2
You're receiving this email because of your account on gitlab.archlinux.org.
