Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add patch to fix implicit function declaration in OpenMPI 4.1.4 #20949

Merged
merged 1 commit into from
Jul 4, 2024
Merged

add patch to fix implicit function declaration in OpenMPI 4.1.4 #20949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sources = [SOURCELOWER_TAR_BZ2]
patches = [
'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch',
'OpenMPI-4.1.x_add_atomic_wmb.patch',
]
checksums = [
Expand All @@ -19,6 +20,8 @@ checksums = [
'63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
{'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
{'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch':
'ec1c2f07d03574b86fc5fb462eed96eb6f5658deb8a6412cf37007d687a28673'},
{'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
]

Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sources = [SOURCELOWER_TAR_BZ2]
patches = [
'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch',
'OpenMPI-4.1.x_add_atomic_wmb.patch',
]
checksums = [
Expand All @@ -19,6 +20,8 @@ checksums = [
'63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
{'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
{'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch':
'ec1c2f07d03574b86fc5fb462eed96eb6f5658deb8a6412cf37007d687a28673'},
{'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
]

Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sources = [SOURCELOWER_TAR_BZ2]
patches = [
'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch',
'OpenMPI-4.1.x_add_atomic_wmb.patch',
]
checksums = [
Expand All @@ -19,6 +20,8 @@ checksums = [
'63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
{'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
{'OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch':
'ec1c2f07d03574b86fc5fb462eed96eb6f5658deb8a6412cf37007d687a28673'},
{'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
]

Expand Down
31 changes: 31 additions & 0 deletions easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4_fix-implicit-cuda-function-declaration.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Fix a left-over function causing compilation warnings or errors:
mtl_ofi_component.c:298:5: error: implicit declaration of function 'mca_common_cuda_fini'; did you mean 'ompi_comm_cid_init'? [-Werror=implicit-function-declaration]
mca_common_cuda_fini();
^~~~~~~~~~~~~~~~~~~~

See https://github.com/open-mpi/ompi/issues/11381

From 7676618c43d489b145e730d1d7603f0292a031c0 Mon Sep 17 00:00:00 2001
From: Jingyin Tang <[email protected]>
Date: Mon, 6 Feb 2023 13:48:51 -0500
Subject: [PATCH] Fix compilation issue in OFI with CUDA

Signed-off-by: Jingyin Tang <[email protected]>
---
ompi/mca/mtl/ofi/mtl_ofi_component.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/ompi/mca/mtl/ofi/mtl_ofi_component.c b/ompi/mca/mtl/ofi/mtl_ofi_component.c
index c1aac6934d0..e36f020b206 100644
--- a/ompi/mca/mtl/ofi/mtl_ofi_component.c
+++ b/ompi/mca/mtl/ofi/mtl_ofi_component.c
@@ -294,9 +294,6 @@ ompi_mtl_ofi_component_query(mca_base_module_t **module, int *priority)
static int
ompi_mtl_ofi_component_close(void)
{
-#if OPAL_CUDA_SUPPORT
- mca_common_cuda_fini();
-#endif
return opal_common_ofi_close();
}

Loading