Revert "Revert "Merge pull request #774 from pika-org/delete-futures-…

…executors"" This reverts commit a38a585.
pika-org · Oct 27, 2023 · ddb9a9a · ddb9a9a
1 parent a38a585
commit ddb9a9a
Show file tree

Hide file tree

Showing 362 changed files with 1,271 additions and 51,027 deletions.
diff --git a/.jenkins/cscs-perftests/launch_perftests.sh b/.jenkins/cscs-perftests/launch_perftests.sh
@@ -12,7 +12,7 @@ pika_targets=("future_overhead_report_test")
 pika_test_options=(
     "--pika:ini=pika.thread_queue.init_threads_count=100 \
     --pika:queuing=local-priority --pika:threads=4 --test-all \
-    --repetitions=100 --futures=500000")
+    --repetitions=100 --tasks=500000")
 
 # Build binaries for performance tests
 ${perftests_dir}/driver.py -v -l $logfile build -b release -o build \

diff --git a/cmake/pika_add_config_test.cmake b/cmake/pika_add_config_test.cmake
@@ -376,14 +376,6 @@ function(pika_check_for_cxx17_std_aligned_alloc)
   )
 endfunction()
 
-function(pika_check_for_cxx17_std_execution_policies)
-  pika_add_config_test(
-    PIKA_WITH_CXX17_STD_EXECUTION_POLICIES
-    SOURCE cmake/tests/cxx17_std_execution_policies.cpp
-    FILE ${ARGN}
-  )
-endfunction()
-
 # ##############################################################################
 function(pika_check_for_cxx11_std_quick_exit)
   pika_add_config_test(
@@ -439,33 +431,6 @@ function(pika_check_for_cxx17_memory_resource)
   )
 endfunction()
 
-# ##############################################################################
-function(pika_check_for_cxx20_coroutines)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_COROUTINES
-    SOURCE cmake/tests/cxx20_coroutines.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
-# ##############################################################################
-function(pika_check_for_cxx20_lambda_capture)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_LAMBDA_CAPTURE
-    SOURCE cmake/tests/cxx20_lambda_capture.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
-# ##############################################################################
-function(pika_check_for_cxx20_perfect_pack_capture)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_PERFECT_PACK_CAPTURE
-    SOURCE cmake/tests/cxx20_perfect_pack_capture.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
 # ##############################################################################
 function(pika_check_for_cxx20_no_unique_address_attribute)
   pika_add_config_test(
@@ -475,15 +440,6 @@ function(pika_check_for_cxx20_no_unique_address_attribute)
   )
 endfunction()
 
-# ##############################################################################
-function(pika_check_for_cxx20_paren_initialization_of_aggregates)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_PAREN_INITIALIZATION_OF_AGGREGATES
-    SOURCE cmake/tests/cxx20_paren_initialization_of_aggregates.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
 # ##############################################################################
 function(pika_check_for_cxx20_std_disable_sized_sentinel_for)
   pika_add_config_test(
@@ -493,24 +449,6 @@ function(pika_check_for_cxx20_std_disable_sized_sentinel_for)
   )
 endfunction()
 
-# ##############################################################################
-function(pika_check_for_cxx20_std_endian)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_STD_ENDIAN
-    SOURCE cmake/tests/cxx20_std_endian.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
-# ##############################################################################
-function(pika_check_for_cxx20_std_execution_policies)
-  pika_add_config_test(
-    PIKA_WITH_CXX20_STD_EXECUTION_POLICIES
-    SOURCE cmake/tests/cxx20_std_execution_policies.cpp
-    FILE ${ARGN} CHECK_CXXSTD 20
-  )
-endfunction()
-
 # ##############################################################################
 function(pika_check_for_cxx20_trivial_virtual_destructor)
   pika_add_config_test(

diff --git a/cmake/pika_perform_cxx_feature_tests.cmake b/cmake/pika_perform_cxx_feature_tests.cmake
@@ -35,10 +35,6 @@ function(pika_perform_cxx_feature_tests)
     DEFINITIONS PIKA_HAVE_CXX17_STD_ALIGNED_ALLOC
   )
 
-  pika_check_for_cxx17_std_execution_policies(
-    DEFINITIONS PIKA_HAVE_CXX17_STD_EXECUTION_POLICIES
-  )
-
   pika_check_for_cxx17_aligned_new(DEFINITIONS PIKA_HAVE_CXX17_ALIGNED_NEW)
 
   pika_check_for_cxx17_copy_elision(DEFINITIONS PIKA_HAVE_CXX17_COPY_ELISION)
@@ -48,34 +44,14 @@ function(pika_perform_cxx_feature_tests)
   )
 
   # C++20 feature tests
-  pika_check_for_cxx20_coroutines(DEFINITIONS PIKA_HAVE_CXX20_COROUTINES)
-
-  pika_check_for_cxx20_lambda_capture(
-    DEFINITIONS PIKA_HAVE_CXX20_LAMBDA_CAPTURE
-  )
-
-  pika_check_for_cxx20_perfect_pack_capture(
-    DEFINITIONS PIKA_HAVE_CXX20_PERFECT_PACK_CAPTURE
-  )
-
   pika_check_for_cxx20_no_unique_address_attribute(
     DEFINITIONS PIKA_HAVE_CXX20_NO_UNIQUE_ADDRESS_ATTRIBUTE
   )
 
-  pika_check_for_cxx20_paren_initialization_of_aggregates(
-    DEFINITIONS PIKA_HAVE_CXX20_PAREN_INITIALIZATION_OF_AGGREGATES
-  )
-
   pika_check_for_cxx20_std_disable_sized_sentinel_for(
     DEFINITIONS PIKA_HAVE_CXX20_STD_DISABLE_SIZED_SENTINEL_FOR
   )
 
-  pika_check_for_cxx20_std_endian(DEFINITIONS PIKA_HAVE_CXX20_STD_ENDIAN)
-
-  pika_check_for_cxx20_std_execution_policies(
-    DEFINITIONS PIKA_HAVE_CXX20_STD_EXECUTION_POLICIES
-  )
-
   pika_check_for_cxx20_trivial_virtual_destructor(
     DEFINITIONS PIKA_HAVE_CXX20_TRIVIAL_VIRTUAL_DESTRUCTOR
   )

diff --git a/cmake/tests/cxx17_std_execution_policies.cpp b/cmake/tests/cxx17_std_execution_policies.cpp
diff --git a/cmake/tests/cxx20_coroutines.cpp b/cmake/tests/cxx20_coroutines.cpp
diff --git a/cmake/tests/cxx20_lambda_capture.cpp b/cmake/tests/cxx20_lambda_capture.cpp
diff --git a/cmake/tests/cxx20_paren_initialization_of_aggregates.cpp b/cmake/tests/cxx20_paren_initialization_of_aggregates.cpp
diff --git a/cmake/tests/cxx20_perfect_pack_capture.cpp b/cmake/tests/cxx20_perfect_pack_capture.cpp
diff --git a/cmake/tests/cxx20_std_endian.cpp b/cmake/tests/cxx20_std_endian.cpp
diff --git a/cmake/tests/cxx20_std_execution_policies.cpp b/cmake/tests/cxx20_std_execution_policies.cpp
diff --git a/docs/api.rst b/docs/api.rst
@@ -20,7 +20,6 @@ headers are internal implementation details.
 
 - ``pika/async_rw_mutex.hpp``
 - ``pika/barrier.hpp``
-- ``pika/channel.hpp``
 - ``pika/condition_variable.hpp``
 - ``pika/cuda.hpp``
 - ``pika/execution.hpp``