From d62f055c2c134f4c29a6c653c20c9ccef70ab52c Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Mon, 13 Jul 2026 12:11:01 +0200 Subject: [PATCH 1/7] hwmalloc gcc_hip --- ext/hwmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/hwmalloc b/ext/hwmalloc index c033330..e1a4baa 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit c03333044fcf2964c2c9f6f21405f901178ecad2 +Subproject commit e1a4baafdb7c3cc172de4232086c12272ff36e0c From 93952cbfe92d41902afa147800e6d7d10a3c442c Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Mon, 13 Jul 2026 13:21:54 +0200 Subject: [PATCH 2/7] Fixes for hwmalloc and clang compilation --- cmake/oomph_mpi.cmake | 3 +++ ext/hwmalloc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/oomph_mpi.cmake b/cmake/oomph_mpi.cmake index d4076e8..a989ecf 100644 --- a/cmake/oomph_mpi.cmake +++ b/cmake/oomph_mpi.cmake @@ -9,6 +9,9 @@ if (OOMPH_WITH_MPI) add_library(oomph_mpi SHARED) add_library(oomph::mpi ALIAS oomph_mpi) oomph_shared_lib_options(oomph_mpi) + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_link_libraries(oomph_mpi PUBLIC atomic) + endif() install(TARGETS oomph_mpi EXPORT oomph-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ext/hwmalloc b/ext/hwmalloc index e1a4baa..b89801b 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit e1a4baafdb7c3cc172de4232086c12272ff36e0c +Subproject commit b89801bb180fec0f484ec50fae1bbf2985e69018 From c54afc85c3ed83e04bcca28f11cecf9dc07a045d Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Mon, 13 Jul 2026 13:30:13 +0200 Subject: [PATCH 3/7] Update hwmalloc --- ext/hwmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/hwmalloc b/ext/hwmalloc index b89801b..31bb511 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit b89801bb180fec0f484ec50fae1bbf2985e69018 +Subproject commit 31bb511d86ce9ff732256daaa7d4681987f7b1cf From efaecf1d1853a66ee642e6e85069dd1a6673f999 Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Mon, 13 Jul 2026 15:00:56 +0200 Subject: [PATCH 4/7] Update hwmalloc --- ext/hwmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/hwmalloc b/ext/hwmalloc index 31bb511..8cc8d64 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit 31bb511d86ce9ff732256daaa7d4681987f7b1cf +Subproject commit 8cc8d64e3a6cb99ad6ab274942da1b5f209e2b7e From b693ccdeabe619f6bcdb008abf417c37505a9dbd Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 14 Jul 2026 14:01:25 +0200 Subject: [PATCH 5/7] Fix linking with atomic --- cmake/oomph_common.cmake | 3 +++ cmake/oomph_mpi.cmake | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/oomph_common.cmake b/cmake/oomph_common.cmake index cdf5d08..317b10b 100644 --- a/cmake/oomph_common.cmake +++ b/cmake/oomph_common.cmake @@ -46,6 +46,9 @@ function(oomph_shared_lib_options target) oomph_target_compile_options(${target}) oomph_target_link_options(${target}) target_link_libraries(${target} PUBLIC HWMALLOC::hwmalloc) + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_link_libraries(${target} PUBLIC atomic) + endif() endfunction() # --------------------------------------------------------------------- diff --git a/cmake/oomph_mpi.cmake b/cmake/oomph_mpi.cmake index a989ecf..d4076e8 100644 --- a/cmake/oomph_mpi.cmake +++ b/cmake/oomph_mpi.cmake @@ -9,9 +9,6 @@ if (OOMPH_WITH_MPI) add_library(oomph_mpi SHARED) add_library(oomph::mpi ALIAS oomph_mpi) oomph_shared_lib_options(oomph_mpi) - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_link_libraries(oomph_mpi PUBLIC atomic) - endif() install(TARGETS oomph_mpi EXPORT oomph-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} From ee74e03833d15d5694444e1a8104d6a0f3cba795 Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 14 Jul 2026 14:01:38 +0200 Subject: [PATCH 6/7] Update hwmalloc commit --- ext/hwmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/hwmalloc b/ext/hwmalloc index 8cc8d64..879ac17 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit 8cc8d64e3a6cb99ad6ab274942da1b5f209e2b7e +Subproject commit 879ac17ea529d3c38824717456619a76f1cceaa2 From a8bb5eada1005337d566bc2459b834050fabb191 Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 14 Jul 2026 16:10:53 +0200 Subject: [PATCH 7/7] Update hwmalloc to master --- ext/hwmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/hwmalloc b/ext/hwmalloc index 879ac17..25a5a3b 160000 --- a/ext/hwmalloc +++ b/ext/hwmalloc @@ -1 +1 @@ -Subproject commit 879ac17ea529d3c38824717456619a76f1cceaa2 +Subproject commit 25a5a3bf6e67c71229b64196322e7c58280f1615