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

Jump to bottom

Fixing documentation index #2668

Merged
merged 2 commits into from Jun 4, 2017
Merged

Fixing documentation index #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1503600
Fixing documentation index,
hkaiser May 31, 2017
f767188
Merge branch 'master' into fixing_doc_index
hkaiser Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions docs/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -72,7 +72,7 @@ set(doxygen_dependencies
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/for_loop_induction.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/for_loop_reduction.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/generate.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/if_heap.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/is_heap.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/includes.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/inclusive_scan.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/is_partitioned.hpp"
Expand Down Expand Up @@ -114,8 +114,9 @@ set(doxygen_dependencies
"${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/transform.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/auto_chunk_size.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/dynamic_chunk_size.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/executor_traits.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/executor_parameter_traits.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_fwd.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_information_fwd.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_parameter_fwd.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/guided_chunk_size.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/parallel_executor.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/persistent_auto_chunk_size.hpp"
Expand All @@ -124,6 +125,7 @@ set(doxygen_dependencies
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/static_chunk_size.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/thread_pool_executors.hpp"
"${PROJECT_SOURCE_DIR}/hpx/parallel/executors/timed_executor_traits.hpp"
"${PROJECT_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp"
"${PROJECT_SOURCE_DIR}/hpx/runtime_fwd.hpp"
"${PROJECT_SOURCE_DIR}/hpx/runtime/applier_fwd.hpp"
"${PROJECT_SOURCE_DIR}/hpx/runtime/basename_registration.hpp"
Expand Down Expand Up @@ -172,12 +174,12 @@ set(doxygen_dependencies
"${PROJECT_SOURCE_DIR}/hpx/lcos/when_some.hpp"
"${PROJECT_SOURCE_DIR}/hpx/lcos/wait_each.hpp"
"${PROJECT_SOURCE_DIR}/hpx/lcos/when_each.hpp"
"${PROJECT_SOURCE_DIR}/hpx/traits/is_execution_policy.hpp"
"${PROJECT_SOURCE_DIR}/hpx/util/invoke.hpp"
"${PROJECT_SOURCE_DIR}/hpx/util/invoke_fused.hpp"
"${PROJECT_SOURCE_DIR}/hpx/util/unwrapped.hpp"
"${PROJECT_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp")


foreach(doxygen_input ${doxygen_dependencies})
set(doxygen_inputs "${doxygen_inputs} ${doxygen_input}")
endforeach()
Expand Down
54 changes: 25 additions & 29 deletions docs/hpx.idx
View file
Open in desktop
Expand Up @@ -99,53 +99,45 @@ migrate_from_storage "" "hpx\.components\.migrate_from_s.*"
migrate_to_storage "" "hpx\.components\.migrate_to_s.*"

# hpx/parallel/execution_policy.hpp
parallel::execution_policy "execution_policy" "hpx\.parallel\.v1\.execution_policy.*"
parallel::parallel_execution_policy "parallel_execution_policy" "hpx\.parallel\.v1\.parallel_exec.*"
parallel::parallel_execution_policy_shim "parallel_execution_policy_shim" "hpx\.parallel\.v1\.parallel_exec.*"
parallel::parallel_task_execution_policy "parallel_task_execution_policy" "hpx\.parallel\.v1\.parallel_task_exe_.*"
parallel::parallel_task_execution_policy_shim "parallel_task_execution_policy_shim" "hpx\.parallel\.v1\.parallel_task_exe_.*"
parallel::sequential_execution_policy "sequential_execution_policy" "hpx\.parallel\.v1\.sequential_exec.*"
parallel::sequential_execution_policy_shim "sequential_execution_policy_shim" "hpx\.parallel\.v1\.sequential_exec.*"
parallel::sequential_task_execution_policy "sequential_task_execution_policy" "hpx\.parallel\.v1\.sequential_task_e.*"
parallel::sequential_task_execution_policy_shim "sequential_task_execution_policy_shim" "hpx\.parallel\.v1\.sequential_task_e.*"
parallel::parallel_vector_execution_policy "parallel_vector_execution_policy" "hpx\.parallel\.v1\.parallel_vector_e.*"

parallel::is_execution_policy "is_execution_policy" "hpx\.parallel\.v1\.is_execution_policy.*"
parallel::is_parallel_execution_policy "is_parallel_execution_policy" "hpx\.parallel\.v1\.is_parallel_execu_.*"
parallel::is_sequential_execution_policy "is_sequential_execution_policy" "hpx\.parallel\.v1\.is_sequential_exe_.*"
parallel::is_async_execution_policy "is_async_execution_policy" "hpx\.parallel\.v1\.is_async_execution_policy.*"
parallel::execution::parallel_policy "parallel_policy" "hpx\.parallel\.execution\.parallel_policy$"
parallel::execution::parallel_task_policy "parallel_task_policy" "hpx\.parallel\.execution\.parallel_task_policy$"
parallel::execution::sequenced_policy "sequenced_policy" "hpx\.parallel\.execution\.sequenced_policy$"
parallel::execution::sequenced_task_policy "sequenced_task_policy" "hpx\.parallel\.execution\.sequenced_task_policy$"

parallel::execution::is_execution_policy "is_execution_policy" "hpx\.parallel\.execution\.is_execution_policy.*"
parallel::execution::is_parallel_execution_policy "is_parallel_execution_policy" "hpx\.parallel\.execution\.is_parallel_execu_.*"
parallel::execution::is_sequenced_execution_policy "is_sequenced_execution_policy" "hpx\.parallel\.execution\.is_sequenced_exec_.*"
parallel::execution::is_async_execution_policy "is_async_execution_policy" "hpx\.parallel\.execution\.is_async_execution_policy$"

# hpx/parallel/executors/execution_traits.hpp
parallel::executor_traits "executor_traits" "hpx\.parallel\.v3\.executor_traits.*"
parallel::is_executor "is_executor" "hpx\.parallel\.v3\.is_executor.*"
parallel::sequential_execution_tag "sequential_execution_tag" "hpx\.parallel\.v3\.sequential_execution_tag.*"
parallel::parallel_execution_tag "parallel_execution_tag" "hpx\.parallel\.v3\.parallel_execution_tag.*"
parallel::vector_execution_tag "vector_execution_tag" "hpx\.parallel\.v3\.vector_execution_tag.*"

parallel::execution::sequenced_execution_tag "sequenced_execution_tag" "hpx\.parallel\.execution\.sequenced_execution_tag.*"
parallel::execution::parallel_execution_tag "parallel_execution_tag" "hpx\.parallel\.execution\.parallel_execution_tag.*"
parallel::execution::vector_execution_tag "vector_execution_tag" "hpx\.parallel\.execution\.vector_execution_tag.*"

# hpx/parallel/executors/sequential_executor.hpp
parallel::sequential_executor "sequential_executor" "hpx\.parallel\.v3\.sequential_executor.*"
parallel::execution::sequenced_executor "sequenced_executor" "hpx\.parallel\.execution\.sequenced_executor.*"

# hpx/parallel/executors/parallel_executor.hpp
parallel::parallel_executor "parallel_executor" "hpx\.parallel\.v3\.parallel_executor.*"
parallel::execution::parallel_executor "parallel_executor" "hpx\.parallel\.execution\.parallel_executor.*"

# hpx/parallel/executors/service_executors.hpp
parallel::service_executor "service_executor" "hpx\.parallel\.v3\.service_executor.*"
parallel::execution::service_executor "service_executor" "hpx\.parallel\.execution\.service_executor.*"

# hpx/parallel/executors/this_thread_executors.hpp
parallel::this_thread_static_queue_executor "this_thread_static_queue_executor" "hpx\.parallel\.v3\.this_thread_static_queue_executor.*"
parallel::this_thread_static_priority_queue_executor "this_thread_static_priority_queue_executor" "hpx\.parallel\.v3\.this_thread_static_priority_queue_executor.*"
parallel::execution::this_thread_static_queue_executor "this_thread_static_queue_executor" "hpx\.parallel\.execution\.this_thread_static_queue_executor.*"
parallel::execution::this_thread_static_priority_queue_executor "this_thread_static_priority_queue_executor" "hpx\.parallel\.execution\.this_thread_static_priority_queue_executor.*"

# hpx/parallel/executors/thread_pool_executors.hpp
parallel::local_queue_executor "local_queue_executor" "hpx\.parallel\.v3\.local_queue_executor.*"
parallel::local_priority_queue_executor "local_priority_queue_executor" "hpx\.parallel\.v3\.local_priority_qu_.*"
parallel::static_priority_queue_executor "static_priority_queue_executor" "hpx\.parallel\.v3\.static_priority_q_.*"
parallel::execution::local_queue_executor "local_queue_executor" "hpx\.parallel\.execution\.local_queue_executor.*"
parallel::execution::local_priority_queue_executor "local_priority_queue_executor" "hpx\.parallel\.execution\.local_priority_qu_.*"
parallel::execution::static_priority_queue_executor "static_priority_queue_executor" "hpx\.parallel\.execution\.static_priority_q_.*"

# hpx/parallel/executors/timed_execution_traits.hpp
parallel::timed_execution_traits "timed_execution_traits" "hpx\.parallel\.v3\.timed_execution_traits.*"
parallel::is_timed_executor "is_timed_executor" "hpx\.parallel\.v3\.is_timed_executor.*"

# hpx/parallel/executors/executor_parameter_traits.hpp
parallel::executor_parameter_traits "executor_parameter_traits" "hpx\.parallel\.v3\.executor_parameter_traits.*"
parallel::is_executor_parameters "is_executor_parameters" "hpx\.parallel\.v3\.is_executor_parameters.*"

# hpx/parallel/executors/static_chunk_size.hpp
Expand Down Expand Up @@ -227,6 +219,10 @@ parallel::inclusive_scan "inclusive_scan" "hpx\.parallel\.v1\.inclu
# hpx/parallel/algorithms/inner_product.hpp
parallel::inner_product "inner_product" "hpx\.parallel\.v1\.inner_product.*"

# hpx/parallel/algorithms/is_heap.hpp
parallel::is_heap "is_heap" "hpx\.parallel\.v1\.is_heap_id.*"
parallel::is_heap_until "is_heap_until" "hpx\.parallel\.v1\.is_heap_until.*"

# hpx/parallel/algorithms/is_partitioned.hpp
parallel::is_partitioned "is_partitioned" "hpx\.parallel\.v1\.is_partitioned.*"

Expand Down
4 changes: 2 additions & 2 deletions hpx/parallel/algorithms/adjacent_difference.hpp
View file
Open in desktop
Expand Up @@ -182,7 +182,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least output iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<OutIter>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;
Expand Down Expand Up @@ -275,7 +275,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least output iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<OutIter>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/adjacent_find.hpp
View file
Open in desktop
Expand Up @@ -179,7 +179,7 @@ namespace hpx { namespace parallel { inline namespace v1
(hpx::traits::is_forward_iterator<FwdIter>::value),
"Requires at least a forward iterator");

typedef execution::is_sequential_execution_policy<ExPolicy> is_seq;
typedef execution::is_sequenced_execution_policy<ExPolicy> is_seq;

return detail::adjacent_find<FwdIter>().call(
std::forward<ExPolicy>(policy), is_seq(),
Expand Down
6 changes: 3 additions & 3 deletions hpx/parallel/algorithms/all_any_none.hpp
View file
Open in desktop
Expand Up @@ -169,7 +169,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down Expand Up @@ -317,7 +317,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down Expand Up @@ -464,7 +464,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down
4 changes: 2 additions & 2 deletions hpx/parallel/algorithms/copy.hpp
View file
Open in desktop
Expand Up @@ -333,7 +333,7 @@ namespace hpx { namespace parallel { inline namespace v1
}

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value ||
!hpx::traits::is_forward_iterator<OutIter>::value
> is_seq;
Expand Down Expand Up @@ -585,7 +585,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least output iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value ||
!hpx::traits::is_forward_iterator<OutIter>::value
> is_seq;
Expand Down
4 changes: 2 additions & 2 deletions hpx/parallel/algorithms/count.hpp
View file
Open in desktop
Expand Up @@ -163,7 +163,7 @@ namespace hpx { namespace parallel { inline namespace v1
std::false_type)
{
typedef std::integral_constant<bool,
parallel::execution::is_sequential_execution_policy<
parallel::execution::is_sequenced_execution_policy<
ExPolicy
>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
Expand Down Expand Up @@ -318,7 +318,7 @@ namespace hpx { namespace parallel { inline namespace v1
std::false_type)
{
typedef std::integral_constant<bool,
parallel::execution::is_sequential_execution_policy<
parallel::execution::is_sequenced_execution_policy<
ExPolicy
>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/detail/transfer.hpp
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ namespace hpx { namespace parallel { inline namespace v1
std::false_type)
{
typedef std::integral_constant<bool,
parallel::execution::is_sequential_execution_policy<
parallel::execution::is_sequenced_execution_policy<
ExPolicy
>::value ||
!hpx::traits::is_forward_iterator<InIter>::value ||
Expand Down
4 changes: 2 additions & 2 deletions hpx/parallel/algorithms/equal.hpp
View file
Open in desktop
Expand Up @@ -237,7 +237,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter1>::value ||
!hpx::traits::is_forward_iterator<InIter2>::value
> is_seq;
Expand Down Expand Up @@ -410,7 +410,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter1>::value ||
!hpx::traits::is_forward_iterator<InIter2>::value
> is_seq;
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/exclusive_scan.hpp
View file
Open in desktop
Expand Up @@ -178,7 +178,7 @@ namespace hpx { namespace parallel { inline namespace v1
T const& init, Op && op, std::false_type) {

typedef std::integral_constant<bool,
parallel::execution::is_sequential_execution_policy<
parallel::execution::is_sequenced_execution_policy<
ExPolicy
>::value ||
!hpx::traits::is_forward_iterator<InIter>::value ||
Expand Down
4 changes: 2 additions & 2 deletions hpx/parallel/algorithms/fill.hpp
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ namespace hpx { namespace parallel { inline namespace v1
{

typedef std::integral_constant<bool,
parallel::execution::is_sequential_execution_policy<
parallel::execution::is_sequenced_execution_policy<
ExPolicy
>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
Expand Down Expand Up @@ -287,7 +287,7 @@ namespace hpx { namespace parallel { inline namespace v1
}

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<OutIter>::value
> is_seq;

Expand Down
10 changes: 5 additions & 5 deletions hpx/parallel/algorithms/find.hpp
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down Expand Up @@ -295,7 +295,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down Expand Up @@ -445,7 +445,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Requires at least input iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down Expand Up @@ -634,7 +634,7 @@ namespace hpx { namespace parallel { inline namespace v1
(hpx::traits::is_forward_iterator<FwdIter2>::value),
"Requires at least forward iterator.");

typedef execution::is_sequential_execution_policy<ExPolicy> is_seq;
typedef execution::is_sequenced_execution_policy<ExPolicy> is_seq;

return detail::find_end<FwdIter1>().call(
std::forward<ExPolicy>(policy), is_seq(),
Expand Down Expand Up @@ -818,7 +818,7 @@ namespace hpx { namespace parallel { inline namespace v1
"Subsequence requires at least forward iterator.");

typedef std::integral_constant<bool,
execution::is_sequential_execution_policy<ExPolicy>::value ||
execution::is_sequenced_execution_policy<ExPolicy>::value ||
!hpx::traits::is_forward_iterator<InIter>::value
> is_seq;

Expand Down