Adapting HPX contracts module to C++ modules

- fixing remaining CI failures

Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>

Author: hkaiser

libs/core/async_mpi/include/hpx/async_mpi/mpi_future.hpp

@@ -44,7 +44,7 @@ namespace hpx::mpi::experimental {
 
     // by convention the title is 7 chars (for alignment)
     HPX_CXX_EXPORT using print_on = debug::enable_print<false>;
-    HPX_CXX_EXPORT static constexpr print_on mpi_debug("MPI_FUT");
+    HPX_CXX_EXPORT inline constexpr print_on mpi_debug("MPI_FUT");
 
     namespace detail {
 
@@ -59,7 +59,10 @@ namespace hpx::mpi::experimental {
         // An implementation of future_data for MPI
         HPX_CXX_EXPORT struct future_data : hpx::lcos::detail::future_data<int>
         {
-            HPX_NON_COPYABLE(future_data);
+            future_data(future_data const&) = delete;
+            future_data(future_data&&) = delete;
+            future_data& operator=(future_data const&) = delete;
+            future_data& operator=(future_data&&) = delete;
 
             using init_no_addref =
                 typename hpx::lcos::detail::future_data<int>::init_no_addref;
@@ -112,7 +115,7 @@ namespace hpx::mpi::experimental {
 
         // -----------------------------------------------------------------
         // a convenience structure to hold state vars
-        // used extensivey with debug::print to display rank etc
+        // used extensively with debug::print to display rank etc
         HPX_CXX_EXPORT struct mpi_info
         {
             bool error_handler_initialized_ = false;
@@ -141,28 +144,20 @@ namespace hpx::mpi::experimental {
             MPI_Comm*, int* errorcode, ...);
 
         // -----------------------------------------------------------------
-        // we track requests and callbacks in two vectors even though
-        // we have the request stored in the request_callback vector already
-        // the reason for this is because we can use MPI_Testany
-        // with a vector of requests to save overheads compared
-        // to testing one by one every item (using a list)
+        // we track requests and callbacks in two vectors even though we have
+        // the request stored in the request_callback vector already the reason
+        // for this is we can use MPI_Testany with a vector of requests to save
+        // overheads compared to testing one by one every item (using a list)
         HPX_CXX_EXPORT HPX_CORE_EXPORT std::vector<MPI_Request>&
         get_requests_vector();
 
         // -----------------------------------------------------------------
         // define a lockfree queue type to place requests in prior to handling
         // this is done only to avoid taking a lock every time a request is
-        // returned from MPI. Instead the requests are placed into a queue
-        // and the polling code pops them prior to calling Testany
+        // returned from MPI. Instead, the requests are placed into a queue
+        // and the polling code pops them prior to calling Testany.
         HPX_CXX_EXPORT using queue_type =
             concurrency::ConcurrentQueue<future_data_ptr>;
-
-        // -----------------------------------------------------------------
-        // used internally to query how many requests are 'in flight'
-        // these are requests that are being polled for actively
-        // and not the same as the requests enqueued
-        HPX_CXX_EXPORT HPX_CORE_EXPORT std::size_t
-        get_number_of_active_requests();
     }    // namespace detail
 
     // -----------------------------------------------------------------

libs/core/contracts/CMakeLists.txt

@@ -24,17 +24,20 @@ if(HPX_WITH_CXX26_CONTRACTS)
 endif()
 
 # Default location is $HPX_ROOT/libs/contracts/include
-set(contracts_headers hpx/contracts.hpp hpx/modules/contracts.hpp)
+set(contracts_headers hpx/contracts.hpp hpx/contracts/macros.hpp)
+set(contracts_macro_headers hpx/contracts/macros.hpp)
 
 # Default location is $HPX_ROOT/libs/contracts/src
 set(contracts_sources)
 
 include(HPX_AddModule)
 add_hpx_module(
   core contracts
-  GLOBAL_HEADER_GEN OFF
+  GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${contracts_sources}
   HEADERS ${contracts_headers}
+  MACRO_HEADERS ${contracts_macro_headers}
   COMPAT_HEADERS ${contracts_compat_headers}
   MODULE_DEPENDENCIES hpx_config hpx_preprocessor hpx_assertion
   CMAKE_SUBDIRS examples tests

…tracts/include/hpx/modules/contracts.hpp …ntracts/include/hpx/contracts/macros.hpplibs/core/contracts/include/hpx/modules/contracts.hpp renamed to libs/core/contracts/include/hpx/contracts/macros.hpp libs/core/contracts/include/hpx/modules/contracts.hpp renamed to libs/core/contracts/include/hpx/contracts/macros.hpp

@@ -38,6 +38,7 @@
 
 #if defined(HPX_CONTRACTS_HAVE_ASSERTS_AS_CONTRACT_ASSERTS)
 // Override HPX_ASSERT to use contract assertions
+#undef HPX_ASSERT
 #define HPX_ASSERT(x) contract_assert(x)
 #endif
 

libs/core/contracts/tests/unit/CMakeLists.txt

@@ -29,6 +29,13 @@ foreach(test ${contract_tests})
   add_hpx_unit_test("modules.contracts" ${test})
 endforeach()
 
+# Set failure expectation for fallback failure test Fallback only fails in Debug
+# mode (HPX_ASSERT or HPX_CONTRACT_ASSERT behavior)
+set_tests_properties(
+  tests.unit.modules.contracts.declaration_contracts_fail_contract_assert
+  PROPERTIES WILL_FAIL $<$<CONFIG:Debug>:ON>
+)
+
 if(HPX_HAVE_CXX26_CONTRACTS)
   # Set failure expectations for declaration contract failure tests Native
   # contracts should fail when violated
@@ -40,11 +47,6 @@ if(HPX_HAVE_CXX26_CONTRACTS)
     tests.unit.modules.contracts.declaration_contracts_fail_post
     PROPERTIES WILL_FAIL ON
   )
-  set_tests_properties(
-    tests.unit.modules.contracts.declaration_contracts_fail_contract_assert
-    PROPERTIES WILL_FAIL $<$<CONFIG:Debug>:ON>
-  )
-
 else()
   # Set failure expectation for fallback failure test Fallback only fails in
   # Debug mode (HPX_ASSERT behavior)

libs/core/contracts/tests/unit/declaration_contracts_fail_post.cpp

@@ -20,6 +20,8 @@ int get_positive_number(int) HPX_POST(r : r > 0)
 
 int main()
 {
-    // This should trigger postcondition violation when __cpp_contracts is available
-    return get_positive_number(5);
+    // This should trigger postcondition violation when __cpp_contracts is
+    // available
+    [[maybe_unused]] int result = get_positive_number(5);
+    return 0;
 }

libs/core/contracts/tests/unit/declaration_contracts_fail_pre.cpp

@@ -20,6 +20,8 @@ int multiply_positive(int const x) HPX_PRE(x > 0)
 
 int main()
 {
-    // This should trigger precondition violation when __cpp_contracts is available
-    return multiply_positive(-5);    // Violates x > 0
+    // This should trigger precondition violation when __cpp_contracts is
+    // available
+    [[maybe_unused]] int result = multiply_positive(-5);    // Violates x > 0
+    return 0;
 }