Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages / openmpi
Commits: 80760a12 by Jakub Klinkovský at 2025-02-17T22:12:27+01:00 upgpkg: 5.0.7-1 - - - - - 4 changed files: - .SRCINFO - PKGBUILD - − fix-cuda-build.patch - + fix-oshmem-pointer-cast.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = openmpi pkgdesc = High performance message passing library (MPI) - pkgver = 5.0.6 - pkgrel = 2 + pkgver = 5.0.7 + pkgrel = 1 url = https://www.open-mpi.org arch = x86_64 license = BSD-3-Clause AND LicenseRef-MPICH @@ -21,12 +21,12 @@ pkgbase = openmpi makedepends = prrte makedepends = valgrind makedepends = zlib - 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 + source = https://www.open-mpi.org/software/ompi/v5.0/downloads/openmpi-5.0.7.tar.bz2 + source = fix-oshmem-pointer-cast.patch + sha256sums = 119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd + sha256sums = 5ee931a9260cf077abf3af901145f237c5382a0ec407921debb1d6c446420568 + b2sums = 5e26ef366e9587c686e395d596f3f28f619dbf76981091f7f3cc9c76e8cc3e1f558eef0ff1538498eea25c04c661fc7e2402083efa81def675cbaece74b8c6f0 + b2sums = e45e2d66db1a69a5c0c38d76973f2ee475fa389a9a068f6918e61d43b494857b14c45c52867fb53911fe5c9eb58680ad347b75578888ba41b782edcf09e3a6a9 pkgname = openmpi depends = gcc-libs ===================================== PKGBUILD ===================================== @@ -9,8 +9,8 @@ pkgname=( openmpi openmpi-docs ) -pkgver=5.0.6 -pkgrel=2 +pkgver=5.0.7 +pkgrel=1 pkgdesc='High performance message passing library (MPI)' arch=(x86_64) url='https://www.open-mpi.org' @@ -35,12 +35,12 @@ makedepends=( ) source=( https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/$pkgbase-$pkgver.tar.bz2 - fix-cuda-build.patch + fix-oshmem-pointer-cast.patch ) -sha256sums=('bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157' - '7acee1f8fd6b592b5e3ff09ed0f059a49387c0d00418430a67e5e6d849c8fbea') -b2sums=('72418c4d2cdc0628214e0c2db2e8d2dd52234a3888d7344eff23576b19de94d4cb74b168120d72cedeea8c835db363d83b61319fcdf13277c541003606f4558a' - '51c5dfd4d7ca5b3f650efab4f0d8b383f8767ecfdb192272c796b00608cb412c7cc5ad1231af27be639b238d1e55be34e411aa40efbb37a6a3a99b83e3c2a1f9') +sha256sums=('119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd' + '5ee931a9260cf077abf3af901145f237c5382a0ec407921debb1d6c446420568') +b2sums=('5e26ef366e9587c686e395d596f3f28f619dbf76981091f7f3cc9c76e8cc3e1f558eef0ff1538498eea25c04c661fc7e2402083efa81def675cbaece74b8c6f0' + 'e45e2d66db1a69a5c0c38d76973f2ee475fa389a9a068f6918e61d43b494857b14c45c52867fb53911fe5c9eb58680ad347b75578888ba41b782edcf09e3a6a9') _pick() { local p="$1" f d; shift @@ -59,8 +59,8 @@ prepare() { 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 + # fix regression in 5.0.7 https://github.com/open-mpi/ompi/issues/13103 + patch -p1 -i ../fix-oshmem-pointer-cast.patch } build() { ===================================== fix-cuda-build.patch deleted ===================================== @@ -1,26 +0,0 @@ -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) ===================================== fix-oshmem-pointer-cast.patch ===================================== @@ -0,0 +1,12 @@ +diff --git a/oshmem/mca/sshmem/base/sshmem_base_open.c b/oshmem/mca/sshmem/base/sshmem_base_open.c +index 1f0d1eb..ed25cb5 100644 +--- a/oshmem/mca/sshmem/base/sshmem_base_open.c ++++ b/oshmem/mca/sshmem/base/sshmem_base_open.c +@@ -31,7 +31,7 @@ + * globals + */ + +-void *mca_sshmem_base_start_address = UINTPTR_MAX; ++void *mca_sshmem_base_start_address = (void*)UINTPTR_MAX; + + char * mca_sshmem_base_backing_file_dir = NULL; View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/openmpi/-/commit/80760a12cc7d6db2d4006933e2ab88464ae376e3 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/openmpi/-/commit/80760a12cc7d6db2d4006933e2ab88464ae376e3 You're receiving this email because of your account on gitlab.archlinux.org.