From b992e550b1af6e992ffd56a578098211b0ad71f5 Mon Sep 17 00:00:00 2001 From: David Hollman Date: Tue, 15 May 2018 13:53:11 -0700 Subject: [PATCH] made shift to namespace darma, left an alias in darma.h --- CMakeLists.txt | 7 - .../front_end/API/darma_init_finalize.tex | 6 +- docs/spec/front_end/API/darma_spmd_rank.tex | 4 +- docs/spec/front_end/API/darma_spmd_size.tex | 4 +- docs/spec/front_end/API/get_key.tex | 2 +- docs/spec/front_end/API/initial_access.tex | 2 +- docs/spec/front_end/API/n_readers.tex | 2 +- docs/spec/front_end/API/read_access.tex | 2 +- docs/spec/front_end/API/version.tex | 2 +- docs/spec/front_end/functors.tex | 2 +- docs/spec/front_end/keyword_arguments.tex | 8 +- docs/spec/front_end/oo.tex | 4 +- docs/spec/front_end/serialization.tex | 32 ++-- docs/use_relationships_simplified.puml | 2 +- src/include/darma.h | 2 +- .../impl/access_handle/access_handle.impl.h | 4 +- .../access_handle/access_handle_base.impl.h | 6 +- .../access_handle_capture_description.h | 4 +- .../access_handle_collection.impl.h | 22 +-- .../access_handle_collection_base.h | 6 +- .../access_handle_serialization.h | 14 +- .../impl/access_handle/access_handle_traits.h | 8 +- .../impl/access_handle/basic_access_handle.h | 4 +- .../impl/access_handle/copy_captured_object.h | 8 +- .../access_handle/copy_captured_object_fwd.h | 4 +- src/include/darma/impl/access_handle_base.h | 8 +- .../darma/impl/access_handle_publish.impl.h | 6 +- src/include/darma/impl/array/array_fwd.h | 4 +- src/include/darma/impl/array/concept.h | 4 +- src/include/darma/impl/array/concept.impl.h | 4 +- src/include/darma/impl/array/element_range.h | 4 +- .../darma/impl/array/index_decomposition.h | 4 +- src/include/darma/impl/array/index_range.h | 4 +- src/include/darma/impl/array/indexable.h | 4 +- src/include/darma/impl/array/stl_vector.h | 7 +- .../async_accessible/async_access_traits.h | 4 +- src/include/darma/impl/capture.h | 14 +- .../darma/impl/capture/callable_traits.h | 4 +- .../darma/impl/capture/functor_traits.h | 6 +- src/include/darma/impl/capture/semantics.h | 6 +- .../darma/impl/capture/semantics_helpers.h | 14 +- .../darma/impl/capture/semantics_macros.h | 156 ++++++++-------- src/include/darma/impl/collective/allreduce.h | 10 +- .../darma/impl/collective/collective_fwd.h | 4 +- src/include/darma/impl/collective/details.h | 4 +- src/include/darma/impl/collective/reduce_op.h | 8 +- src/include/darma/impl/commutative_access.h | 32 ++-- .../darma/impl/commutative_access_fwd.h | 4 +- .../impl/create_work/capture_permissions.h | 8 +- .../darma/impl/create_work/create_if_then.h | 4 +- .../impl/create_work/create_if_then_functor.h | 4 +- .../impl/create_work/create_if_then_fwd.h | 4 +- .../impl/create_work/create_if_then_lambda.h | 4 +- .../darma/impl/create_work/create_work.h | 4 +- .../create_work/create_work_argument_parser.h | 20 +-- .../impl/create_work/create_work_functor.h | 6 +- .../darma/impl/create_work/create_work_fwd.h | 4 +- .../impl/create_work/create_work_lambda.h | 10 +- .../impl/create_work/create_work_while.h | 4 +- .../create_work/create_work_while_functor.h | 4 +- .../impl/create_work/create_work_while_fwd.h | 4 +- .../create_work/create_work_while_lambda.h | 4 +- .../impl/create_work/permissions_downgrades.h | 6 +- .../impl/create_work/record_line_numbers.h | 4 +- src/include/darma/impl/darma.h | 2 - src/include/darma/impl/flow_handling.h | 4 +- src/include/darma/impl/handle.h | 10 +- src/include/darma/impl/handle_attorneys.h | 4 +- src/include/darma/impl/handle_fwd.h | 4 +- src/include/darma/impl/handle_use_base.h | 4 +- .../darma/impl/index_range/dense_range.h | 4 +- .../impl/index_range/index_range_traits.h | 4 +- src/include/darma/impl/index_range/mapping.h | 4 +- .../darma/impl/index_range/mapping_traits.h | 18 +- .../index_range/polymorphic_index_range.h | 4 +- .../impl/index_range/polymorphic_mapping.h | 4 +- src/include/darma/impl/index_range/range_1d.h | 4 +- src/include/darma/impl/index_range/range_2d.h | 4 +- src/include/darma/impl/make_key_functor.h | 4 +- src/include/darma/impl/meta/any_convertible.h | 4 +- .../darma/impl/meta/conditional_members.h | 8 +- src/include/darma/impl/meta/detection.h | 4 +- .../darma/impl/meta/detection_archetypes.h | 4 +- src/include/darma/impl/meta/has_op.h | 4 +- src/include/darma/impl/meta/is_callable.h | 4 +- src/include/darma/impl/meta/is_container.h | 4 +- src/include/darma/impl/meta/is_contiguous.h | 4 +- .../darma/impl/meta/is_equality_comparable.h | 4 +- src/include/darma/impl/meta/is_iterable.h | 4 +- src/include/darma/impl/meta/is_iterator.h | 4 +- src/include/darma/impl/meta/is_streamable.h | 4 +- .../darma/impl/meta/make_flattened_tuple.h | 4 +- src/include/darma/impl/meta/member_detector.h | 8 +- .../darma/impl/meta/parse_properties.h | 4 +- src/include/darma/impl/meta/sentinal_type.h | 2 +- src/include/darma/impl/meta/splat_tuple.h | 4 +- src/include/darma/impl/meta/tagged_constant.h | 10 +- src/include/darma/impl/meta/tuple_for_each.h | 4 +- src/include/darma/impl/meta/tuple_pop_back.h | 4 +- src/include/darma/impl/meta/tuple_zip.h | 4 +- src/include/darma/impl/meta/void_t.h | 4 +- src/include/darma/impl/mpi/mpi_context.h | 46 ++--- .../darma/impl/mpi/persistent_collection.h | 12 +- .../impl/mpi/piecewise_acquired_collection.h | 22 +-- .../mpi/piecewise_acquired_collection_fwd.h | 4 +- src/include/darma/impl/parallel_for.h | 8 +- src/include/darma/impl/publication_details.h | 6 +- src/include/darma/impl/registration.h | 4 +- .../darma/impl/serialization/manager.h | 6 +- src/include/darma/impl/spmd.h | 4 +- src/include/darma/impl/task/functor_task.h | 4 +- .../impl/task/functor_task_permissions.h | 4 +- src/include/darma/impl/task/lambda_task.h | 16 +- src/include/darma/impl/task/task.h | 10 +- src/include/darma/impl/task/task_base.h | 18 +- .../darma/impl/task/task_ctor_helper.h | 4 +- .../darma/impl/task/task_do_capture.impl.h | 12 +- src/include/darma/impl/task/task_fwd.h | 4 +- .../access_handle_collection.h | 32 ++-- ...ss_handle_collection_capture_description.h | 4 +- .../access_handle_collection_traits.h | 6 +- .../task_collection/create_concurrent_work.h | 16 +- .../impl/argument_to_tc_storage.h | 8 +- .../impl/task_storage_to_param.h | 4 +- .../impl/tc_storage_to_task_storage.h | 6 +- .../task_collection/indexed_access_handle.h | 18 +- .../mapped_handle_collection.h | 4 +- .../impl/task_collection/task_collection.h | 4 +- .../task_collection/task_collection_fwd.h | 4 +- .../task_collection/task_collection_task.h | 6 +- src/include/darma/impl/top_level.h | 16 +- src/include/darma/impl/use.h | 4 +- .../darma/impl/use/flow_relationship.h | 4 +- src/include/darma/impl/use/use_holder.h | 8 +- src/include/darma/impl/use_collection.h | 6 +- src/include/darma/impl/use_fwd.h | 4 +- src/include/darma/impl/util.h | 8 +- src/include/darma/impl/util/backtrace.h | 4 +- src/include/darma/impl/util/managing_ptr.h | 4 +- src/include/darma/impl/util/optional.h | 4 +- src/include/darma/impl/util/smart_pointers.h | 4 +- .../darma/interface/app/access_handle.h | 12 +- .../darma/interface/app/acquire_access.h | 12 +- .../darma/interface/app/backend_hint.h | 2 +- src/include/darma/interface/app/containers.h | 10 +- src/include/darma/interface/app/create_work.h | 8 +- .../darma/interface/app/create_work_if.h | 4 +- .../darma/interface/app/create_work_while.h | 4 +- .../darma/interface/app/darma_region.h | 8 +- .../interface/app/data_structures/vector.h | 4 +- .../darma/interface/app/initial_access.h | 18 +- .../app/keyword_arguments/allow_aliasing.h | 4 +- .../keyword_arguments/copy_back_callback.h | 4 +- .../app/keyword_arguments/copy_callback.h | 4 +- .../interface/app/keyword_arguments/data.h | 4 +- .../interface/app/keyword_arguments/in_out.h | 4 +- .../interface/app/keyword_arguments/index.h | 4 +- .../app/keyword_arguments/index_range.h | 4 +- .../interface/app/keyword_arguments/indices.h | 4 +- .../interface/app/keyword_arguments/input.h | 4 +- .../app/keyword_arguments/is_parallel.h | 4 +- .../app/keyword_arguments/n_pieces.h | 4 +- .../interface/app/keyword_arguments/name.h | 4 +- .../interface/app/keyword_arguments/output.h | 4 +- .../interface/app/keyword_arguments/piece.h | 4 +- .../interface/app/keyword_arguments/size.h | 4 +- .../interface/app/keyword_arguments/tag.h | 4 +- .../interface/app/keyword_arguments/version.h | 4 +- src/include/darma/interface/app/oo.h | 4 +- .../interface/app/permissions_downgrades.h | 4 +- src/include/darma/interface/app/read_access.h | 24 +-- .../darma/interface/app/resource_count.h | 12 +- src/include/darma/interface/app/vector_view.h | 10 +- .../darma/interface/backend/backend_fwd.h | 4 +- .../darma/interface/backend/darma_region.h | 4 +- src/include/darma/interface/backend/flow.h | 4 +- .../darma/interface/backend/legacy_runtime.h | 6 +- .../darma/interface/backend/mpi_interop.h | 4 +- .../darma/interface/backend/mpi_interop_fwd.h | 10 +- .../darma/interface/backend/parallel_for.h | 4 +- .../interface/backend/region_context_handle.h | 4 +- src/include/darma/interface/backend/runtime.h | 16 +- .../interface/backend/serialization_policy.h | 4 +- src/include/darma/interface/backend/types.h | 8 +- .../darma/interface/defaults/darma_main.h | 6 +- src/include/darma/interface/defaults/key.h | 46 ++--- .../darma/interface/defaults/pointers.h | 4 +- .../frontend/array_concept_manager.h | 4 +- .../frontend/array_movement_manager.h | 4 +- .../interface/frontend/collective_details.h | 6 +- .../frontend/detail/task.crtp_impl.h | 4 +- .../darma/interface/frontend/element_range.h | 4 +- .../interface/frontend/flow_relationship.h | 4 +- .../darma/interface/frontend/frontend_fwd.h | 4 +- src/include/darma/interface/frontend/handle.h | 4 +- .../darma/interface/frontend/index_range.h | 4 +- .../frontend/memory_requirement_details.h | 4 +- .../interface/frontend/publication_details.h | 6 +- .../interface/frontend/reduce_operation.h | 4 +- .../frontend/serialization_manager.h | 4 +- src/include/darma/interface/frontend/task.h | 10 +- .../interface/frontend/task_collection.h | 4 +- .../interface/frontend/task_collection_task.h | 4 +- .../darma/interface/frontend/top_level.h | 4 +- .../darma/interface/frontend/top_level_task.h | 4 +- src/include/darma/interface/frontend/types.h | 4 +- .../types/concrete_condition_task_t.h | 6 +- .../frontend/types/concrete_task_t.h | 6 +- .../types/concrete_top_level_task_t.h | 6 +- .../frontend/types/task_collection_task_t.h | 4 +- .../darma/interface/frontend/unpack_task.h | 4 +- src/include/darma/interface/frontend/use.h | 26 +-- .../darma/interface/frontend/use_collection.h | 4 +- .../interface/frontend/while_do_closure.h | 4 +- src/include/darma/key/SSO_key.h | 4 +- src/include/darma/key/SSO_key.impl.h | 6 +- src/include/darma/key/SSO_key_fwd.h | 4 +- src/include/darma/key/bytes_convert.h | 4 +- src/include/darma/key/bytes_type_metadata.h | 4 +- .../serialization/SSO_key_serialization.h | 34 ++-- .../bytes_type_metadata_serialization.h | 6 +- .../serialization/raw_bytes_serialization.h | 12 +- src/include/darma/key/key_concept.h | 26 +-- src/include/darma/key/key_fwd.h | 4 +- src/include/darma/key/raw_bytes.h | 4 +- .../keyword_arguments/check_allowed_kwargs.h | 4 +- src/include/darma/keyword_arguments/errors.h | 4 +- .../darma/keyword_arguments/get_kwarg.h | 4 +- .../keyword_arguments/keyword_argument_name.h | 4 +- .../darma/keyword_arguments/keyword_tag.h | 4 +- .../keyword_arguments/kwarg_expression.h | 4 +- .../keyword_arguments/kwarg_expression_fwd.h | 4 +- src/include/darma/keyword_arguments/macros.h | 32 ++-- src/include/darma/keyword_arguments/parse.h | 4 +- .../darma_types.h | 22 +-- .../frontend_compilation_benchmark/matchers.h | 36 ++-- .../test_create_work.cc | 66 +++---- .../test_kwarg_functor.jin.cc | 4 +- .../test_kwarg_header.h | 12 +- src/tests/frontend_validation/darma_types.h | 38 ++-- src/tests/frontend_validation/helpers.h | 6 +- src/tests/frontend_validation/matchers.h | 36 ++-- src/tests/frontend_validation/mock_backend.h | 70 ++++---- .../frontend_validation/mock_free_functions.h | 12 +- src/tests/frontend_validation/mock_key.h | 12 +- .../frontend_validation/test_access_handle.cc | 60 +++---- .../frontend_validation/test_anti_flows.cc | 6 +- src/tests/frontend_validation/test_array.cc | 6 +- .../frontend_validation/test_collectives.cc | 16 +- .../test_create_parallel_for.cc | 24 +-- .../frontend_validation/test_create_work.cc | 66 +++---- .../test_create_work_if.cc | 60 +++---- .../test_create_work_while.cc | 36 ++-- src/tests/frontend_validation/test_frontend.h | 130 +++++++------- src/tests/frontend_validation/test_functor.cc | 36 ++-- src/tests/frontend_validation/test_functor.h | 2 +- .../test_functor_migrate.cc | 16 +- .../frontend_validation/test_index_range.cc | 4 +- .../test_initial_access.cc | 16 +- .../test_lambda_migrate.cc | 2 +- .../test_make_key_functor.cc | 20 +-- .../test_make_key_functor.h | 6 +- .../frontend_validation/test_mpi_interop.cc | 10 +- src/tests/frontend_validation/test_publish.cc | 6 +- .../frontend_validation/test_read_access.cc | 6 +- .../test_resource_count.cc | 54 +++--- .../frontend_validation/test_serialize.cc | 30 ++-- src/tests/frontend_validation/test_sso_key.cc | 46 ++--- .../test_task_collection.cc | 168 +++++++++--------- src/tests/meta/test_any_convertible.cc | 2 +- src/tests/meta/test_callable_traits.cc | 2 +- src/tests/meta/test_compressed_pair.cc | 2 +- src/tests/meta/test_detection.cc | 4 +- src/tests/meta/test_is_contiguous.cc | 2 +- src/tests/meta/test_is_iterator.cc | 2 +- src/tests/meta/test_kwargs.cc | 54 +++--- src/tests/meta/test_member_detector.cc | 4 +- src/tests/meta/test_splat_tuple.cc | 2 +- src/tests/meta/test_tuple_for_each.cc | 4 +- src/tests/meta/test_tuple_zip.cc | 2 +- src/tests/test_keyword_arguments.cc | 8 +- 281 files changed, 1486 insertions(+), 1498 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c78a5de7..d8d4ef23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,5 @@ cmake_minimum_required (VERSION 3.4) -# Silence an error about the version option to project -# this will need to be changed if we ever bump the version to 3.0 and put the -# version stuff in the project command itself -if (NOT CMAKE_VERSION VERSION_LESS 3.0) - cmake_policy(SET CMP0048 OLD) -endif() - project (DarmaFrontend) # The version number. set (DarmaFrontend_VERSION_MAJOR 0) diff --git a/docs/spec/front_end/API/darma_init_finalize.tex b/docs/spec/front_end/API/darma_init_finalize.tex index 926da5c3..391d80eb 100644 --- a/docs/spec/front_end/API/darma_init_finalize.tex +++ b/docs/spec/front_end/API/darma_init_finalize.tex @@ -8,7 +8,7 @@ \subsection{\texttt{darma\_init}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -void darma_runtime::darma_init(int& argc, char**& argv); +void darma::darma_init(int& argc, char**& argv); \end{CppCode} \paragraph{Positional Arguments}\mbox{}\\ @@ -42,7 +42,7 @@ \subsection{\texttt{darma\_finalize}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -void darma_runtime::darma_finalize(); +void darma::darma_finalize(); \end{CppCode} \paragraph{Positional Arguments}\mbox{} \\ @@ -66,7 +66,7 @@ \subsection{\texttt{darma\_finalize}} #include int darma_main(int argc, char** argv) { - using namespace darma_runtime; + using namespace darma; darma_init(argc, argv); std::cout << "DARMA initialized" << std::endl; diff --git a/docs/spec/front_end/API/darma_spmd_rank.tex b/docs/spec/front_end/API/darma_spmd_rank.tex index 95fa6a92..d347989b 100644 --- a/docs/spec/front_end/API/darma_spmd_rank.tex +++ b/docs/spec/front_end/API/darma_spmd_rank.tex @@ -11,7 +11,7 @@ \subsection{\texttt{darma\_spmd\_rank}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -/* unspecified */ darma_runtime::darma_spmd_rank(); +/* unspecified */ darma::darma_spmd_rank(); \end{CppCode} \paragraph{Positional Arguments} \mbox{}\\ @@ -44,7 +44,7 @@ \subsection{\texttt{darma\_spmd\_rank}} #include int darma_main(int argc, char** argv) { - using namespace darma_runtime; + using namespace darma; darma_init(argc, argv); // get my rank diff --git a/docs/spec/front_end/API/darma_spmd_size.tex b/docs/spec/front_end/API/darma_spmd_size.tex index 374bae56..2f61052f 100644 --- a/docs/spec/front_end/API/darma_spmd_size.tex +++ b/docs/spec/front_end/API/darma_spmd_size.tex @@ -7,7 +7,7 @@ \subsection{\texttt{darma\_spmd\_size}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -/* unspecified */ darma_runtime::darma_spmd_size(); +/* unspecified */ darma::darma_spmd_size(); \end{CppCode} \paragraph{Positional Arguments} \mbox{}\\ @@ -33,7 +33,7 @@ \subsection{\texttt{darma\_spmd\_size}} #include int darma_main(int argc, char** argv) { - using namespace darma_runtime; + using namespace darma; darma_init(argc, argv); const size_t size = darma_spmd_size(); diff --git a/docs/spec/front_end/API/get_key.tex b/docs/spec/front_end/API/get_key.tex index 305f72b6..fb439a0e 100644 --- a/docs/spec/front_end/API/get_key.tex +++ b/docs/spec/front_end/API/get_key.tex @@ -6,7 +6,7 @@ \subsection{\texttt{get\_key}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -darma_runtime::types::key_t const& AccessHandle::get_key(); +darma::types::key_t const& AccessHandle::get_key(); \end{CppCode} \paragraph{Positional Arguments}\mbox{}\\ diff --git a/docs/spec/front_end/API/initial_access.tex b/docs/spec/front_end/API/initial_access.tex index 43f487f0..1a62fdee 100644 --- a/docs/spec/front_end/API/initial_access.tex +++ b/docs/spec/front_end/API/initial_access.tex @@ -6,7 +6,7 @@ \subsection{\texttt{initial\_access}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} -AccessHandle darma_runtime::initial_access(arg1, arg2, ...); +AccessHandle darma::initial_access(arg1, arg2, ...); \end{CppCode} \paragraph{Positional Arguments}\mbox{}\\ diff --git a/docs/spec/front_end/API/n_readers.tex b/docs/spec/front_end/API/n_readers.tex index d5dec5be..65e5f27c 100644 --- a/docs/spec/front_end/API/n_readers.tex +++ b/docs/spec/front_end/API/n_readers.tex @@ -5,7 +5,7 @@ \subsection{\texttt{n\_readers}} \codetarget{n_readers} is a \gls{keyword argument} to \codelink{publish}. %See %\S~\ref{ssec:api_fe_publish} for details. -In namespace |darma_runtime::keyword_arguments_for_publication|. +In namespace |darma::keyword_arguments_for_publication|. %\paragraph{Syntax}\mbox{}\\ %These two are equivalent. diff --git a/docs/spec/front_end/API/read_access.tex b/docs/spec/front_end/API/read_access.tex index 7655f0fc..bb67664e 100644 --- a/docs/spec/front_end/API/read_access.tex +++ b/docs/spec/front_end/API/read_access.tex @@ -10,7 +10,7 @@ \subsection{\texttt{read\_access}} \paragraph{Syntax}\mbox{}\\ \begin{CppCode} /* unspecified, convertible to AccessHandle */ -darma_runtime::read_access(KeyParts..., version=KeyExpression); +darma::read_access(KeyParts..., version=KeyExpression); \end{CppCode} diff --git a/docs/spec/front_end/API/version.tex b/docs/spec/front_end/API/version.tex index 7213c8b2..e1a60b89 100644 --- a/docs/spec/front_end/API/version.tex +++ b/docs/spec/front_end/API/version.tex @@ -5,7 +5,7 @@ \subsection{\texttt{version}} \codetarget{version} is a \gls{keyword argument} to \codelink{publish} and \codelink{read_access}. -In namespace |darma_runtime::keyword_arguments_for_publication|. +In namespace |darma::keyword_arguments_for_publication|. %\paragraph{Syntax}\mbox{}\\ %These two are equivalent. diff --git a/docs/spec/front_end/functors.tex b/docs/spec/front_end/functors.tex index b3b5640f..82292667 100644 --- a/docs/spec/front_end/functors.tex +++ b/docs/spec/front_end/functors.tex @@ -144,7 +144,7 @@ \subsection{Mixing Deferred and Immediate Arguments} the referred to variable may no longer exist. An implicit copy would be required that isn't apparent from the syntax to make the variable permanent. To do this, you need to either use a value formal parameter or explicitly use -|darma_runtime::darma_copy|: +|darma::darma_copy|: \begin{CppCodeNumb} struct PrintIntRef { void operator()(const int& val) const { cout << val << endl; } diff --git a/docs/spec/front_end/keyword_arguments.tex b/docs/spec/front_end/keyword_arguments.tex index ad86bab0..f4779b29 100644 --- a/docs/spec/front_end/keyword_arguments.tex +++ b/docs/spec/front_end/keyword_arguments.tex @@ -57,18 +57,18 @@ \section{Keyword arguments} %and frequently used keywords are aliased into more general namespaces. %For instance, the keywords for \inlinecode{some_function}, above, would likely be %defined in a namespace named using the following convention: -%\inlinecode{darma_runtime::keyword_arguments_for_some_function}. +%\inlinecode{darma::keyword_arguments_for_some_function}. %If \inlinecode{some_function} was a %widely used construct, its more important keywords would also be defined -%in the namespace \inlinecode{darma_runtime::keyword_arguments}. +%in the namespace \inlinecode{darma::keyword_arguments}. %If \inlinecode{some_function} belonged to a broader category of %constructs, certain of its keywords may also be aliased into a %categorical namespace as well. For instance, if \inlinecode{some_function} %implemented some memory management functionality, -%its keywords may be aliased into, for example, \inlinecode{darma_runtime::keyword_arguments_for_memory_management}. +%its keywords may be aliased into, for example, \inlinecode{darma::keyword_arguments_for_memory_management}. %All of this is done so that the user can minimize verbosity without introducing %naming conflicts. In certain contexts, it may be expedient for the user to simply -%put \inlinecode{using darma_runtime::keyword_arguments} at the beginning of the calling context. +%put \inlinecode{using darma::keyword_arguments} at the beginning of the calling context. %In other, more complicated contexts, importing all DARMA keywords into the %local context may lead to naming conflicts with local variables. %You don't have to guess at which namespaces diff --git a/docs/spec/front_end/oo.tex b/docs/spec/front_end/oo.tex index cbae2557..463cf2e6 100644 --- a/docs/spec/front_end/oo.tex +++ b/docs/spec/front_end/oo.tex @@ -247,7 +247,7 @@ \subsection{Defining a Class} The class templates |private_fields|, |public_fields|, and |public_methods| (along with most of the symbols in this section) are defined in the namespace -|darma_runtime::oo|. They can be given in any order and any number of times. +|darma::oo|. They can be given in any order and any number of times. Multiple lists (for instance, multiple |public_fields|), given to the same |darma_class| template will be merged (though, of course, the same name still should not be given for more than one field or method). @@ -467,7 +467,7 @@ \subsection{User-defined Constructors} struct MyClassDARMA_constructors : darma_constructors { - void operator()(darma_runtime::types::key_t& key_part) { + void operator()(darma::types::key_t& key_part) { larry = initial_access(key_part, "larry"); curly = initial_access(key_part, "curly"); moe = initial_access(key_part, "moe"); diff --git a/docs/spec/front_end/serialization.tex b/docs/spec/front_end/serialization.tex index 357d76b7..8a53e16a 100644 --- a/docs/spec/front_end/serialization.tex +++ b/docs/spec/front_end/serialization.tex @@ -34,7 +34,7 @@ \subsection{Basic Intrusive Interface} in the user class. The |serialize| method provided for this purpose should be non-|const| and should take a single argument, which in the simplest case will be an lvalue reference to a -|darma_runtime::serialization::SimplePackUnpackArchive| object. For instance, +|darma::serialization::SimplePackUnpackArchive| object. For instance, consider the following (somewhat contrived) user-defined class: % \begin{CppCodeNumb} @@ -58,7 +58,7 @@ \subsection{Basic Intrusive Interface} The simplest way to allow \gls{DARMA} to interact with |MyClass| is to provide a |serialize| method in the class definition: \begin{CppCodeNumb} -using Archive = darma_runtime::serialization::SimplePackUnpackArchive; +using Archive = darma::serialization::SimplePackUnpackArchive; class MyClass { public: /* ... */ @@ -232,7 +232,7 @@ \subsection{Seperate Methods for Seperate Modes} \subsection{Serializing Pointers and Ranges} \gls{DARMA} also provides a convenient way to serialize iterables of serializable -objects using |darma_runtime::serialization::range|. As a simple example: +objects using |darma::serialization::range|. As a simple example: \begin{CppCodeNumb} template class MyData { @@ -251,7 +251,7 @@ \subsection{Serializing Pointers and Ranges} If we restrict ourselves to only making |MyData| instances that hold serializable types |T|, we can write the |serialize| method for this class as \begin{CppCodeNumb} -using darma_runtime::serialization::range; +using darma::serialization::range; template class MyData { public: @@ -268,10 +268,10 @@ \subsection{Non-intrusive Interface} Classes for which the user cannot define an intrusive |serialize| method (or any of the other intrusive methods), for one reason or another, can still be made serializable by defining a specialization (partial or full) of the class -|darma_runtime::serialization::Serializer| for the type in +|darma::serialization::Serializer| for the type in question.\footnote{Generic implementations requiring partial specialization with an \inlinecode{enable_if} clause should use -\inlinecode{darma_runtime::serialization::detail::Serializer_enabled_if}. Consult source code for more details.} Like the intrusive interface, +\inlinecode{darma::serialization::detail::Serializer_enabled_if}. Consult source code for more details.} Like the intrusive interface, these classes can define a |serialize| method; individual |compute_size|, |pack|, and |unpack| methods; or some combination of these, with the specific versions having higher priority. All of these methods must be |const| (the @@ -295,7 +295,7 @@ \subsection{Non-intrusive Interface} Assuming |YourClass| is default constructible, a way to specify a serialization for |YourClass| non-intrusively is: \begin{CppCodeNumb} -namespace darma_runtime { namespace serialization { +namespace darma { namespace serialization { template <> struct Serializer { template @@ -316,13 +316,13 @@ \subsection{Non-intrusive Interface} } } }; -}} // end namespace darma_runtime::serialization +}} // end namespace darma::serialization \end{CppCodeNumb} As before, we can split this into |serialize| and |unpack| methods. However, the |unpack| method requires a slightly different signature: \begin{CppCodeNumb} template -darma_runtime::serialization::Serializer::unpack( +darma::serialization::Serializer::unpack( void* allocated, Archive& ar ) const; \end{CppCodeNumb} @@ -336,7 +336,7 @@ \subsection{Non-intrusive Interface} pretty straightforward. The non-intrusive |Serializer| for |YourClass| can then be written as: \begin{CppCodeNumb} -namespace darma_runtime { namespace serialization { +namespace darma { namespace serialization { template <> struct Serializer { template @@ -360,18 +360,18 @@ \subsection{Non-intrusive Interface} yc->set_label(label); } }; -}} // end namespace darma_runtime::serialization +}} // end namespace darma::serialization \end{CppCodeNumb} The non-intrusive interface versions of |pack| and |compute_size| have similar signatures to that of |serialize|, except they take a |const| lvalue reference as their first argument: \begin{CppCodeNumb} template -darma_runtime::serialization::Serializer::compute_size( +darma::serialization::Serializer::compute_size( YourClass const& val, Archive& ar ) const; template -darma_runtime::serialization::Serializer::pack( +darma::serialization::Serializer::pack( YourClass const& val, Archive& ar ) const; \end{CppCodeNumb} @@ -405,17 +405,17 @@ \subsection{Implementations for Builtin and Standard Library Types} the code is only tested with this \gls{archive} thus far. You can define a serialization for any bitwise copyable, \gls{POD} type simply by -specializing |darma_runtime::serialization::serialize_as_pod| to inherit from +specializing |darma::serialization::serialize_as_pod| to inherit from |std::true_type|: \begin{CppCodeNumb} class MyPlainOldData { int i, j, k; double x, y, z; }; -namespace darma_runtime { namespace serialization { +namespace darma { namespace serialization { template <> struct serialize_as_pod : std::true_type { }; -}} // end namespace darma_runtime::serialization +}} // end namespace darma::serialization \end{CppCodeNumb} \subsection{Polymorphism} diff --git a/docs/use_relationships_simplified.puml b/docs/use_relationships_simplified.puml index dd1b965d..b6482371 100644 --- a/docs/use_relationships_simplified.puml +++ b/docs/use_relationships_simplified.puml @@ -31,7 +31,7 @@ AccessHandle -right-> GenericUseHolder class HandleUseBase { Implements most of the functionality for - darma_runtime::abstract::frontend::Use + darma::abstract::frontend::Use .. } diff --git a/src/include/darma.h b/src/include/darma.h index bc80c2ba..ab6bb80c 100644 --- a/src/include/darma.h +++ b/src/include/darma.h @@ -56,6 +56,6 @@ #include -namespace darma = darma_runtime; +namespace darma_runtime = darma; #endif /* SRC_DARMA_H_ */ diff --git a/src/include/darma/impl/access_handle/access_handle.impl.h b/src/include/darma/impl/access_handle/access_handle.impl.h index fc621f07..01d29993 100644 --- a/src/include/darma/impl/access_handle/access_handle.impl.h +++ b/src/include/darma/impl/access_handle/access_handle.impl.h @@ -50,7 +50,7 @@ #include #include -namespace darma_runtime { +namespace darma { //============================================================================== @@ -84,7 +84,7 @@ AccessHandle::AccessHandle( //============================================================================== -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_IMPL_H diff --git a/src/include/darma/impl/access_handle/access_handle_base.impl.h b/src/include/darma/impl/access_handle/access_handle_base.impl.h index e2694d5c..28b7ca43 100644 --- a/src/include/darma/impl/access_handle/access_handle_base.impl.h +++ b/src/include/darma/impl/access_handle/access_handle_base.impl.h @@ -47,14 +47,14 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { constexpr inline frontend::permissions_t detail::AccessHandleBase::get_captured_permissions_for( detail::AccessHandleBase::capture_op_t op, frontend::permissions_t permissions ) { - using darma_runtime::frontend::Permissions; + using darma::frontend::Permissions; // This used to be a lot more complicated when Commutative/Relaxed/etc // were permissions rather than coherence modes. I've left it here // for backwards compatibility, but it may be moved at some point @@ -123,6 +123,6 @@ detail::AccessHandleBase::get_captured_permissions_for( //} } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_BASE_IMPL_H diff --git a/src/include/darma/impl/access_handle/access_handle_capture_description.h b/src/include/darma/impl/access_handle/access_handle_capture_description.h index b35f5480..e3f407cb 100644 --- a/src/include/darma/impl/access_handle/access_handle_capture_description.h +++ b/src/include/darma/impl/access_handle/access_handle_capture_description.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -171,6 +171,6 @@ AccessHandle::get_capture_description( }; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_CAPTURE_DESCRIPTION_H diff --git a/src/include/darma/impl/access_handle/access_handle_collection.impl.h b/src/include/darma/impl/access_handle/access_handle_collection.impl.h index f26a5a7b..3679341a 100644 --- a/src/include/darma/impl/access_handle/access_handle_collection.impl.h +++ b/src/include/darma/impl/access_handle/access_handle_collection.impl.h @@ -49,21 +49,21 @@ #include -namespace darma_runtime { +namespace darma { #if _darma_has_feature(handle_collection_based_collectives) template template auto AccessHandleCollection::reduce(Args&& ... args) const { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _keyword< /* required for now */ - deduced_parameter, darma_runtime::keyword_tags_for_collectives::output + deduced_parameter, darma::keyword_tags_for_collectives::output >, _optional_keyword< - converted_parameter, darma_runtime::keyword_tags_for_collectives::tag + converted_parameter, darma::keyword_tags_for_collectives::tag > > >; @@ -74,12 +74,12 @@ AccessHandleCollection::reduce(Args&& ... args) const { return parser() .with_converters( [](auto&&... parts) { - return darma_runtime::make_key(std::forward(parts)...); + return darma::make_key(std::forward(parts)...); } ) .with_default_generators( - darma_runtime::keyword_arguments_for_collectives::tag=[]{ - return darma_runtime::make_key(); + darma::keyword_arguments_for_collectives::tag=[]{ + return darma::make_key(); } ) .parse_args(std::forward(args)...) @@ -91,9 +91,9 @@ AccessHandleCollection::reduce(Args&& ... args) const { auto cap_result_holder = detail::make_captured_use_holder( output_handle.var_handle_base_, /* requested_scheduling_permissions= */ - darma_runtime::frontend::Permissions::None, + darma::frontend::Permissions::None, /* requested_immediate_permissions= */ - darma_runtime::frontend::Permissions::Modify, + darma::frontend::Permissions::Modify, output_handle.get_current_use() ); @@ -203,7 +203,7 @@ AccessHandleCollection::_setup_local_uses( map_dense, idx, idx_range ); - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; auto old_key = this->var_handle_base_->get_key(); auto new_handle = std::make_shared>( @@ -269,6 +269,6 @@ AccessHandleCollection::_setup_local_uses( //============================================================================== -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_COLLECTION_IMPL_H diff --git a/src/include/darma/impl/access_handle/access_handle_collection_base.h b/src/include/darma/impl/access_handle/access_handle_collection_base.h index e77cb457..466a4bf1 100644 --- a/src/include/darma/impl/access_handle/access_handle_collection_base.h +++ b/src/include/darma/impl/access_handle/access_handle_collection_base.h @@ -49,13 +49,13 @@ #include -namespace darma_runtime { +namespace darma { namespace serialization { // Forward declaration template -struct Serializer>; +struct Serializer>; } // end namespace serialization @@ -177,6 +177,6 @@ class BasicAccessHandleCollection } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_COLLECTION_BASE_H diff --git a/src/include/darma/impl/access_handle/access_handle_serialization.h b/src/include/darma/impl/access_handle/access_handle_serialization.h index cfad2df0..229d294b 100644 --- a/src/include/darma/impl/access_handle/access_handle_serialization.h +++ b/src/include/darma/impl/access_handle/access_handle_serialization.h @@ -57,7 +57,7 @@ #include -namespace darma_runtime { +namespace darma { //============================================================================== // {{{1 @@ -157,7 +157,7 @@ struct Serializer> std::enable_if_t< is_packable_with_archive::value and is_packable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { ar | val.var_handle_base_->get_key(); @@ -175,7 +175,7 @@ struct Serializer> std::enable_if_t< not is_packable_with_archive::value or not is_packable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { @@ -218,7 +218,7 @@ struct Serializer> std::enable_if_t< not is_unpackable_with_archive::value or not is_unpackable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { @@ -244,8 +244,8 @@ void AccessHandle::unpack_from_archive(Archive& ar) { using serialization_handler_t = - darma_runtime::serialization::PointerReferenceSerializationHandler< - darma_runtime::serialization::SimpleSerializationHandler> + darma::serialization::PointerReferenceSerializationHandler< + darma::serialization::SimpleSerializationHandler> >; key_t k = ar.template unpack_next_item_as(); @@ -266,6 +266,6 @@ AccessHandle::unpack_from_archive(Archive& ar) { // end Serialization }}}1 //============================================================================== -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_IMPL_ACCESS_HANDLE_ACCESS_HANDLE_SERIALIZATION_H diff --git a/src/include/darma/impl/access_handle/access_handle_traits.h b/src/include/darma/impl/access_handle/access_handle_traits.h index 4daa5cb2..0694b208 100644 --- a/src/include/darma/impl/access_handle/access_handle_traits.h +++ b/src/include/darma/impl/access_handle/access_handle_traits.h @@ -54,7 +54,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { template < @@ -1382,15 +1382,15 @@ namespace access_handle_traits { template using allow_copy_assignment_from_this = - darma_runtime::detail::copy_assignable_handle; + darma::detail::copy_assignable_handle; template -using permissions_traits = ::darma_runtime::detail +using permissions_traits = ::darma::detail ::access_handle_trait_tags::permissions_traits; } // end namespace access_handle_traits } // end namespace advanced -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ACCESS_HANDLE_ACCESS_HANDLE_TRAITS_H diff --git a/src/include/darma/impl/access_handle/basic_access_handle.h b/src/include/darma/impl/access_handle/basic_access_handle.h index 08fc5e24..80158709 100644 --- a/src/include/darma/impl/access_handle/basic_access_handle.h +++ b/src/include/darma/impl/access_handle/basic_access_handle.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -221,6 +221,6 @@ class BasicAccessHandle : public AccessHandleBase { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_BASIC_ACCESS_HANDLE_H diff --git a/src/include/darma/impl/access_handle/copy_captured_object.h b/src/include/darma/impl/access_handle/copy_captured_object.h index bbd0b5fb..a5bc6514 100644 --- a/src/include/darma/impl/access_handle/copy_captured_object.h +++ b/src/include/darma/impl/access_handle/copy_captured_object.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -59,9 +59,9 @@ class CopyCapturedObject { private: - using serialization_handler_t = darma_runtime::serialization::SimpleSerializationHandler>; + using serialization_handler_t = darma::serialization::SimpleSerializationHandler>; using ptr_serialization_handler_t = - darma_runtime::serialization::PointerReferenceSerializationHandler; + darma::serialization::PointerReferenceSerializationHandler; Derived const* prev_copied_from_ = nullptr; CaptureManager* capturing_task = nullptr; @@ -253,6 +253,6 @@ class CopyCapturedObject { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_IMPL_ACCESS_HANDLE_COPY_CAPTURED_OBJECT_H diff --git a/src/include/darma/impl/access_handle/copy_captured_object_fwd.h b/src/include/darma/impl/access_handle/copy_captured_object_fwd.h index 038c510a..e3d07071 100644 --- a/src/include/darma/impl/access_handle/copy_captured_object_fwd.h +++ b/src/include/darma/impl/access_handle/copy_captured_object_fwd.h @@ -45,13 +45,13 @@ #ifndef DARMAFRONTEND_COPY_CAPTURED_OBJECT_FWD_H #define DARMAFRONTEND_COPY_CAPTURED_OBJECT_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { template struct CopyCapturedObject; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_COPY_CAPTURED_OBJECT_FWD_H diff --git a/src/include/darma/impl/access_handle_base.h b/src/include/darma/impl/access_handle_base.h index 4198dd73..6ed2d453 100644 --- a/src/include/darma/impl/access_handle_base.h +++ b/src/include/darma/impl/access_handle_base.h @@ -58,7 +58,7 @@ // TODO move this to access_handle directory when we're at a stable merge point -namespace darma_runtime { +namespace darma { namespace detail { struct AccessHandleBaseAttorney; @@ -152,13 +152,13 @@ class AccessHandleBase friend class TaskBase; template - friend class darma_runtime::detail::IfThenElseCaptureManager; + friend class darma::detail::IfThenElseCaptureManager; template friend struct WhileDoCaptureManager; template - friend class darma_runtime::AccessHandle; + friend class darma::AccessHandle; friend struct AccessHandleBaseAttorney; @@ -234,6 +234,6 @@ struct AccessHandleBaseAttorney { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ACCESS_HANDLE_BASE_H diff --git a/src/include/darma/impl/access_handle_publish.impl.h b/src/include/darma/impl/access_handle_publish.impl.h index 75b531e2..9f3feb56 100644 --- a/src/include/darma/impl/access_handle_publish.impl.h +++ b/src/include/darma/impl/access_handle_publish.impl.h @@ -53,7 +53,7 @@ // TODO move this to access_handle sub-directory when we're at a stable merge point -namespace darma_runtime { +namespace darma { #if _darma_has_feature(publish_fetch) namespace detail { @@ -136,7 +136,7 @@ AccessHandle::publish( using detail::HandleUse; - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword, @@ -171,7 +171,7 @@ AccessHandle::publish( } #endif // _darma_has_feature(publish_fetch) -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ACCESS_HANDLE_PUBLISH_IMPL_H diff --git a/src/include/darma/impl/array/array_fwd.h b/src/include/darma/impl/array/array_fwd.h index 8d8622b7..2671acfd 100644 --- a/src/include/darma/impl/array/array_fwd.h +++ b/src/include/darma/impl/array/array_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_IMPL_ARRAY_ARRAY_FWD_H #define DARMA_IMPL_ARRAY_ARRAY_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { @@ -54,6 +54,6 @@ class SimpleElementRange; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_ARRAY_FWD_H diff --git a/src/include/darma/impl/array/concept.h b/src/include/darma/impl/array/concept.h index 689a8ad2..5e83d461 100644 --- a/src/include/darma/impl/array/concept.h +++ b/src/include/darma/impl/array/concept.h @@ -50,7 +50,7 @@ #include "indexable.h" -namespace darma_runtime { +namespace darma { namespace detail { template @@ -97,6 +97,6 @@ class ArrayConceptManagerForType } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_CONCEPT_H diff --git a/src/include/darma/impl/array/concept.impl.h b/src/include/darma/impl/array/concept.impl.h index b638a252..654cfc6a 100644 --- a/src/include/darma/impl/array/concept.impl.h +++ b/src/include/darma/impl/array/concept.impl.h @@ -48,7 +48,7 @@ #include "concept.h" #include "element_range.h" -namespace darma_runtime { +namespace darma { namespace detail { template @@ -65,6 +65,6 @@ ArrayConceptManagerForType::get_element_range( } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_CONCEPT_IMPL_H diff --git a/src/include/darma/impl/array/element_range.h b/src/include/darma/impl/array/element_range.h index 6492fb7a..7b2d0c3b 100644 --- a/src/include/darma/impl/array/element_range.h +++ b/src/include/darma/impl/array/element_range.h @@ -55,7 +55,7 @@ #include "indexable.h" #include "concept.h" -namespace darma_runtime { +namespace darma { namespace detail { // Simple implies subset object is always the same type as parent @@ -128,6 +128,6 @@ class SimpleElementRange }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_ELEMENT_RANGE_H diff --git a/src/include/darma/impl/array/index_decomposition.h b/src/include/darma/impl/array/index_decomposition.h index ff8e93a1..9f5965b5 100644 --- a/src/include/darma/impl/array/index_decomposition.h +++ b/src/include/darma/impl/array/index_decomposition.h @@ -52,7 +52,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -153,7 +153,7 @@ struct IndexDecomposition : detail::IndexDecomposition_enabled_if { }; -} // end namespace darma_runtime +} // end namespace darma #include "stl_vector.h" diff --git a/src/include/darma/impl/array/index_range.h b/src/include/darma/impl/array/index_range.h index 069c601d..b1a6ccdb 100644 --- a/src/include/darma/impl/array/index_range.h +++ b/src/include/darma/impl/array/index_range.h @@ -49,7 +49,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -212,6 +212,6 @@ get_mapping_to_dense( return detail::ContiguousIndexMapping{ range }; } -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_INDEX_RANGE_H diff --git a/src/include/darma/impl/array/indexable.h b/src/include/darma/impl/array/indexable.h index 3d65c9a0..12f96f62 100644 --- a/src/include/darma/impl/array/indexable.h +++ b/src/include/darma/impl/array/indexable.h @@ -49,7 +49,7 @@ #include "index_decomposition.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -154,6 +154,6 @@ struct IndexingTraits { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_INDEXABLE_H diff --git a/src/include/darma/impl/array/stl_vector.h b/src/include/darma/impl/array/stl_vector.h index 465ebf64..988098c7 100644 --- a/src/include/darma/impl/array/stl_vector.h +++ b/src/include/darma/impl/array/stl_vector.h @@ -50,10 +50,7 @@ #include "index_decomposition.h" #include -namespace darma = darma_runtime; - -namespace darma_runtime { - +namespace darma { namespace detail { @@ -158,6 +155,6 @@ class IndexDecomposition const> }; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_STL_VECTOR_H diff --git a/src/include/darma/impl/async_accessible/async_access_traits.h b/src/include/darma/impl/async_accessible/async_access_traits.h index 119a945d..43bcb118 100644 --- a/src/include/darma/impl/async_accessible/async_access_traits.h +++ b/src/include/darma/impl/async_accessible/async_access_traits.h @@ -100,7 +100,7 @@ detected_name, detected_name, default_value, public \ ) -namespace darma_runtime { +namespace darma { template struct async_accessible_object_adaptor_enabled_if @@ -620,6 +620,6 @@ struct async_accessible_object_adaptor< }; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ASYNC_ACCESSIBLE_ASYNC_ACCESS_TRAITS_H diff --git a/src/include/darma/impl/capture.h b/src/include/darma/impl/capture.h index 672adfee..dac8cce5 100644 --- a/src/include/darma/impl/capture.h +++ b/src/include/darma/impl/capture.h @@ -50,7 +50,7 @@ #include "handle.h" #include "use.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -68,11 +68,11 @@ make_captured_use_holder( UseMaker&& use_holder_maker ) { - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; - using namespace darma_runtime::abstract::frontend; - using darma_runtime::frontend::Permissions; - using darma_runtime::frontend::CoherenceMode; + using namespace darma::abstract::frontend; + using darma::frontend::Permissions; + using darma::frontend::CoherenceMode; // source scheduling permissions shouldn't be None at this point DARMA_ASSERT_MESSAGE( @@ -198,7 +198,7 @@ make_captured_use_holder( source_and_continuing_holder, /* Use holder maker */ [](auto&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto rv = std::decay_t::create( std::forward(args)... ); @@ -208,7 +208,7 @@ make_captured_use_holder( } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma // OLD CODE!!! // switch(source_and_continuing_holder->use->coherence_mode_) { diff --git a/src/include/darma/impl/capture/callable_traits.h b/src/include/darma/impl/capture/callable_traits.h index d1f31bfb..7a60c9cf 100644 --- a/src/include/darma/impl/capture/callable_traits.h +++ b/src/include/darma/impl/capture/callable_traits.h @@ -66,7 +66,7 @@ #include "darma/impl/meta/any_convertible.h" #include "darma/impl/meta/is_callable.h" -namespace darma_runtime { +namespace darma { namespace meta { @@ -512,7 +512,7 @@ struct callable_traits { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif /* DARMA_IMPL_META_CALLABLE_TRAITS_H_ */ diff --git a/src/include/darma/impl/capture/functor_traits.h b/src/include/darma/impl/capture/functor_traits.h index 56c42179..09f5d1c7 100644 --- a/src/include/darma/impl/capture/functor_traits.h +++ b/src/include/darma/impl/capture/functor_traits.h @@ -55,7 +55,7 @@ #include "darma/impl/task/task.h" #include "darma/impl/handle.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -288,7 +288,7 @@ struct functor_call_traits { public: static constexpr auto is_access_handle = - darma_runtime::detail::is_access_handle>::value; + darma::detail::is_access_handle>::value; using formal_traits = typename functor_traits::template formal_arg_traits; @@ -769,6 +769,6 @@ struct functor_closure_traits< -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_FUNCTOR_TRAITS_H diff --git a/src/include/darma/impl/capture/semantics.h b/src/include/darma/impl/capture/semantics.h index d0f5615c..639245f2 100644 --- a/src/include/darma/impl/capture/semantics.h +++ b/src/include/darma/impl/capture/semantics.h @@ -61,7 +61,7 @@ * pattern inputs and the rest expressing the output of the pattern matching * case. (These macros are, in turn, implemented with a partial specialization * of the class template - * `darma_runtime::detail::capture_semantics::CaptureCase` that uses SFINAE + * `darma::detail::capture_semantics::CaptureCase` that uses SFINAE * for pattern matching.) * * Cases are also denoted with comments so that they can quickly be searched @@ -83,7 +83,7 @@ #include "semantics_helpers.h" -namespace darma_runtime { +namespace darma { namespace detail { namespace capture_semantics { @@ -475,6 +475,6 @@ static int _force_instantiate_capture_cases = capture_semantics::apply_with_capt } // end namespace capture_semantics } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_SEMANTICS_H diff --git a/src/include/darma/impl/capture/semantics_helpers.h b/src/include/darma/impl/capture/semantics_helpers.h index cd09f857..35499d2e 100644 --- a/src/include/darma/impl/capture/semantics_helpers.h +++ b/src/include/darma/impl/capture/semantics_helpers.h @@ -55,7 +55,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { namespace capture_semantics { @@ -72,10 +72,10 @@ struct CaptureCaseInputHash { using underlying_permissions_t = std::underlying_type_t; using underlying_coherence_mode_t = std::underlying_type_t; auto rv = std::hash()((underlying_permissions_t)c.source_scheduling); - darma_runtime::detail::hash_combine(rv, (underlying_permissions_t)c.source_immediate); - darma_runtime::detail::hash_combine(rv, (underlying_permissions_t)c.captured_scheduling); - darma_runtime::detail::hash_combine(rv, (underlying_permissions_t)c.captured_immediate); - darma_runtime::detail::hash_combine(rv, (underlying_coherence_mode_t)c.coherence_mode); + darma::detail::hash_combine(rv, (underlying_permissions_t)c.source_immediate); + darma::detail::hash_combine(rv, (underlying_permissions_t)c.captured_scheduling); + darma::detail::hash_combine(rv, (underlying_permissions_t)c.captured_immediate); + darma::detail::hash_combine(rv, (underlying_coherence_mode_t)c.coherence_mode); return rv; } }; @@ -210,7 +210,7 @@ inline void _capture_case_not_implemented( * @note The parameters to methods in this class have the same names as the ones * in the `_darma_CAPTURE_CASE()` macro, so they are the names that should be * used as argument to the `FlowRelationship` creation functions (in namespace - * `darma_runtime::detail::flow_relationships`, which is `using`'d in the bodies + * `darma::detail::flow_relationships`, which is `using`'d in the bodies * of all the macro functions for brevity). * * @sa semantics.h @@ -659,6 +659,6 @@ auto apply_with_capture_case( } // end namespace capture_semantics } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_SEMANTICS_HELPERS_H diff --git a/src/include/darma/impl/capture/semantics_macros.h b/src/include/darma/impl/capture/semantics_macros.h index 4bc18bd3..0446e185 100644 --- a/src/include/darma/impl/capture/semantics_macros.h +++ b/src/include/darma/impl/capture/semantics_macros.h @@ -63,44 +63,44 @@ _darma_CAPTURE_CASE_BASIC_IMPL( \ (_coherence_mode), (_source_sched), (_source_immed), (_capt_sched), (_capt_immed), \ (_capt_in), (_capt_out), (_capt_anti_in), (_capt_anti_out), _could_be_alias \ ) /* { */ \ - static constexpr auto ContinuationScheduling() { return darma_runtime::frontend::Permissions::_cont_sched; } \ - static constexpr auto ContinuationImmediate() { return darma_runtime::frontend::Permissions::_cont_immed; } \ - static constexpr auto continuation_scheduling() { return darma_runtime::frontend::Permissions::_cont_sched; } \ - static constexpr auto continuation_immediate() { return darma_runtime::frontend::Permissions::_cont_immed; } \ + static constexpr auto ContinuationScheduling() { return darma::frontend::Permissions::_cont_sched; } \ + static constexpr auto ContinuationImmediate() { return darma::frontend::Permissions::_cont_immed; } \ + static constexpr auto continuation_scheduling() { return darma::frontend::Permissions::_cont_sched; } \ + static constexpr auto continuation_immediate() { return darma::frontend::Permissions::_cont_immed; } \ static constexpr auto needs_new_continuation_use() { return true; } \ static constexpr auto is_valid_capture_case() { return true; } \ static auto continuation_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _cont_in; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out \ + ) { using namespace darma::detail::flow_relationships; return _cont_in; } \ static auto continuation_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _cont_out; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out \ + ) { using namespace darma::detail::flow_relationships; return _cont_out; } \ static auto continuation_anti_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out, \ - darma_runtime::types::anti_flow_t* captured_anti_in, \ - darma_runtime::types::anti_flow_t* captured_anti_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _cont_anti_in; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out, \ + darma::types::anti_flow_t* captured_anti_in, \ + darma::types::anti_flow_t* captured_anti_out \ + ) { using namespace darma::detail::flow_relationships; return _cont_anti_in; } \ static auto continuation_anti_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out, \ - darma_runtime::types::anti_flow_t* captured_anti_in, \ - darma_runtime::types::anti_flow_t* captured_anti_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _cont_anti_out; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out, \ + darma::types::anti_flow_t* captured_anti_in, \ + darma::types::anti_flow_t* captured_anti_out \ + ) { using namespace darma::detail::flow_relationships; return _cont_anti_out; } \ static size_t _make_index_to_force_registration() { \ return capture_semantics::register_capture_case(); \ } \ @@ -120,8 +120,8 @@ _darma_CAPTURE_CASE_BASIC_IMPL( \ (_coherence_mode), (_source_sched), (_source_immed), (_capt_sched), (_capt_immed), \ (_capt_in), (_capt_out), (_capt_anti_in), (_capt_anti_out), _could_be_alias \ ) /* { */ \ - static constexpr auto continuation_scheduling() { return darma_runtime::frontend::Permissions::_invalid; } \ - static constexpr auto continuation_immediate() { return darma_runtime::frontend::Permissions::_invalid; } \ + static constexpr auto continuation_scheduling() { return darma::frontend::Permissions::_invalid; } \ + static constexpr auto continuation_immediate() { return darma::frontend::Permissions::_invalid; } \ static constexpr auto needs_new_continuation_use() { return false; } \ static constexpr auto is_valid_capture_case() { return true; } \ static auto _case_not_implemented() { \ @@ -135,36 +135,36 @@ _darma_CAPTURE_CASE_BASIC_IMPL( \ return FlowRelationshipImpl(); /* unreachable, but needed for return type deduction*/ \ } \ static auto continuation_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out \ ) { return _case_not_implemented(); } \ static auto continuation_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out \ ) { return _case_not_implemented(); } \ static auto continuation_anti_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out, \ - darma_runtime::types::anti_flow_t* captured_anti_in, \ - darma_runtime::types::anti_flow_t* captured_anti_out \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out, \ + darma::types::anti_flow_t* captured_anti_in, \ + darma::types::anti_flow_t* captured_anti_out \ ) { return _case_not_implemented(); } \ static auto continuation_anti_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::flow_t* captured_in, \ - darma_runtime::types::flow_t* captured_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out, \ - darma_runtime::types::anti_flow_t* captured_anti_in, \ - darma_runtime::types::anti_flow_t* captured_anti_out \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::flow_t* captured_in, \ + darma::types::flow_t* captured_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out, \ + darma::types::anti_flow_t* captured_anti_in, \ + darma::types::anti_flow_t* captured_anti_out \ ) { return _case_not_implemented(); } \ static size_t _make_index_to_force_registration() { \ return capture_semantics::register_capture_case(); \ @@ -188,10 +188,10 @@ _darma_CAPTURE_CASE_BASIC_IMPL( \ #define _darma_impl_PERMISSIONS_SET(...) _darma_PP_FOR_EACH(_darma_impl_PREFIX_PERMISSIONS, __VA_ARGS__) #define _darma_impl_COHERENCE_MODE_SET(...) _darma_PP_FOR_EACH(_darma_impl_PREFIX_COHERENCE_MODE, __VA_ARGS__) -#define _darma_impl_PREFIX_PERMISSIONS(perm) darma_runtime::frontend::Permissions::perm -#define _darma_impl_PREFIX_COHERENCE_MODE(mode) darma_runtime::frontend::CoherenceMode::mode -#define _darma_impl_TYPE_WRAP_PERMISSIONS(perm) std::integral_constant -#define _darma_impl_TYPE_WRAP_COHERENCE_MODE(mode) std::integral_constant +#define _darma_impl_PREFIX_PERMISSIONS(perm) darma::frontend::Permissions::perm +#define _darma_impl_PREFIX_COHERENCE_MODE(mode) darma::frontend::CoherenceMode::mode +#define _darma_impl_TYPE_WRAP_PERMISSIONS(perm) std::integral_constant +#define _darma_impl_TYPE_WRAP_COHERENCE_MODE(mode) std::integral_constant #define _darma_CAPTURE_CASE_BASIC_IMPL( \ _coherence_mode, \ @@ -224,25 +224,25 @@ _darma_CAPTURE_CASE_BASIC_IMPL( \ static constexpr auto coherence_mode() { return CoherenceModeIn; } \ static constexpr auto could_be_alias() { return _could_be_alias; } \ static auto captured_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_in ; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out \ + ) { using namespace darma::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_in ; } \ static auto captured_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_out ; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out \ + ) { using namespace darma::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_out ; } \ static auto captured_anti_in_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_anti_in ; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out \ + ) { using namespace darma::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_anti_in ; } \ static auto captured_anti_out_flow_relationship( \ - darma_runtime::types::flow_t* source_in, \ - darma_runtime::types::flow_t* source_out, \ - darma_runtime::types::anti_flow_t* source_anti_in, \ - darma_runtime::types::anti_flow_t* source_anti_out \ - ) { using namespace darma_runtime::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_anti_out ; } \ + darma::types::flow_t* source_in, \ + darma::types::flow_t* source_out, \ + darma::types::anti_flow_t* source_anti_in, \ + darma::types::anti_flow_t* source_anti_out \ + ) { using namespace darma::detail::flow_relationships; return _darma_REMOVE_PARENS _capt_anti_out ; } \ /* } */ diff --git a/src/include/darma/impl/collective/allreduce.h b/src/include/darma/impl/collective/allreduce.h index 9b8fdd86..1188e469 100644 --- a/src/include/darma/impl/collective/allreduce.h +++ b/src/include/darma/impl/collective/allreduce.h @@ -72,7 +72,7 @@ -namespace darma_runtime { +namespace darma { namespace detail { @@ -83,7 +83,7 @@ template using _get_collective_details_t = SimpleCollectiveDetails< std::conditional_t< std::is_same::value, - typename darma_runtime::default_reduce_op< + typename darma::default_reduce_op< typename std::decay_t::value_type >::type, Op @@ -105,7 +105,7 @@ struct all_reduce_impl { { #if _darma_has_feature(task_collection_token) auto* running_task = - utility::safe_static_cast( + utility::safe_static_cast( abstract::backend::get_backend_context()->get_running_task() ); if(running_task->parent_token_available) { @@ -274,7 +274,7 @@ void allreduce( KWArgs&&... kwargs ) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _positional_or_keyword, @@ -315,7 +315,7 @@ void allreduce( }; -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(simple_collectives) diff --git a/src/include/darma/impl/collective/collective_fwd.h b/src/include/darma/impl/collective/collective_fwd.h index 48f714ae..02d750a3 100644 --- a/src/include/darma/impl/collective/collective_fwd.h +++ b/src/include/darma/impl/collective/collective_fwd.h @@ -45,13 +45,13 @@ #ifndef DARMAFRONTEND_COLLECTIVE_FWD_H #define DARMAFRONTEND_COLLECTIVE_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { struct op_not_given { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma // TODO move these to interface files! diff --git a/src/include/darma/impl/collective/details.h b/src/include/darma/impl/collective/details.h index e194e8f8..c6a55900 100644 --- a/src/include/darma/impl/collective/details.h +++ b/src/include/darma/impl/collective/details.h @@ -50,7 +50,7 @@ #include "reduce_op.h" -namespace darma_runtime { +namespace darma { namespace detail { namespace _impl { @@ -123,6 +123,6 @@ class SimpleCollectiveDetails }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_COLLECTIVE_DETAILS_H diff --git a/src/include/darma/impl/collective/reduce_op.h b/src/include/darma/impl/collective/reduce_op.h index 1b7bf01a..84790193 100644 --- a/src/include/darma/impl/collective/reduce_op.h +++ b/src/include/darma/impl/collective/reduce_op.h @@ -60,7 +60,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -71,10 +71,10 @@ class ReduceOperationWrapper ReduceOperationWrapper, abstract::frontend::ReduceOp >, - public darma_runtime::serialization::detail::SerializationManagerForType< + public darma::serialization::detail::SerializationManagerForType< value_type >, - public darma_runtime::detail::ArrayConceptManagerForType< + public darma::detail::ArrayConceptManagerForType< value_type, SimpleElementRange > { @@ -327,6 +327,6 @@ struct default_reduce_op> : tinympl::identity { }; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_COLLECTIVE_REDUCE_OP_H diff --git a/src/include/darma/impl/commutative_access.h b/src/include/darma/impl/commutative_access.h index 5d1cfe3d..21c7cff2 100644 --- a/src/include/darma/impl/commutative_access.h +++ b/src/include/darma/impl/commutative_access.h @@ -61,7 +61,7 @@ #include "use.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -104,8 +104,8 @@ struct _commutative_access_impl { >::type >; - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; // in handle unless one is given for the new handle, which is not yet // supported anyway) @@ -225,8 +225,8 @@ struct _commutative_access_impl { // TODO use allocator - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; // in handle unless one is given for the new handle, which is not yet // supported anyway) @@ -368,7 +368,7 @@ struct _commutative_access_impl { " commutative_access(...) that don't take an AccessHandle argument" ); - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; // TODO use allocator @@ -448,7 +448,7 @@ struct _commutative_access_impl { KeyPart1&& kp1, KeyParts&& ... kps ) const { - return _impl(darma_runtime::make_key( + return _impl(darma::make_key( std::forward(kp1), std::forward(kps)... ) @@ -512,8 +512,8 @@ struct _noncommutative_access_impl { >::type >; - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; auto* rt = abstract::backend::get_backend_runtime(); // Use the allocator from the out handle (which is the allocator from the @@ -663,8 +663,8 @@ struct _noncommutative_collection_access_impl { >::template from_traits::type >; - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; auto* rt = abstract::backend::get_backend_runtime(); // Use the allocator from the out handle (which is the allocator from the @@ -844,7 +844,7 @@ commutative_access(Args&&... args) { // TODO allocator kwarg - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< // for converting an existing handle into commutative mode: @@ -880,7 +880,7 @@ template < auto commutative_access_to_handle(Arg1&& a1, Args&&... args) { return commutative_access( - darma_runtime::keyword_arguments_for_commutative_access::to_handle + darma::keyword_arguments_for_commutative_access::to_handle = std::forward(a1), std::forward(args)... ); @@ -894,7 +894,7 @@ template < auto noncommutative_access_to_handle(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< // for converting an existing handle into commutative mode: @@ -918,7 +918,7 @@ template < auto noncommutative_access_to_collection(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< // for converting an existing handle into commutative mode: @@ -936,7 +936,7 @@ noncommutative_access_to_collection(Args&&... args) { -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(commutative_access_handles) diff --git a/src/include/darma/impl/commutative_access_fwd.h b/src/include/darma/impl/commutative_access_fwd.h index a931c92f..45637638 100644 --- a/src/include/darma/impl/commutative_access_fwd.h +++ b/src/include/darma/impl/commutative_access_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_IMPL_COMMUTATIVE_ACCESS_FWD_H #define DARMA_IMPL_COMMUTATIVE_ACCESS_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { template @@ -56,6 +56,6 @@ template struct _noncommutative_collection_access_impl; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_COMMUTATIVE_ACCESS_FWD_H diff --git a/src/include/darma/impl/create_work/capture_permissions.h b/src/include/darma/impl/create_work/capture_permissions.h index e9e57a81..cf338556 100644 --- a/src/include/darma/impl/create_work/capture_permissions.h +++ b/src/include/darma/impl/create_work/capture_permissions.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { struct CapturedObjectAttorney; @@ -437,7 +437,7 @@ class CaptureDescriptionBase { template auto reads(Args&&... args) { - return darma_runtime::detail::make_deferred_permissions_modifications( + return darma::detail::make_deferred_permissions_modifications( [&](auto const& arg){ detail::CapturedObjectAttorney::captured_as_info( std::forward(arg) @@ -450,7 +450,7 @@ reads(Args&&... args) { template auto schedule_only(Args&&... args) { - return darma_runtime::detail::make_deferred_permissions_modifications( + return darma::detail::make_deferred_permissions_modifications( [&](auto const& arg){ detail::CapturedObjectAttorney::captured_as_info( std::forward(arg) @@ -460,6 +460,6 @@ schedule_only(Args&&... args) { ); } -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_IMPL_CREATE_WORK_CAPTURE_PERMISSIONS_H diff --git a/src/include/darma/impl/create_work/create_if_then.h b/src/include/darma/impl/create_work/create_if_then.h index e92a11b1..4b5e0f53 100644 --- a/src/include/darma/impl/create_work/create_if_then.h +++ b/src/include/darma/impl/create_work/create_if_then.h @@ -62,7 +62,7 @@ // TODO Don't create a task (and generate a warning?) if there are no captures in the if clause -namespace darma_runtime { +namespace darma { namespace detail { @@ -416,6 +416,6 @@ struct IfThenElseCaptureManager< } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_CREATE_IF_THEN_H diff --git a/src/include/darma/impl/create_work/create_if_then_functor.h b/src/include/darma/impl/create_work/create_if_then_functor.h index a3d1048c..0794c344 100644 --- a/src/include/darma/impl/create_work/create_if_then_functor.h +++ b/src/include/darma/impl/create_work/create_if_then_functor.h @@ -51,7 +51,7 @@ #include "create_if_then_fwd.h" -namespace darma_runtime { +namespace darma { namespace detail { template @@ -305,6 +305,6 @@ struct _create_work_else_helper< //------------------------------------------------------------------------------ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_IF_THEN_FUNCTOR_H diff --git a/src/include/darma/impl/create_work/create_if_then_fwd.h b/src/include/darma/impl/create_work/create_if_then_fwd.h index 94cf748c..54949c8a 100644 --- a/src/include/darma/impl/create_work/create_if_then_fwd.h +++ b/src/include/darma/impl/create_work/create_if_then_fwd.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { template < @@ -77,6 +77,6 @@ struct IfLambdaThenLambdaTask; struct ParsedCaptureOptions; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_CREATE_IF_THEN_FWD_H diff --git a/src/include/darma/impl/create_work/create_if_then_lambda.h b/src/include/darma/impl/create_work/create_if_then_lambda.h index a4efb915..64e7f1b6 100644 --- a/src/include/darma/impl/create_work/create_if_then_lambda.h +++ b/src/include/darma/impl/create_work/create_if_then_lambda.h @@ -50,7 +50,7 @@ #include "create_if_then_fwd.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -351,6 +351,6 @@ struct _create_work_else_helper< //------------------------------------------------------------------------------ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_IF_LAMBDA_H diff --git a/src/include/darma/impl/create_work/create_work.h b/src/include/darma/impl/create_work/create_work.h index 3cc60b2a..ef3068f5 100644 --- a/src/include/darma/impl/create_work/create_work.h +++ b/src/include/darma/impl/create_work/create_work.h @@ -75,7 +75,7 @@ #include -namespace darma_runtime { +namespace darma { template < @@ -151,7 +151,7 @@ create_work // ); //} -} // end namespace darma_runtime +} // end namespace darma #endif /* SRC_CREATE_WORK_H_ */ diff --git a/src/include/darma/impl/create_work/create_work_argument_parser.h b/src/include/darma/impl/create_work/create_work_argument_parser.h index a28f805a..b092c4d9 100644 --- a/src/include/darma/impl/create_work/create_work_argument_parser.h +++ b/src/include/darma/impl/create_work/create_work_argument_parser.h @@ -59,10 +59,10 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { -using create_work_argument_parser = darma_runtime::detail::kwarg_parser< +using create_work_argument_parser = darma::detail::kwarg_parser< variadic_positional_overload_description< _optional_keyword< converted_parameter, keyword_tags_for_task_creation::name @@ -80,23 +80,23 @@ inline auto setup_create_work_argument_parser() { return create_work_argument_parser() .with_converters( [](auto&& ... parts) { - return darma_runtime::make_key(std::forward(parts)...); + return darma::make_key(std::forward(parts)...); }, [](auto&&... aliasing_desc) { - return std::make_unique( - darma_runtime::detail::allowed_aliasing_description_ctor_tag_t(), + return std::make_unique( + darma::detail::allowed_aliasing_description_ctor_tag_t(), std::forward(aliasing_desc)... ); } ) .with_default_generators( - darma_runtime::keyword_arguments_for_task_creation::name = [] { + darma::keyword_arguments_for_task_creation::name = [] { // TODO this should actually return a "pending backend assignment" key - return darma_runtime::make_key(); + return darma::make_key(); }, keyword_arguments_for_task_creation::allow_aliasing = [] { - return std::make_unique( - darma_runtime::detail::allowed_aliasing_description_ctor_tag_t(), + return std::make_unique( + darma::detail::allowed_aliasing_description_ctor_tag_t(), false ); }, @@ -105,6 +105,6 @@ inline auto setup_create_work_argument_parser() { } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_ARGUMENT_PARSER_H diff --git a/src/include/darma/impl/create_work/create_work_functor.h b/src/include/darma/impl/create_work/create_work_functor.h index 88cf43b1..e793bcb7 100644 --- a/src/include/darma/impl/create_work/create_work_functor.h +++ b/src/include/darma/impl/create_work/create_work_functor.h @@ -53,7 +53,7 @@ #include "record_line_numbers.h" -namespace darma_runtime { +namespace darma { namespace detail { //============================================================================== @@ -73,7 +73,7 @@ struct _create_work_impl, LastArg> { using _______________see_calling_context_on_next_line________________ = typename create_work_argument_parser::template static_assert_valid_invocation; - auto* parent_task = darma_runtime::detail::get_running_task_impl(); + auto* parent_task = darma::detail::get_running_task_impl(); auto task = std::make_unique>( parent_task, @@ -105,6 +105,6 @@ struct _create_work_impl, LastArg> { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_FUNCTOR_H diff --git a/src/include/darma/impl/create_work/create_work_fwd.h b/src/include/darma/impl/create_work/create_work_fwd.h index 57419029..c0801954 100644 --- a/src/include/darma/impl/create_work/create_work_fwd.h +++ b/src/include/darma/impl/create_work/create_work_fwd.h @@ -47,7 +47,7 @@ #include "darma/impl/handle_fwd.h" -namespace darma_runtime { +namespace darma { namespace detail { template < @@ -61,6 +61,6 @@ template struct _create_work_impl; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_CREATE_WORK_FWD_H diff --git a/src/include/darma/impl/create_work/create_work_lambda.h b/src/include/darma/impl/create_work/create_work_lambda.h index d3e5a029..80263e0a 100644 --- a/src/include/darma/impl/create_work/create_work_lambda.h +++ b/src/include/darma/impl/create_work/create_work_lambda.h @@ -53,7 +53,7 @@ #include "create_work.h" #include "record_line_numbers.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -72,10 +72,10 @@ struct _create_work_impl; - auto* parent_task = darma_runtime::detail::get_running_task_impl(); + auto* parent_task = darma::detail::get_running_task_impl(); auto task = std::make_unique< - darma_runtime::detail::LambdaTask> + darma::detail::LambdaTask> >( // Perfect forward the lambda here; the copy ctors will get invoked // in the constructor of LambdaTask (after everything is set up) @@ -91,13 +91,13 @@ struct _create_work_implregister_task( + return darma::abstract::backend::get_backend_runtime()->register_task( std::move(task) ); } }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_LAMBDA_H diff --git a/src/include/darma/impl/create_work/create_work_while.h b/src/include/darma/impl/create_work/create_work_while.h index a111f0a8..5994e3ce 100644 --- a/src/include/darma/impl/create_work/create_work_while.h +++ b/src/include/darma/impl/create_work/create_work_while.h @@ -70,7 +70,7 @@ // TODO Propagate task options and permissions downgrades -namespace darma_runtime { +namespace darma { namespace detail { @@ -552,6 +552,6 @@ struct WhileDoCaptureManager< #if DARMA_CREATE_WORK_RECORD_LINE_NUMBERS #endif -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_CREATE_WORK_WHILE_H diff --git a/src/include/darma/impl/create_work/create_work_while_functor.h b/src/include/darma/impl/create_work/create_work_while_functor.h index 5f5bf669..368c12b6 100644 --- a/src/include/darma/impl/create_work/create_work_while_functor.h +++ b/src/include/darma/impl/create_work/create_work_while_functor.h @@ -58,7 +58,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { //------------------------------------------------------------------------------ @@ -366,6 +366,6 @@ struct _create_work_while_helper< //------------------------------------------------------------------------------ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_WHILE_FUNCTOR_H diff --git a/src/include/darma/impl/create_work/create_work_while_fwd.h b/src/include/darma/impl/create_work/create_work_while_fwd.h index f6dca855..8f1135dd 100644 --- a/src/include/darma/impl/create_work/create_work_while_fwd.h +++ b/src/include/darma/impl/create_work/create_work_while_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMAFRONTEND_CREATE_WORK_WHILE_FWD_H #define DARMAFRONTEND_CREATE_WORK_WHILE_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { template @@ -60,6 +60,6 @@ template < struct WhileDoCaptureManager; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_WHILE_FWD_H diff --git a/src/include/darma/impl/create_work/create_work_while_lambda.h b/src/include/darma/impl/create_work/create_work_while_lambda.h index cfd1c2c3..143f8d8e 100644 --- a/src/include/darma/impl/create_work/create_work_while_lambda.h +++ b/src/include/darma/impl/create_work/create_work_while_lambda.h @@ -52,7 +52,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { //------------------------------------------------------------------------------ @@ -384,6 +384,6 @@ struct _create_work_while_helper< //------------------------------------------------------------------------------ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_CREATE_WORK_WHILE_LAMBDA_H diff --git a/src/include/darma/impl/create_work/permissions_downgrades.h b/src/include/darma/impl/create_work/permissions_downgrades.h index dd2fbb5e..e18e86d8 100644 --- a/src/include/darma/impl/create_work/permissions_downgrades.h +++ b/src/include/darma/impl/create_work/permissions_downgrades.h @@ -50,7 +50,7 @@ #include // is_access_handle -namespace darma_runtime { +namespace darma { namespace detail { @@ -248,7 +248,7 @@ namespace detail { //make_permissions_downgrade_description( // std::tuple&& tup //) { -// return darma_runtime::detail::_make_permissions_downgrade_description_tuple_helper< +// return darma::detail::_make_permissions_downgrade_description_tuple_helper< // SchedulingDowngrade, ImmediateDowngrade // >( // std::move(tup), std::index_sequence_for{} @@ -257,6 +257,6 @@ namespace detail { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_PERMISSIONS_DOWNGRADES_H diff --git a/src/include/darma/impl/create_work/record_line_numbers.h b/src/include/darma/impl/create_work/record_line_numbers.h index 72ed151d..c991981b 100644 --- a/src/include/darma/impl/create_work/record_line_numbers.h +++ b/src/include/darma/impl/create_work/record_line_numbers.h @@ -50,7 +50,7 @@ #include #include -namespace darma_runtime { +namespace darma { #if DARMA_CREATE_WORK_RECORD_LINE_NUMBERS @@ -103,6 +103,6 @@ struct _create_work_if_creation_context : _create_work_creation_context { #define create_work_if _create_work_if_creation_context(__FILE__, __LINE__, __func__)._darma_create_work_if_with_line_numbers #endif -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_RECORD_LINE_NUMBERS_H diff --git a/src/include/darma/impl/darma.h b/src/include/darma/impl/darma.h index b4494cd6..5b45fc0b 100644 --- a/src/include/darma/impl/darma.h +++ b/src/include/darma/impl/darma.h @@ -66,7 +66,5 @@ #include "darma.impl.h" -namespace darma = darma_runtime; - #endif /* SRC_DARMA_DARMA_H_ */ diff --git a/src/include/darma/impl/flow_handling.h b/src/include/darma/impl/flow_handling.h index 09944ba3..5a455221 100644 --- a/src/include/darma/impl/flow_handling.h +++ b/src/include/darma/impl/flow_handling.h @@ -51,12 +51,12 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { using flow_ptr = std::shared_ptr; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_FLOW_HANDLING_H diff --git a/src/include/darma/impl/handle.h b/src/include/darma/impl/handle.h index 3c807aee..f4f08e36 100644 --- a/src/include/darma/impl/handle.h +++ b/src/include/darma/impl/handle.h @@ -81,7 +81,7 @@ #include "handle_fwd.h" -namespace darma_runtime { +namespace darma { //////////////////////////////////////////////////////////////////////////////// // @@ -230,7 +230,7 @@ class VariableHandle // just use simple archive and handler for now using serialization_handler_t = - darma_runtime::serialization::SimpleSerializationHandler>; + darma::serialization::SimpleSerializationHandler>; size_t get_packed_size( @@ -253,7 +253,7 @@ class VariableHandle ) const override { auto ar = serialization_handler_t::make_packing_archive( // Capacity unknown, but it doesn't matter - darma_runtime::serialization::NonOwningSerializationBuffer( + darma::serialization::NonOwningSerializationBuffer( buffer, std::numeric_limits::max() ) ); @@ -272,7 +272,7 @@ class VariableHandle { auto ar = serialization_handler_t::make_unpacking_archive( // Capacity unknown, but it doesn't matter - darma_runtime::serialization::ConstNonOwningSerializationBuffer( + darma::serialization::ConstNonOwningSerializationBuffer( buffer, std::numeric_limits::max() ) ); @@ -439,7 +439,7 @@ using value_type_if_access_handle_t = typename value_type_if_access_handle -namespace darma_runtime { +namespace darma { namespace detail { @@ -127,7 +127,7 @@ struct for_AccessHandle { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/impl/handle_fwd.h b/src/include/darma/impl/handle_fwd.h index cc48d14e..c406f847 100644 --- a/src/include/darma/impl/handle_fwd.h +++ b/src/include/darma/impl/handle_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_HANDLE_FWD_H #define DARMA_HANDLE_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { @@ -76,6 +76,6 @@ typedef enum AccessHandleTaskCollectionCaptureMode { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_HANDLE_FWD_H diff --git a/src/include/darma/impl/handle_use_base.h b/src/include/darma/impl/handle_use_base.h index d8267c8d..a45c1cf5 100644 --- a/src/include/darma/impl/handle_use_base.h +++ b/src/include/darma/impl/handle_use_base.h @@ -60,7 +60,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { class HandleUseBase @@ -338,6 +338,6 @@ class HandleUseBase } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_HANDLE_USE_BASE_H_H diff --git a/src/include/darma/impl/index_range/dense_range.h b/src/include/darma/impl/index_range/dense_range.h index 3adbd055..9775ffab 100644 --- a/src/include/darma/impl/index_range/dense_range.h +++ b/src/include/darma/impl/index_range/dense_range.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace indexing { namespace detail { @@ -81,6 +81,6 @@ class basic_dense_index_range using dense_index_range = detail::basic_dense_index_range; } // end namespace indexing -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_DENSE_RANGE_H diff --git a/src/include/darma/impl/index_range/index_range_traits.h b/src/include/darma/impl/index_range/index_range_traits.h index 09950f9e..4763dd5e 100644 --- a/src/include/darma/impl/index_range/index_range_traits.h +++ b/src/include/darma/impl/index_range/index_range_traits.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace indexing { template @@ -181,6 +181,6 @@ using index_range_type_from_arguments_t = typename >::type; } // end namespace indexing -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_INDEX_RANGE_TRAITS_H diff --git a/src/include/darma/impl/index_range/mapping.h b/src/include/darma/impl/index_range/mapping.h index 3253b953..04d877ae 100644 --- a/src/include/darma/impl/index_range/mapping.h +++ b/src/include/darma/impl/index_range/mapping.h @@ -54,7 +54,7 @@ #include #include "mapping_traits.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -486,6 +486,6 @@ struct is_directly_serializable_enabled_if struct mapping_traits { template - friend struct darma_runtime::indexing::mapping_traits; + friend struct darma::indexing::mapping_traits; //============================================================================ // {{{1 @@ -77,7 +77,7 @@ struct mapping_traits { public: template - friend struct darma_runtime::indexing::mapping_traits; + friend struct darma::indexing::mapping_traits; template using _is_index_mapping_archetype = typename U::is_index_mapping; @@ -194,12 +194,12 @@ struct mapping_traits { optional_boolean_t >::value or std::is_convertible< - typename darma_runtime::indexing::mapping_traits + typename darma::indexing::mapping_traits ::template _mapping_is_same_return_t, optional_boolean_t >::value or std::is_convertible< - typename darma_runtime::indexing::mapping_traits + typename darma::indexing::mapping_traits ::template _mapping_is_same_return_t, bool >::value @@ -250,7 +250,7 @@ struct mapping_traits { optional_boolean_t >::value and std::is_convertible< - typename darma_runtime::indexing::mapping_traits + typename darma::indexing::mapping_traits ::template _mapping_is_same_return_t, optional_boolean_t >::value, @@ -274,12 +274,12 @@ struct mapping_traits { optional_boolean_t >::value and not std::is_convertible< - typename darma_runtime::indexing::mapping_traits + typename darma::indexing::mapping_traits ::template _mapping_is_same_return_t, optional_boolean_t >::value and std::is_convertible< - typename darma_runtime::indexing::mapping_traits + typename darma::indexing::mapping_traits ::template _mapping_is_same_return_t, bool >::value, @@ -646,6 +646,6 @@ using mapping_type_from_arguments_t = typename } // end namespace indexing -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_MAPPING_TRAITS_H diff --git a/src/include/darma/impl/index_range/polymorphic_index_range.h b/src/include/darma/impl/index_range/polymorphic_index_range.h index 7c8ed544..6a41fc05 100644 --- a/src/include/darma/impl/index_range/polymorphic_index_range.h +++ b/src/include/darma/impl/index_range/polymorphic_index_range.h @@ -50,7 +50,7 @@ #include "polymorphic_mapping.h" -namespace darma_runtime { +namespace darma { namespace indexing { @@ -112,6 +112,6 @@ class PolymorphicIndexRange } // end namespace indexing -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_POLYMORPHIC_INDEX_RANGE_H diff --git a/src/include/darma/impl/index_range/polymorphic_mapping.h b/src/include/darma/impl/index_range/polymorphic_mapping.h index 26c152ae..1dcf7026 100644 --- a/src/include/darma/impl/index_range/polymorphic_mapping.h +++ b/src/include/darma/impl/index_range/polymorphic_mapping.h @@ -52,7 +52,7 @@ #include "mapping.h" -namespace darma_runtime { +namespace darma { template < typename FromIndexT, typename ToIndexT=FromIndexT, @@ -137,6 +137,6 @@ class PolymorphicOneToOneMapping // TODO fill in other possible types -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_POLYMORPHIC_MAPPING_H diff --git a/src/include/darma/impl/index_range/range_1d.h b/src/include/darma/impl/index_range/range_1d.h index 0e10c098..c8914699 100644 --- a/src/include/darma/impl/index_range/range_1d.h +++ b/src/include/darma/impl/index_range/range_1d.h @@ -55,7 +55,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace indexing { @@ -198,6 +198,6 @@ using index_1d = detail::basic_integer_index_1d; } // end namespace indexing -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_INDEX_RANGE_RANGE_1D_H diff --git a/src/include/darma/impl/index_range/range_2d.h b/src/include/darma/impl/index_range/range_2d.h index 9a6734e9..a93921ac 100644 --- a/src/include/darma/impl/index_range/range_2d.h +++ b/src/include/darma/impl/index_range/range_2d.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { // TODO this could obviously be generalized substantially @@ -177,6 +177,6 @@ Range2DDenseMapping get_mapping_to_dense( return Range2DDenseMapping(); } -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_ARRAY_RANGE_2D_H diff --git a/src/include/darma/impl/make_key_functor.h b/src/include/darma/impl/make_key_functor.h index 2e7ca581..0b9c4f8a 100644 --- a/src/include/darma/impl/make_key_functor.h +++ b/src/include/darma/impl/make_key_functor.h @@ -53,7 +53,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { struct _make_key_functor { @@ -122,6 +122,6 @@ struct _make_key_functor { }; } // End namespace detail -} // End namespace darma_runtime +} // End namespace darma #endif diff --git a/src/include/darma/impl/meta/any_convertible.h b/src/include/darma/impl/meta/any_convertible.h index 72d62dd3..ffce0004 100644 --- a/src/include/darma/impl/meta/any_convertible.h +++ b/src/include/darma/impl/meta/any_convertible.h @@ -49,7 +49,7 @@ #include "is_callable.h" -namespace darma_runtime { +namespace darma { namespace meta { @@ -173,6 +173,6 @@ struct ambiguous_if_by_value { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_ANY_CONVERTIBLE_H diff --git a/src/include/darma/impl/meta/conditional_members.h b/src/include/darma/impl/meta/conditional_members.h index 6d0cd022..e48d1603 100644 --- a/src/include/darma/impl/meta/conditional_members.h +++ b/src/include/darma/impl/meta/conditional_members.h @@ -49,7 +49,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace meta { namespace impl { @@ -126,7 +126,7 @@ struct conditional_member_access { // this is an upcast, so we don't really need static_cast, but for // the sake of formality: return static_cast< - darma_runtime::meta::impl::with_conditional_member_entry_impl< + darma::meta::impl::with_conditional_member_entry_impl< Idx, typename ClassWithConditionalMembers::conditions_and_types_vector_t >& >(obj).value; @@ -138,7 +138,7 @@ struct conditional_member_access { // this is an upcast, so we don't really need static_cast, but for // the sake of formality: return static_cast< - darma_runtime::meta::impl::with_conditional_member_entry_impl< + darma::meta::impl::with_conditional_member_entry_impl< Idx, typename ClassWithConditionalMembers::conditions_and_types_vector_t > const& >(obj).value; @@ -235,6 +235,6 @@ struct has_conditional_member { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_IMPL_META_CONDITIONAL_MEMBERS_H diff --git a/src/include/darma/impl/meta/detection.h b/src/include/darma/impl/meta/detection.h index 3b6ccdba..9f35f8ec 100644 --- a/src/include/darma/impl/meta/detection.h +++ b/src/include/darma/impl/meta/detection.h @@ -53,7 +53,7 @@ #include "void_t.h" -namespace darma_runtime { +namespace darma { namespace meta { @@ -87,7 +87,7 @@ using is_detected_convertible = std::is_convertible using has_const_iterator_archetype = typename T::const_iterator; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_DETECTION_ARCHETYPES_H diff --git a/src/include/darma/impl/meta/has_op.h b/src/include/darma/impl/meta/has_op.h index be7d702a..94657808 100644 --- a/src/include/darma/impl/meta/has_op.h +++ b/src/include/darma/impl/meta/has_op.h @@ -49,7 +49,7 @@ #include "detection.h" -namespace darma_runtime { +namespace darma { namespace meta { namespace _impl { @@ -75,6 +75,6 @@ struct has_plus_equal } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_HAS_OP_H diff --git a/src/include/darma/impl/meta/is_callable.h b/src/include/darma/impl/meta/is_callable.h index 887d83cb..67aacb0c 100644 --- a/src/include/darma/impl/meta/is_callable.h +++ b/src/include/darma/impl/meta/is_callable.h @@ -47,7 +47,7 @@ #include "detection.h" -namespace darma_runtime { +namespace darma { namespace meta { //////////////////////////////////////////////////////////////////////////////// @@ -64,6 +64,6 @@ using is_callable_with_args = is_detected #include -namespace darma_runtime { +namespace darma { namespace meta { namespace detail { @@ -165,7 +165,7 @@ struct is_contiguous_iterator { }; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_IS_CONTIGUOUS_H diff --git a/src/include/darma/impl/meta/is_equality_comparable.h b/src/include/darma/impl/meta/is_equality_comparable.h index e4425c8d..85692302 100644 --- a/src/include/darma/impl/meta/is_equality_comparable.h +++ b/src/include/darma/impl/meta/is_equality_comparable.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -103,6 +103,6 @@ struct is_equality_comparable { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_IS_EQUALITY_COMPARABLE_H diff --git a/src/include/darma/impl/meta/is_iterable.h b/src/include/darma/impl/meta/is_iterable.h index 7896dd79..5251fe3f 100644 --- a/src/include/darma/impl/meta/is_iterable.h +++ b/src/include/darma/impl/meta/is_iterable.h @@ -52,7 +52,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace meta { template @@ -164,6 +164,6 @@ class iterable_traits { }; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_IS_ITERABLE_H diff --git a/src/include/darma/impl/meta/is_iterator.h b/src/include/darma/impl/meta/is_iterator.h index ce813bfb..9d105321 100644 --- a/src/include/darma/impl/meta/is_iterator.h +++ b/src/include/darma/impl/meta/is_iterator.h @@ -54,7 +54,7 @@ #include "is_equality_comparable.h" -namespace darma_runtime { +namespace darma { namespace meta { @@ -415,6 +415,6 @@ class iterator_traits { }; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_IS_ITERATOR_H diff --git a/src/include/darma/impl/meta/is_streamable.h b/src/include/darma/impl/meta/is_streamable.h index e867ecf2..e9fd6a13 100644 --- a/src/include/darma/impl/meta/is_streamable.h +++ b/src/include/darma/impl/meta/is_streamable.h @@ -51,7 +51,7 @@ #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -86,6 +86,6 @@ using is_in_streamable = is_detected< } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IS_STREAMABLE_H diff --git a/src/include/darma/impl/meta/make_flattened_tuple.h b/src/include/darma/impl/meta/make_flattened_tuple.h index ac921d14..4d8c9647 100644 --- a/src/include/darma/impl/meta/make_flattened_tuple.h +++ b/src/include/darma/impl/meta/make_flattened_tuple.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace meta { namespace detail { @@ -102,6 +102,6 @@ make_flattened_tuple( } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_MAKE_FLATTENED_TUPLE_H diff --git a/src/include/darma/impl/meta/member_detector.h b/src/include/darma/impl/meta/member_detector.h index 3b387f82..83024f17 100644 --- a/src/include/darma/impl/meta/member_detector.h +++ b/src/include/darma/impl/meta/member_detector.h @@ -50,7 +50,7 @@ //#include //#include // -//namespace darma_runtime { namespace meta { +//namespace darma { namespace meta { // //template //struct as_method; @@ -72,7 +72,7 @@ // }; //}; // -//}} // end namespace darma_runtime::meta +//}} // end namespace darma::meta // //// Wide swaths borrowed from: //// https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Member_Detector @@ -132,7 +132,7 @@ // private: \ // template < \ // typename U, \ -// typename darma_runtime::meta::as_method::template bind::type \ +// typename darma::meta::as_method::template bind::type \ // > struct Check; \ // template static char func(Check*); \ // template static int func(...); \ @@ -145,7 +145,7 @@ // private: \ // template < \ // typename U, \ -// typename darma_runtime::meta::as_method::template bind_const::type \ +// typename darma::meta::as_method::template bind_const::type \ // > struct Check; \ // template static char func(Check*); \ // template static int func(...); \ diff --git a/src/include/darma/impl/meta/parse_properties.h b/src/include/darma/impl/meta/parse_properties.h index cce2218b..3dfbe2f8 100644 --- a/src/include/darma/impl/meta/parse_properties.h +++ b/src/include/darma/impl/meta/parse_properties.h @@ -52,7 +52,7 @@ #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -156,6 +156,6 @@ struct property_parsing_checker { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_PARSE_PROPERTIES_H diff --git a/src/include/darma/impl/meta/sentinal_type.h b/src/include/darma/impl/meta/sentinal_type.h index 22e80c34..6b315330 100644 --- a/src/include/darma/impl/meta/sentinal_type.h +++ b/src/include/darma/impl/meta/sentinal_type.h @@ -45,7 +45,7 @@ #ifndef SRC_META_SENTINAL_TYPE_H_ #define SRC_META_SENTINAL_TYPE_H_ -namespace darma_runtime { namespace meta { +namespace darma { namespace meta { struct sentinal_type { constexpr sentinal_type() = default; diff --git a/src/include/darma/impl/meta/splat_tuple.h b/src/include/darma/impl/meta/splat_tuple.h index 179cdf7f..307015a6 100644 --- a/src/include/darma/impl/meta/splat_tuple.h +++ b/src/include/darma/impl/meta/splat_tuple.h @@ -52,7 +52,7 @@ #include #include -namespace darma_runtime { namespace meta { +namespace darma { namespace meta { // Attorney pattern for splatted callables template @@ -122,7 +122,7 @@ tuple_indices_for( return std::index_sequence_for{}; } -}} // end namespace darma_runtime::meta +}} // end namespace darma::meta diff --git a/src/include/darma/impl/meta/tagged_constant.h b/src/include/darma/impl/meta/tagged_constant.h index b2000f1d..f6d091f4 100644 --- a/src/include/darma/impl/meta/tagged_constant.h +++ b/src/include/darma/impl/meta/tagged_constant.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -83,22 +83,22 @@ std::size_t _get_tagged_constant_value() { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #define DARMA_CREATE_TAGGED_CONSTANT(constant, catagory) \ namespace detail { \ struct constant##_tag_t : catagory { \ static ::std::size_t value_in_catagory() { \ - return ::darma_runtime::meta::detail::_get_tagged_constant_value_for_catagory(); \ + return ::darma::meta::detail::_get_tagged_constant_value_for_catagory(); \ } \ static ::std::size_t value() { \ - return ::darma_runtime::meta::detail::_get_tagged_constant_value(); \ + return ::darma::meta::detail::_get_tagged_constant_value(); \ } \ }; \ } /* end namespace detail */ \ static constexpr detail::constant##_tag_t constant = { } #define DARMA_CREATE_TAGGED_CONSTANT_CATAGORY(catagory) \ - struct catagory : ::darma_runtime::meta::tagged_constant { } + struct catagory : ::darma::meta::tagged_constant { } #endif //DARMA_IMPL_META_TAGGED_CONSTANT_H diff --git a/src/include/darma/impl/meta/tuple_for_each.h b/src/include/darma/impl/meta/tuple_for_each.h index 5faa7e09..879d882c 100644 --- a/src/include/darma/impl/meta/tuple_for_each.h +++ b/src/include/darma/impl/meta/tuple_for_each.h @@ -73,7 +73,7 @@ #include "splat_tuple.h" #include "tuple_pop_back.h" -namespace darma_runtime { +namespace darma { namespace meta { namespace _tuple_for_each_impl { @@ -366,6 +366,6 @@ tuple_for_each_with_index( }; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif /* META_TUPLE_FOR_EACH_H_ */ diff --git a/src/include/darma/impl/meta/tuple_pop_back.h b/src/include/darma/impl/meta/tuple_pop_back.h index 2546a50f..4141e640 100644 --- a/src/include/darma/impl/meta/tuple_pop_back.h +++ b/src/include/darma/impl/meta/tuple_pop_back.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -77,7 +77,7 @@ tuple_pop_back(Tuple&& tup) { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_TUPLE_POP_BACK_H diff --git a/src/include/darma/impl/meta/tuple_zip.h b/src/include/darma/impl/meta/tuple_zip.h index 8c185f26..47dc64e4 100644 --- a/src/include/darma/impl/meta/tuple_zip.h +++ b/src/include/darma/impl/meta/tuple_zip.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace meta { @@ -92,7 +92,7 @@ auto tuple_zip(Tuples&&... tuples) { } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_META_TUPLE_ZIP_H_ diff --git a/src/include/darma/impl/meta/void_t.h b/src/include/darma/impl/meta/void_t.h index 6b73465c..d92e01cf 100644 --- a/src/include/darma/impl/meta/void_t.h +++ b/src/include/darma/impl/meta/void_t.h @@ -45,7 +45,7 @@ #ifndef FRONTEND_INCLUDE_DARMA_META_VOID_T_H_ #define FRONTEND_INCLUDE_DARMA_META_VOID_T_H_ -namespace darma_runtime { +namespace darma { namespace meta { @@ -63,7 +63,7 @@ using void_t = typename _void_t_impl::make_void::type; } // end namespace meta -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/impl/mpi/mpi_context.h b/src/include/darma/impl/mpi/mpi_context.h index ede8db7b..5983b0a5 100644 --- a/src/include/darma/impl/mpi/mpi_context.h +++ b/src/include/darma/impl/mpi/mpi_context.h @@ -67,7 +67,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -95,8 +95,8 @@ _persistent_collection_creation_impl { // Default key generator auto _make_key_impl() { - return darma_runtime::detail::key_traits< - darma_runtime::types::key_t + return darma::detail::key_traits< + darma::types::key_t >::make_awaiting_backend_assignment_key(); } @@ -121,7 +121,7 @@ _persistent_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto persistent_collection_token = darma_runtime::backend::register_persistent_collection( + auto persistent_collection_token = darma::backend::register_persistent_collection( context_token_, var_handle, index_range.size() @@ -154,7 +154,7 @@ _persistent_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto persistent_collection_token = darma_runtime::backend::register_persistent_collection( + auto persistent_collection_token = darma::backend::register_persistent_collection( context_token_, var_handle, size @@ -247,7 +247,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, index_range.size() @@ -283,7 +283,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, size @@ -333,7 +333,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, index_range.size() @@ -384,7 +384,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, size @@ -453,7 +453,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, index_range.size() @@ -516,7 +516,7 @@ _piecewise_acquired_collection_creation_impl { auto var_handle = std::make_shared>(key); // Register handle with the backend as part of a piecewise collection - auto collection_token = darma_runtime::backend::register_piecewise_collection( + auto collection_token = darma::backend::register_piecewise_collection( context_token_, var_handle, size @@ -575,14 +575,14 @@ class mpi_context { auto piecewise_acquired_collection(Args&&... args) const { - using namespace darma_runtime::detail; - using darma_runtime::keyword_tags_for_mpi_context::data; - using darma_runtime::keyword_tags_for_mpi_context::size; - using darma_runtime::keyword_tags_for_mpi_context::index; - using darma_runtime::keyword_tags_for_mpi_context::indices; - using darma_runtime::keyword_tags_for_create_concurrent_work::index_range; - using darma_runtime::keyword_tags_for_mpi_context::copy_callback; - using darma_runtime::keyword_tags_for_mpi_context::copy_back_callback; + using namespace darma::detail; + using darma::keyword_tags_for_mpi_context::data; + using darma::keyword_tags_for_mpi_context::size; + using darma::keyword_tags_for_mpi_context::index; + using darma::keyword_tags_for_mpi_context::indices; + using darma::keyword_tags_for_create_concurrent_work::index_range; + using darma::keyword_tags_for_mpi_context::copy_callback; + using darma::keyword_tags_for_mpi_context::copy_back_callback; using parser = kwarg_parser< variadic_positional_overload_description< @@ -646,9 +646,9 @@ class mpi_context { auto persistent_collection(Args&&... args) const { - using namespace darma_runtime::detail; - using darma_runtime::keyword_tags_for_mpi_context::size; - using darma_runtime::keyword_tags_for_create_concurrent_work::index_range; + using namespace darma::detail; + using darma::keyword_tags_for_mpi_context::size; + using darma::keyword_tags_for_create_concurrent_work::index_range; using parser = kwarg_parser< variadic_positional_overload_description< @@ -686,7 +686,7 @@ class mpi_context { types::runtime_context_token_t runtime_token_; }; -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(mpi_interop) diff --git a/src/include/darma/impl/mpi/persistent_collection.h b/src/include/darma/impl/mpi/persistent_collection.h index 2a76aea6..6a4a96f7 100644 --- a/src/include/darma/impl/mpi/persistent_collection.h +++ b/src/include/darma/impl/mpi/persistent_collection.h @@ -54,7 +54,7 @@ #include -namespace darma_runtime { +namespace darma { template< typename ValueType, @@ -106,8 +106,8 @@ class PersistentCollectionHandle { { // TODO: change flow relationships - using namespace darma_runtime::detail; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail; + using namespace darma::detail::flow_relationships; use_holder_ = detail::UseHolder< BasicCollectionManagingUse @@ -116,8 +116,8 @@ class PersistentCollectionHandle { std::forward(range_) ), var_handle_, - darma_runtime::frontend::Permissions::Modify, - darma_runtime::frontend::Permissions::None, + darma::frontend::Permissions::Modify, + darma::frontend::Permissions::None, initial_flow().as_collection_relationship(), null_flow().as_collection_relationship(), insignificant_flow().as_collection_relationship(), @@ -162,7 +162,7 @@ class PersistentCollectionHandle { }; -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(mpi_interop) diff --git a/src/include/darma/impl/mpi/piecewise_acquired_collection.h b/src/include/darma/impl/mpi/piecewise_acquired_collection.h index 995db206..d6f048fd 100644 --- a/src/include/darma/impl/mpi/piecewise_acquired_collection.h +++ b/src/include/darma/impl/mpi/piecewise_acquired_collection.h @@ -58,7 +58,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -92,7 +92,7 @@ _piecewise_collection_handle_impl { variadic_arguments_begin_tag, ValueType& data ) { - darma_runtime::backend::register_piecewise_collection_piece( + darma::backend::register_piecewise_collection_piece( context_token_, collection_token_, index, @@ -161,8 +161,8 @@ class PiecewiseCollectionHandle { { // TODO: change flow relationships - using namespace darma_runtime::detail; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail; + using namespace darma::detail::flow_relationships; use_holder_ = detail::UseHolder< BasicCollectionManagingUse @@ -171,8 +171,8 @@ class PiecewiseCollectionHandle { std::forward(range_) ), var_handle_, - darma_runtime::frontend::Permissions::Modify, - darma_runtime::frontend::Permissions::None, + darma::frontend::Permissions::Modify, + darma::frontend::Permissions::None, initial_imported_flow().as_collection_relationship(), null_flow().as_collection_relationship(), insignificant_flow().as_collection_relationship(), @@ -190,10 +190,10 @@ class PiecewiseCollectionHandle { void acquire_access(Args&&... args) const { - using namespace darma_runtime::detail; - using darma_runtime::keyword_tags_for_mpi_context::index; - using darma_runtime::keyword_tags_for_mpi_context::copy_callback; - using darma_runtime::keyword_tags_for_mpi_context::copy_back_callback; + using namespace darma::detail; + using darma::keyword_tags_for_mpi_context::index; + using darma::keyword_tags_for_mpi_context::copy_callback; + using darma::keyword_tags_for_mpi_context::copy_back_callback; using parser = kwarg_parser< variadic_positional_overload_description< @@ -245,7 +245,7 @@ class PiecewiseCollectionHandle { }; -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(mpi_interop) diff --git a/src/include/darma/impl/mpi/piecewise_acquired_collection_fwd.h b/src/include/darma/impl/mpi/piecewise_acquired_collection_fwd.h index 8fc0a7aa..84712fbd 100644 --- a/src/include/darma/impl/mpi/piecewise_acquired_collection_fwd.h +++ b/src/include/darma/impl/mpi/piecewise_acquired_collection_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_IMPL_PIECEWISE_ACQUIRED_COLLECTION_FWD_H #define DARMA_IMPL_PIECEWISE_ACQUIRED_COLLECTION_FWD_H -namespace darma_runtime { +namespace darma { template< typename ValueType, @@ -53,6 +53,6 @@ template< > class PiecewiseCollectionHandle; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_PIECEWISE_ACQUIRED_COLLECTION_FWD_H diff --git a/src/include/darma/impl/parallel_for.h b/src/include/darma/impl/parallel_for.h index 99378c78..4a5badbb 100644 --- a/src/include/darma/impl/parallel_for.h +++ b/src/include/darma/impl/parallel_for.h @@ -58,7 +58,7 @@ DeclareDarmaTypeTransparentKeyword(parallel_for, n_workers); -namespace darma_runtime { +namespace darma { namespace detail { @@ -155,7 +155,7 @@ struct _do_create_parallel_for< return parser() .with_default_generators( - darma_runtime::keyword_arguments_for_parallel_for::n_workers=[]{ return 1; } + darma::keyword_arguments_for_parallel_for::n_workers=[]{ return 1; } ) .parse_args(std::forward(args)...) .invoke([&]( @@ -214,7 +214,7 @@ struct _do_create_parallel_for< // For some reason, this doesn't work with zero variadics, so we can give it a // random one since they're ignored anyway .with_default_generators( - darma_runtime::keyword_arguments_for_parallel_for::n_workers=[]{ return 1; } + darma::keyword_arguments_for_parallel_for::n_workers=[]{ return 1; } ) .parse_args(std::forward(args)...) .invoke([&]( @@ -287,7 +287,7 @@ void create_parallel_for( ); } -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(create_parallel_for) diff --git a/src/include/darma/impl/publication_details.h b/src/include/darma/impl/publication_details.h index 78d4088e..11ad8d28 100644 --- a/src/include/darma/impl/publication_details.h +++ b/src/include/darma/impl/publication_details.h @@ -47,11 +47,11 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { class PublicationDetails - : public darma_runtime::abstract::frontend::PublicationDetails + : public darma::abstract::frontend::PublicationDetails { public: @@ -91,6 +91,6 @@ class PublicationDetails } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_PUBLICATION_DETAILS_H diff --git a/src/include/darma/impl/registration.h b/src/include/darma/impl/registration.h index 57b757d6..2c3917c1 100644 --- a/src/include/darma/impl/registration.h +++ b/src/include/darma/impl/registration.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace registration { template @@ -116,6 +116,6 @@ get_registration_index_for_stateless_callable(Callable&& callable) { } // end namespace registration -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_REGISTRATION_H diff --git a/src/include/darma/impl/serialization/manager.h b/src/include/darma/impl/serialization/manager.h index 58420fe4..c582cd9e 100644 --- a/src/include/darma/impl/serialization/manager.h +++ b/src/include/darma/impl/serialization/manager.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace serialization { namespace detail { @@ -114,7 +114,7 @@ class SerializationManagerForType ); // call the customization point, allow ADL darma_unpack( - darma_runtime::serialization::allocated_buffer_for(object_dest), ar + darma::serialization::allocated_buffer_for(object_dest), ar ); } @@ -155,6 +155,6 @@ class SerializationManagerForType } // end namespace detail } // end namespace serialization -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_SERIALIZATION_MANAGER_H diff --git a/src/include/darma/impl/spmd.h b/src/include/darma/impl/spmd.h index c19de088..312d3a86 100644 --- a/src/include/darma/impl/spmd.h +++ b/src/include/darma/impl/spmd.h @@ -55,8 +55,8 @@ // Whole file is deprecated -namespace darma_runtime { +namespace darma { -} // end namespace darma_runtime +} // end namespace darma #endif /* SPMD_H_ */ diff --git a/src/include/darma/impl/task/functor_task.h b/src/include/darma/impl/task/functor_task.h index 52202b71..01c484ce 100644 --- a/src/include/darma/impl/task/functor_task.h +++ b/src/include/darma/impl/task/functor_task.h @@ -64,7 +64,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { struct FunctorCaptureSetupHelper : protected CaptureSetupHelperBase { @@ -561,7 +561,7 @@ using functor_task_with_args_t = typename _impl::_functor_task_with_args_metafun } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_FUNCTOR_TASK_H diff --git a/src/include/darma/impl/task/functor_task_permissions.h b/src/include/darma/impl/task/functor_task_permissions.h index eea87667..ac19056f 100644 --- a/src/include/darma/impl/task/functor_task_permissions.h +++ b/src/include/darma/impl/task/functor_task_permissions.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { namespace impl { @@ -79,6 +79,6 @@ void required_permissions(Args&&... deferred_permissions_modifications) { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif // DARMAFRONTEND_PERMISSIONS_DOWNGRADES_H diff --git a/src/include/darma/impl/task/lambda_task.h b/src/include/darma/impl/task/lambda_task.h index 94638838..6b378b9f 100644 --- a/src/include/darma/impl/task/lambda_task.h +++ b/src/include/darma/impl/task/lambda_task.h @@ -50,7 +50,7 @@ #include "task_base.h" #include "task_ctor_helper.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -332,8 +332,8 @@ struct LambdaTask TaskCtorArgs&&... other_ctor_args ) : LambdaTask::LambdaTask( std::forward(callable_in), - static_cast( - darma_runtime::abstract::backend::get_backend_context()->get_running_task() + static_cast( + darma::abstract::backend::get_backend_context()->get_running_task() ), capture_manager, variadic_arguments_begin_tag{}, @@ -438,7 +438,7 @@ struct LambdaTask ar.add_to_size_raw(sizeof(Lambda)); - auto* running_task = static_cast( + auto* running_task = static_cast( abstract::backend::get_backend_context()->get_running_task() ); running_task->current_create_work_context = const_cast(this); @@ -465,7 +465,7 @@ struct LambdaTask void pack(PackingArchive& ar) const { ar.pack_data_raw(&this->callable_, &this->callable_ + 1); - auto* running_task = static_cast( + auto* running_task = static_cast( abstract::backend::get_backend_context()->get_running_task() ); running_task->current_create_work_context = const_cast(this); @@ -528,13 +528,13 @@ struct LambdaTask //============================================================================ - // {{{1 + // {{{1 void run() override { this->callable_(); } - // end darma_runtime::abstract::frontend::Task method implementations }}}1 + // end darma::abstract::frontend::Task method implementations }}}1 //============================================================================ @@ -542,6 +542,6 @@ struct LambdaTask }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_LAMBDA_TASK_H diff --git a/src/include/darma/impl/task/task.h b/src/include/darma/impl/task/task.h index 9f0d3122..96d56f56 100644 --- a/src/include/darma/impl/task/task.h +++ b/src/include/darma/impl/task/task.h @@ -42,8 +42,8 @@ //@HEADER */ -#ifndef DARMA_RUNTIME_TASK_H_ -#define DARMA_RUNTIME_TASK_H_ +#ifndef darma_TASK_H_ +#define darma_TASK_H_ #include #include @@ -88,7 +88,7 @@ #include -namespace darma_runtime { +namespace darma { // implementation of abstract::frontend::unpack_task // (for backwards compatibility; should usually just use PolymorphicSerializableObject directly) @@ -107,10 +107,10 @@ unpack_task(void const* packed_data) { } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma #include -#endif /* DARMA_RUNTIME_TASK_H_ */ +#endif /* darma_TASK_H_ */ diff --git a/src/include/darma/impl/task/task_base.h b/src/include/darma/impl/task/task_base.h index 862c8402..af8a903b 100644 --- a/src/include/darma/impl/task/task_base.h +++ b/src/include/darma/impl/task/task_base.h @@ -94,7 +94,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { class CaptureManager { @@ -179,7 +179,7 @@ class TaskBase using key_t = types::key_t; - key_t name_ = darma_runtime::make_key(); + key_t name_ = darma::make_key(); public: @@ -490,7 +490,7 @@ class TaskBase #if _darma_has_feature(create_parallel_for_custom_cpu_set) void set_resource_pack( - darma_runtime::types::resource_pack_t const& cpuset + darma::types::resource_pack_t const& cpuset ) override { assert(runnable_); @@ -616,18 +616,18 @@ namespace frontend { inline std::unique_ptr make_empty_running_task() { - return std::make_unique(); + return std::make_unique(); } } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma // //////////////////////////////////////////////////////////////////////////////// -namespace darma_runtime { +namespace darma { namespace detail { // Convenience methods (must be here because TaskBase must be a complete type) @@ -636,20 +636,20 @@ inline TaskBase* get_running_task_impl( abstract::backend::Context* rt ) { - return darma_runtime::utility::safe_static_cast( + return darma::utility::safe_static_cast( rt->get_running_task() ); } inline TaskBase* get_running_task_impl() { - return darma_runtime::detail::get_running_task_impl( + return darma::detail::get_running_task_impl( abstract::backend::get_backend_context() ); } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_TASK_BASE_H diff --git a/src/include/darma/impl/task/task_ctor_helper.h b/src/include/darma/impl/task/task_ctor_helper.h index d79db372..ea8cee33 100644 --- a/src/include/darma/impl/task/task_ctor_helper.h +++ b/src/include/darma/impl/task/task_ctor_helper.h @@ -47,7 +47,7 @@ #include "task_base.h" -namespace darma_runtime { +namespace darma { namespace detail { struct CaptureSetupHelperBase { @@ -99,6 +99,6 @@ struct CaptureSetupHelperBase { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_TASK_CTOR_HELPER_H diff --git a/src/include/darma/impl/task/task_do_capture.impl.h b/src/include/darma/impl/task/task_do_capture.impl.h index 67b3a329..508bf68c 100644 --- a/src/include/darma/impl/task/task_do_capture.impl.h +++ b/src/include/darma/impl/task/task_do_capture.impl.h @@ -56,7 +56,7 @@ #include "darma/impl/use.h" #include "darma/impl/capture.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -124,12 +124,12 @@ TaskBase::do_capture( } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #include -namespace darma_runtime { +namespace darma { namespace detail { template < @@ -141,10 +141,10 @@ TaskBase::TaskBase( setup_create_work_argument_parser() .parse_args(std::forward(args)...) .invoke([&]( - darma_runtime::types::key_t name_key, + darma::types::key_t name_key, auto&& allow_aliasing_desc, bool data_parallel, - darma_runtime::detail::variadic_arguments_begin_tag, + darma::detail::variadic_arguments_begin_tag, auto&&... deferred_permissions_modifications ) { this->allowed_aliasing = std::forward(allow_aliasing_desc); @@ -160,6 +160,6 @@ TaskBase::TaskBase( } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_TASK_CAPTURE_IMPL_H_H diff --git a/src/include/darma/impl/task/task_fwd.h b/src/include/darma/impl/task/task_fwd.h index 2c6f142c..5b9f754a 100644 --- a/src/include/darma/impl/task/task_fwd.h +++ b/src/include/darma/impl/task/task_fwd.h @@ -45,7 +45,7 @@ #ifndef SRC_TASK_FWD_H_ #define SRC_TASK_FWD_H_ -namespace darma_runtime { +namespace darma { namespace detail { @@ -62,7 +62,7 @@ struct FunctorTask; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/impl/task_collection/access_handle_collection.h b/src/include/darma/impl/task_collection/access_handle_collection.h index c066a866..3ec341a5 100644 --- a/src/include/darma/impl/task_collection/access_handle_collection.h +++ b/src/include/darma/impl/task_collection/access_handle_collection.h @@ -82,7 +82,7 @@ #endif // _darma_has_feature(mpi_interop) -namespace darma_runtime { +namespace darma { //============================================================================== // @@ -125,7 +125,7 @@ class AccessHandleCollection auto mapped_with(MappingT&& mapping) const { return detail::MappedHandleCollection< - darma_runtime::AccessHandleCollection> key; this->var_handle_base_ = std::make_shared< - ::darma_runtime::detail::VariableHandle + ::darma::detail::VariableHandle >(key); auto use_base = serialization::PolymorphicSerializableObject @@ -639,8 +639,8 @@ struct AccessHandleCollectionAccess >; - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; auto use_holder = detail::UseHolder< BasicCollectionManagingUse @@ -649,8 +649,8 @@ struct AccessHandleCollectionAccess(range) ), var_handle, - darma_runtime::frontend::Permissions::Modify, - darma_runtime::frontend::Permissions::None, + darma::frontend::Permissions::Modify, + darma::frontend::Permissions::None, initial_flow().as_collection_relationship(), null_flow().as_collection_relationship(), insignificant_flow().as_collection_relationship(), @@ -701,8 +701,8 @@ struct AccessHandleCollectionAccess auto initial_access_collection(Args&&... args) { - using namespace darma_runtime::detail; - using darma_runtime::keyword_tags_for_create_concurrent_work::index_range; + using namespace darma::detail; + using darma::keyword_tags_for_create_concurrent_work::index_range; using parser = kwarg_parser< variadic_positional_overload_description< _keyword @@ -765,9 +765,9 @@ using CommutativeAccessHandleCollectionWithTraits = CommutativeAccessHandleColle namespace serialization { template -struct Serializer> { +struct Serializer> { - using access_handle_collection_t = darma_runtime::AccessHandleCollection< + using access_handle_collection_t = darma::AccessHandleCollection< T, IndexRangeT, Traits >; @@ -814,7 +814,7 @@ struct Serializer> std::enable_if_t< not is_packable_with_archive::value or not is_packable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { // Packing flows uses pointer references, so we need to convert to an archive @@ -829,7 +829,7 @@ struct Serializer> std::enable_if_t< is_packable_with_archive::value and is_packable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { ar | ahc.var_handle_base_->get_key(); @@ -848,7 +848,7 @@ struct Serializer> std::enable_if_t< not is_unpackable_with_archive::value or not is_unpackable_with_archive::value, - darma_runtime::utility::_not_a_type + darma::utility::_not_a_type > = { } ) { @@ -878,7 +878,7 @@ struct Serializer> // end serialization for AccessHandleCollection (currently disabled code) }}}1 //============================================================================== -} // end namespace darma_runtime +} // end namespace darma #include diff --git a/src/include/darma/impl/task_collection/access_handle_collection_capture_description.h b/src/include/darma/impl/task_collection/access_handle_collection_capture_description.h index f3aaefa8..7c63c169 100644 --- a/src/include/darma/impl/task_collection/access_handle_collection_capture_description.h +++ b/src/include/darma/impl/task_collection/access_handle_collection_capture_description.h @@ -50,7 +50,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -148,7 +148,7 @@ AccessHandleCollection::get_capture_description( } -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_ACCESS_HANDLE_COLLECTION_CAPTURE_DESCRIPTION_H diff --git a/src/include/darma/impl/task_collection/access_handle_collection_traits.h b/src/include/darma/impl/task_collection/access_handle_collection_traits.h index bd13169b..34e64781 100644 --- a/src/include/darma/impl/task_collection/access_handle_collection_traits.h +++ b/src/include/darma/impl/task_collection/access_handle_collection_traits.h @@ -50,7 +50,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -213,7 +213,7 @@ namespace advanced { namespace access_handle_collection_traits { template -using permissions_traits = ::darma_runtime::advanced +using permissions_traits = ::darma::advanced ::access_handle_traits::permissions_traits; namespace internal { @@ -237,6 +237,6 @@ struct is_mapped } // end namespace advanced -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_ACCESS_HANDLE_COLLECTION_TRAITS_H diff --git a/src/include/darma/impl/task_collection/create_concurrent_work.h b/src/include/darma/impl/task_collection/create_concurrent_work.h index 1e516b12..eaf384e9 100644 --- a/src/include/darma/impl/task_collection/create_concurrent_work.h +++ b/src/include/darma/impl/task_collection/create_concurrent_work.h @@ -50,13 +50,13 @@ #if _darma_has_feature(create_concurrent_work) #include -namespace darma_runtime { +namespace darma { template void create_concurrent_work(Args&&... args) { - using namespace darma_runtime::detail; - using darma_runtime::keyword_tags_for_create_concurrent_work::index_range; - using darma_runtime::keyword_tags_for_task_creation::name; + using namespace darma::detail; + using darma::keyword_tags_for_create_concurrent_work::index_range; + using darma::keyword_tags_for_task_creation::name; using parser = kwarg_parser< variadic_positional_overload_description< _keyword, @@ -70,18 +70,18 @@ void create_concurrent_work(Args&&... args) { parser() .with_default_generators( - keyword_arguments_for_task_creation::name=[]{ return darma_runtime::make_key(); } + keyword_arguments_for_task_creation::name=[]{ return darma::make_key(); } ) .with_converters( [](auto&&... key_parts) { - return darma_runtime::make_key(std::forward(key_parts)...); + return darma::make_key(std::forward(key_parts)...); } ) .parse_args(std::forward(args)...) .invoke([]( auto&& index_range, types::key_t name_key, - darma_runtime::detail::variadic_arguments_begin_tag, + darma::detail::variadic_arguments_begin_tag, auto&&... my_args ){ using task_collection_impl_t = typename detail::make_task_collection_impl_t< @@ -104,7 +104,7 @@ void create_concurrent_work(Args&&... args) { } -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(create_concurrent_work) #endif //DARMA_IMPL_TASK_COLLECTION_CREATE_CONCURRENT_WORK_H diff --git a/src/include/darma/impl/task_collection/impl/argument_to_tc_storage.h b/src/include/darma/impl/task_collection/impl/argument_to_tc_storage.h index b8ccf911..33c00a22 100644 --- a/src/include/darma/impl/task_collection/impl/argument_to_tc_storage.h +++ b/src/include/darma/impl/task_collection/impl/argument_to_tc_storage.h @@ -62,7 +62,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { namespace _task_collection_impl { @@ -441,7 +441,7 @@ struct _get_storage_arg_helper< auto rv = return_type( handle_collection_t( arg.collection.var_handle_base_, - darma_runtime::detail::make_captured_use_holder( + darma::detail::make_captured_use_holder( arg.collection.var_handle_base_, /* Requested Scheduling permissions: */ required_scheduling_permissions, @@ -650,7 +650,7 @@ struct _get_storage_arg_helper< auto rv = return_type( handle_collection_t( arg.var_handle_.get_smart_ptr(), - darma_runtime::detail::make_captured_use_holder( + darma::detail::make_captured_use_holder( arg.var_handle_base_, /* Requested Scheduling permissions: */ frontend::Permissions::Modify, @@ -680,6 +680,6 @@ struct _get_storage_arg_helper< } // end namespace _task_collection_impl } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_IMPL_ARGUMENT_TO_TC_STORAGE_H diff --git a/src/include/darma/impl/task_collection/impl/task_storage_to_param.h b/src/include/darma/impl/task_collection/impl/task_storage_to_param.h index dc26749b..a93b82cc 100644 --- a/src/include/darma/impl/task_collection/impl/task_storage_to_param.h +++ b/src/include/darma/impl/task_collection/impl/task_storage_to_param.h @@ -53,7 +53,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { namespace _task_collection_impl { @@ -237,6 +237,6 @@ struct _get_call_arg_helper #include -namespace darma_runtime { +namespace darma { namespace detail { namespace _task_collection_impl { @@ -173,7 +173,7 @@ struct _get_task_stored_arg_helper< ) const { // We still need to create a new use for the task itself... - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; auto new_use_holder = BasicAccessHandle::use_holder_t::create( arg.var_handle_base_, @@ -306,6 +306,6 @@ struct _get_task_stored_arg_helper< } // end namespace _task_collection_impl } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_IMPL_TC_STORAGE_TO_TASK_STORAGE_H diff --git a/src/include/darma/impl/task_collection/indexed_access_handle.h b/src/include/darma/impl/task_collection/indexed_access_handle.h index 49949864..d99f26b8 100644 --- a/src/include/darma/impl/task_collection/indexed_access_handle.h +++ b/src/include/darma/impl/task_collection/indexed_access_handle.h @@ -67,7 +67,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { //============================================================================== @@ -169,7 +169,7 @@ class IndexedAccessHandle { // TODO allocator support - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword @@ -180,13 +180,13 @@ class IndexedAccessHandle { return parser() .with_converters( [](auto&&... parts) { - return darma_runtime::make_key(std::forward(parts)...); + return darma::make_key(std::forward(parts)...); } ) .with_default_generators( keyword_arguments_for_publication::version=[]{ // Defaults to empty key, **not** backend defined!!! - return darma_runtime::make_key(); + return darma::make_key(); } ) .parse_args(std::forward(args)...) @@ -194,8 +194,8 @@ class IndexedAccessHandle { types::key_t&& version_key ) -> decltype(auto) { - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; auto* backend_runtime = abstract::backend::get_backend_runtime(); @@ -265,7 +265,7 @@ class IndexedAccessHandle { > auto commutative_access() && { - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; // TODO make_indexed_?_flow use_holder_ = std::make_shared( HandleUse( @@ -304,7 +304,7 @@ class IndexedAccessHandle { template friend - class darma_runtime::AccessHandleCollection; + class darma::AccessHandleCollection; // end friends }}}2 //------------------------------------------------------------------------------ @@ -315,6 +315,6 @@ class IndexedAccessHandle { //============================================================================== } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_INDEXED_ACCESS_HANDLE_H diff --git a/src/include/darma/impl/task_collection/mapped_handle_collection.h b/src/include/darma/impl/task_collection/mapped_handle_collection.h index 3dd84b38..e11f81a9 100644 --- a/src/include/darma/impl/task_collection/mapped_handle_collection.h +++ b/src/include/darma/impl/task_collection/mapped_handle_collection.h @@ -57,7 +57,7 @@ #include // HandleUse, CollectionManagingUse -namespace darma_runtime { +namespace darma { namespace detail { //============================================================================== @@ -158,6 +158,6 @@ struct UnmappedHandleCollection { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_MAPPED_HANDLE_COLLECTION_H diff --git a/src/include/darma/impl/task_collection/task_collection.h b/src/include/darma/impl/task_collection/task_collection.h index d6c2d4a0..7429796f 100644 --- a/src/include/darma/impl/task_collection/task_collection.h +++ b/src/include/darma/impl/task_collection/task_collection.h @@ -63,7 +63,7 @@ #include "impl/argument_to_tc_storage.h" #include "impl/tc_storage_to_task_storage.h" -namespace darma_runtime { +namespace darma { namespace detail { @@ -367,7 +367,7 @@ struct make_task_collection_impl_t { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(create_concurrent_work) #endif //DARMA_IMPL_TASK_COLLECTION_TASK_COLLECTION_H diff --git a/src/include/darma/impl/task_collection/task_collection_fwd.h b/src/include/darma/impl/task_collection/task_collection_fwd.h index e3fb7e99..21b7a188 100644 --- a/src/include/darma/impl/task_collection/task_collection_fwd.h +++ b/src/include/darma/impl/task_collection/task_collection_fwd.h @@ -51,7 +51,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { typedef enum HandleCollectiveLabel @@ -106,6 +106,6 @@ template class AccessHandleCollection; -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TASK_COLLECTION_TASK_COLLECTION_FWD_H diff --git a/src/include/darma/impl/task_collection/task_collection_task.h b/src/include/darma/impl/task_collection/task_collection_task.h index f52bd7b1..7a8aa45f 100644 --- a/src/include/darma/impl/task_collection/task_collection_task.h +++ b/src/include/darma/impl/task_collection/task_collection_task.h @@ -52,7 +52,7 @@ #include "impl/tc_storage_to_task_storage.h" #include "impl/task_storage_to_param.h" -namespace darma_runtime { +namespace darma { template < typename IndexOrIndexRange @@ -144,7 +144,7 @@ struct ConcurrentContext { #if _darma_has_feature(simple_collectives) template void allreduce(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< @@ -313,6 +313,6 @@ struct TaskCollectionTaskImpl } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_TASK_COLLECTION_TASK_H diff --git a/src/include/darma/impl/top_level.h b/src/include/darma/impl/top_level.h index 0c3f0788..eec48042 100644 --- a/src/include/darma/impl/top_level.h +++ b/src/include/darma/impl/top_level.h @@ -59,7 +59,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -98,10 +98,10 @@ struct TopLevelCallableRegistrar { #define DARMA_REGISTER_TOP_LEVEL_FUNCTOR(...) \ static const auto _darma__top_level_task_registration \ - = ::darma_runtime::detail::_impl::TopLevelCallableRegistrar<__VA_ARGS__>(); + = ::darma::detail::_impl::TopLevelCallableRegistrar<__VA_ARGS__>(); #define DARMA_REGISTER_TOP_LEVEL_FUNCTION(...) \ static const auto _darma__top_level_task_registration \ - = ::darma_runtime::detail::_impl::TopLevelCallableRegistrar(&(__VA_ARGS__)); + = ::darma::detail::_impl::TopLevelCallableRegistrar(&(__VA_ARGS__)); struct TopLevelTaskImpl @@ -141,26 +141,26 @@ namespace frontend { inline -std::unique_ptr> +std::unique_ptr> darma_top_level_setup(int& argc, char**& argv) { std::vector cl_args; cl_args.reserve(argc); for(int i = 0; i < argc; ++i) cl_args.emplace_back(argv[i]); - auto tlt = std::make_unique(); + auto tlt = std::make_unique(); tlt->set_command_line_arguments(std::move(cl_args)); return { std::move(tlt) }; } inline -std::unique_ptr> +std::unique_ptr> darma_top_level_setup(std::vector&& args) { - auto tlt = std::make_unique(); + auto tlt = std::make_unique(); tlt->set_command_line_arguments(std::move(args)); return { std::move(tlt) }; } } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_TOP_LEVEL_H diff --git a/src/include/darma/impl/use.h b/src/include/darma/impl/use.h index 01cb87ae..eccf915b 100644 --- a/src/include/darma/impl/use.h +++ b/src/include/darma/impl/use.h @@ -61,7 +61,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -185,6 +185,6 @@ class HandleUse } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_USE_H diff --git a/src/include/darma/impl/use/flow_relationship.h b/src/include/darma/impl/use/flow_relationship.h index 66e4ae9e..b11a5e7b 100644 --- a/src/include/darma/impl/use/flow_relationship.h +++ b/src/include/darma/impl/use/flow_relationship.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { //============================================================================== @@ -439,6 +439,6 @@ next_anti_flow_of_anti_in() { } // end namespace flow_relationships } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_FLOW_RELATIONSHIP_H diff --git a/src/include/darma/impl/use/use_holder.h b/src/include/darma/impl/use/use_holder.h index 95370aa5..ed0cfdba 100644 --- a/src/include/darma/impl/use/use_holder.h +++ b/src/include/darma/impl/use/use_holder.h @@ -49,7 +49,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { class UseHolderBase { @@ -167,11 +167,11 @@ class UseHolder : public UseHolderBase { abstract::backend::get_backend_runtime()->release_use(use_.get()); } else if(collection_token != nullptr) { - darma_runtime::backend::release_persistent_collection(context, collection_token); + darma::backend::release_persistent_collection(context, collection_token); } else { assert(piecewise_token != nullptr); - darma_runtime::backend::release_piecewise_collection(context, piecewise_token); + darma::backend::release_piecewise_collection(context, piecewise_token); } use_.reset(); } @@ -243,6 +243,6 @@ typename UseHolder::private_ctor_tag_t const UseHolder::private_ctor_tag; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_USE_PTR_H diff --git a/src/include/darma/impl/use_collection.h b/src/include/darma/impl/use_collection.h index f9831ca7..6dc5dc22 100644 --- a/src/include/darma/impl/use_collection.h +++ b/src/include/darma/impl/use_collection.h @@ -56,7 +56,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -269,7 +269,7 @@ class MappedUseCollection final /* final for now, at least */ using mapping_t = Mapping; mapping_t mapping_fe_handle_to_be_task_; - using mapping_traits_t = darma_runtime::indexing::mapping_traits; + using mapping_traits_t = darma::indexing::mapping_traits; using base_t = serialization::PolymorphicSerializationAdapter< MappedUseCollection, BasicUseCollection @@ -601,6 +601,6 @@ class BasicCollectionManagingUse final /* final for now, at least */ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_USE_COLLECTION_H diff --git a/src/include/darma/impl/use_fwd.h b/src/include/darma/impl/use_fwd.h index b99337b4..148564e9 100644 --- a/src/include/darma/impl/use_fwd.h +++ b/src/include/darma/impl/use_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_IMPL_USE_FWD_H #define DARMA_IMPL_USE_FWD_H -namespace darma_runtime { +namespace darma { namespace detail { @@ -58,6 +58,6 @@ class UseHolder; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_USE_FWD_H diff --git a/src/include/darma/impl/util.h b/src/include/darma/impl/util.h index 967be755..56977bdd 100644 --- a/src/include/darma/impl/util.h +++ b/src/include/darma/impl/util.h @@ -67,7 +67,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -268,7 +268,7 @@ class ArgParser { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma // Add a hash of std::pair and std::tuple namespace std { @@ -279,7 +279,7 @@ struct hash> { size_t operator()(const std::pair& val) const { size_t rv = std::hash()(val.first); - ::darma_runtime::detail::hash_combine(rv, val.second); + ::darma::detail::hash_combine(rv, val.second); return rv; } }; @@ -290,7 +290,7 @@ namespace _tup_hash_impl { inline size_t operator()(const std::tuple& tup) const { size_t rv = _tup_hash_impl()(tup); - ::darma_runtime::detail::hash_combine(rv, std::get(tup)); + ::darma::detail::hash_combine(rv, std::get(tup)); return rv; } }; diff --git a/src/include/darma/impl/util/backtrace.h b/src/include/darma/impl/util/backtrace.h index c663e012..86641242 100644 --- a/src/include/darma/impl/util/backtrace.h +++ b/src/include/darma/impl/util/backtrace.h @@ -53,14 +53,14 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { // TODO implement this } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(backtrace) diff --git a/src/include/darma/impl/util/managing_ptr.h b/src/include/darma/impl/util/managing_ptr.h index 2ec79e05..d3442ef6 100644 --- a/src/include/darma/impl/util/managing_ptr.h +++ b/src/include/darma/impl/util/managing_ptr.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { // TODO unit tests for managing_ptr @@ -313,6 +313,6 @@ class managing_ptr { }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_UTIL_MANAGING_PTR_H diff --git a/src/include/darma/impl/util/optional.h b/src/include/darma/impl/util/optional.h index 95b1c9c3..4a87882e 100644 --- a/src/include/darma/impl/util/optional.h +++ b/src/include/darma/impl/util/optional.h @@ -49,7 +49,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { using nullopt_t = std::experimental::nullopt_t; @@ -79,6 +79,6 @@ optional make_optional( std::initializer_list il, Args&&... args ) { static constexpr auto in_place = std::experimental::in_place; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_UTIL_OPTIONAL_H diff --git a/src/include/darma/impl/util/smart_pointers.h b/src/include/darma/impl/util/smart_pointers.h index 833e2d08..bed88f9d 100644 --- a/src/include/darma/impl/util/smart_pointers.h +++ b/src/include/darma/impl/util/smart_pointers.h @@ -49,7 +49,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -127,6 +127,6 @@ make_unique(Args&&... args) { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_UTIL_SMART_POINTERS_H diff --git a/src/include/darma/interface/app/access_handle.h b/src/include/darma/interface/app/access_handle.h index 4bf87d80..a5236c63 100644 --- a/src/include/darma/interface/app/access_handle.h +++ b/src/include/darma/interface/app/access_handle.h @@ -70,7 +70,7 @@ #include #include -namespace darma_runtime { +namespace darma { // todo move this to a more appropriate place @@ -575,7 +575,7 @@ class AccessHandle "begin_commutative_usage called on use without scheduling modify permissions" ); - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; // Need to make next flow to be the output of the commutative usage auto old_out_flow = current_use_->use->out_flow_; @@ -626,7 +626,7 @@ class AccessHandle "end_commutative_usage called on use without being in Commutative coherence mode" ); - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::detail::flow_relationships; set_is_commutative_dynamic(false); @@ -827,7 +827,7 @@ class AccessHandle // bool register_continuation_use = true // ) override { // set_current_use( -// darma_runtime::detail::make_captured_use_holder( +// darma::detail::make_captured_use_holder( // var_handle_base_, // req_sched, req_immed, // get_current_use(), @@ -1055,7 +1055,7 @@ class AccessHandle // Allow implicit conversion to value in the invocation of the task friend struct meta::splat_tuple_access; - friend struct darma_runtime::serialization::Serializer; + friend struct darma::serialization::Serializer; template friend struct detail::_initial_access_key_helper; @@ -1116,7 +1116,7 @@ using AccessHandleWithTraits = AccessHandle >; -} // end namespace darma_runtime +} // end namespace darma #include diff --git a/src/include/darma/interface/app/acquire_access.h b/src/include/darma/interface/app/acquire_access.h index 0779c2a4..58981c56 100644 --- a/src/include/darma/interface/app/acquire_access.h +++ b/src/include/darma/interface/app/acquire_access.h @@ -51,7 +51,7 @@ #include -namespace darma_runtime { +namespace darma { namespace experimental { template @@ -60,7 +60,7 @@ acquire_access( T* unmanaged_data_ptr, Args&&... args ) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< variadic_positional_overload_description<> >; @@ -73,9 +73,9 @@ acquire_access( auto&&... key_expr_parts ) { auto key = sizeof...(key_expr_parts) == 0 ? - darma_runtime::types::key_t( - darma_runtime::types::key_t::request_backend_assigned_key_tag{} - ) : darma_runtime::make_key( + darma::types::key_t( + darma::types::key_t::request_backend_assigned_key_tag{} + ) : darma::make_key( std::forward(key_expr_parts)... ); auto var_h = std::make_shared>(key); @@ -135,7 +135,7 @@ acquire_access( }; } // end namespace experimental -} // end namespace darma_runtime +} // end namespace darma #endif // darma_has_feature(unmanaged_data) diff --git a/src/include/darma/interface/app/backend_hint.h b/src/include/darma/interface/app/backend_hint.h index 87e0f4e6..d3118aea 100644 --- a/src/include/darma/interface/app/backend_hint.h +++ b/src/include/darma/interface/app/backend_hint.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_APP_BACKEND_HINT_H #define DARMA_INTERFACE_APP_BACKEND_HINT_H -namespace darma_runtime { namespace experimental { namespace backend_hint { +namespace darma { namespace experimental { namespace backend_hint { enum TaskHintIdentifier { // a task that groups together CCWs CCWGroupingTask = 2993421, diff --git a/src/include/darma/interface/app/containers.h b/src/include/darma/interface/app/containers.h index 58bfb0fa..530de0d0 100644 --- a/src/include/darma/interface/app/containers.h +++ b/src/include/darma/interface/app/containers.h @@ -51,11 +51,11 @@ //#include //#include // -//namespace darma_runtime { +//namespace darma { // //template > //using vector = std::vector +// ::darma::serialization::darma_allocator //>; // //template > //> //using map = std::map, OtherAllocator // > //>; @@ -75,7 +75,7 @@ // class OtherAllocator=std::allocator //> //using unordered_set = std::unordered_set //>; @@ -88,7 +88,7 @@ // class OtherAllocator=std::allocator> //> //using unordered_map = std::unordered_map, OtherAllocator // > //>; diff --git a/src/include/darma/interface/app/create_work.h b/src/include/darma/interface/app/create_work.h index 398d955c..c8e4e461 100644 --- a/src/include/darma/interface/app/create_work.h +++ b/src/include/darma/interface/app/create_work.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -66,7 +66,7 @@ template < void create_work(Args&&... args); #endif -} // end namespace darma_runtime +} // end namespace darma #include @@ -75,8 +75,8 @@ void create_work(Args&&... args); //#define create_work \ // auto DARMA_CONCAT_TOKEN_(_DARMA__started_, __LINE__) = \ -// ::darma_runtime::detail::_start_create_work(); \ -// ::darma_runtime::detail::_do_create_work( \ +// ::darma::detail::_start_create_work(); \ +// ::darma::detail::_do_create_work( \ // std::move(DARMA_CONCAT_TOKEN_(_DARMA__started_, __LINE__)) \ // ).operator() diff --git a/src/include/darma/interface/app/create_work_if.h b/src/include/darma/interface/app/create_work_if.h index cca8f30f..2618e0d4 100644 --- a/src/include/darma/interface/app/create_work_if.h +++ b/src/include/darma/interface/app/create_work_if.h @@ -55,7 +55,7 @@ #include -namespace darma_runtime { +namespace darma { template < typename Functor @@ -84,7 +84,7 @@ create_work_if( ); } -} // end namespace darma_runtime +} // end namespace darma #include diff --git a/src/include/darma/interface/app/create_work_while.h b/src/include/darma/interface/app/create_work_while.h index 9a6026ce..63d12367 100644 --- a/src/include/darma/interface/app/create_work_while.h +++ b/src/include/darma/interface/app/create_work_while.h @@ -55,7 +55,7 @@ #include -namespace darma_runtime { +namespace darma { template < typename Functor @@ -84,7 +84,7 @@ create_work_while ); } -} // end namespace darma_runtime +} // end namespace darma #include diff --git a/src/include/darma/interface/app/darma_region.h b/src/include/darma/interface/app/darma_region.h index daec03f6..4fdfd99b 100644 --- a/src/include/darma/interface/app/darma_region.h +++ b/src/include/darma/interface/app/darma_region.h @@ -53,7 +53,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace experimental { namespace _impl { @@ -62,9 +62,9 @@ template auto& _get_default_instance_token_ptr() { static auto _rv = std::make_unique< - darma_runtime::types::runtime_instance_token_t + darma::types::runtime_instance_token_t >( - darma_runtime::backend::initialize_runtime_instance() + darma::backend::initialize_runtime_instance() ); return _rv; } @@ -140,7 +140,7 @@ darma_finalize() { } } // end namespace experimental -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(darma_regions) diff --git a/src/include/darma/interface/app/data_structures/vector.h b/src/include/darma/interface/app/data_structures/vector.h index 12342e02..bd9527cd 100644 --- a/src/include/darma/interface/app/data_structures/vector.h +++ b/src/include/darma/interface/app/data_structures/vector.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_APP_DATA_STRUCTURES_VECTOR_H #define DARMA_INTERFACE_APP_DATA_STRUCTURES_VECTOR_H -namespace darma_runtime { +namespace darma { namespace data_structures { @@ -53,6 +53,6 @@ namespace data_structures { } // end namespace data_structures -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_APP_DATA_STRUCTURES_VECTOR_H diff --git a/src/include/darma/interface/app/initial_access.h b/src/include/darma/interface/app/initial_access.h index 6227659c..2cc4f1f4 100644 --- a/src/include/darma/interface/app/initial_access.h +++ b/src/include/darma/interface/app/initial_access.h @@ -54,7 +54,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -62,13 +62,13 @@ template struct _initial_access_key_helper { decltype(auto) - _impl(darma_runtime::types::key_t const& key) const { + _impl(darma::types::key_t const& key) const { auto* backend_runtime = abstract::backend::get_backend_runtime(); auto var_h = detail::make_shared>(key); - using namespace darma_runtime::abstract::frontend; - using namespace darma_runtime::detail::flow_relationships; + using namespace darma::abstract::frontend; + using namespace darma::detail::flow_relationships; auto use_holder = UseHolder::create( var_h, @@ -98,7 +98,7 @@ struct _initial_access_key_helper { template decltype(auto) operator()(variadic_arguments_begin_tag, Arg&& arg, Args&&... args) { - types::key_t key = darma_runtime::make_key( + types::key_t key = darma::make_key( std::forward(arg), std::forward(args)... ); @@ -108,8 +108,8 @@ struct _initial_access_key_helper { decltype(auto) operator()(variadic_arguments_begin_tag) { // call default ctor to make a backend-awaiting key - types::key_t key = darma_runtime::detail::key_traits< - darma_runtime::types::key_t + types::key_t key = darma::detail::key_traits< + darma::types::key_t >::make_awaiting_backend_assignment_key(); return this->_impl(key); } @@ -126,7 +126,7 @@ auto initial_access( KeyExprParts&&... parts ) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< variadic_positional_overload_description<> >; @@ -137,7 +137,7 @@ initial_access( .invoke(detail::_initial_access_key_helper{}); } -} // end namespace darma_runtime +} // end namespace darma #endif /* SRC_INCLUDE_DARMA_INTERFACE_APP_INITIAL_ACCESS_H_ */ diff --git a/src/include/darma/interface/app/keyword_arguments/allow_aliasing.h b/src/include/darma/interface/app/keyword_arguments/allow_aliasing.h index b17e830c..d38d1705 100644 --- a/src/include/darma/interface/app/keyword_arguments/allow_aliasing.h +++ b/src/include/darma/interface/app/keyword_arguments/allow_aliasing.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(task_creation, allow_aliasing); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_create_work { AliasDarmaKeyword(task_creation, allow_aliasing); } // end namespace keyword_arguments_for_create_work @@ -62,7 +62,7 @@ namespace darma_runtime { namespace keyword_arguments_for_create_work_while { AliasDarmaKeyword(task_creation, allow_aliasing); } // end namespace keyword_arguments_for_create_work_while -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(task_creation, allow_aliasing); diff --git a/src/include/darma/interface/app/keyword_arguments/copy_back_callback.h b/src/include/darma/interface/app/keyword_arguments/copy_back_callback.h index e47ad7f8..25cc6c06 100644 --- a/src/include/darma/interface/app/keyword_arguments/copy_back_callback.h +++ b/src/include/darma/interface/app/keyword_arguments/copy_back_callback.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, copy_back_callback); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, copy_back_callback); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, copy_back_callback); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, copy_back_callback); diff --git a/src/include/darma/interface/app/keyword_arguments/copy_callback.h b/src/include/darma/interface/app/keyword_arguments/copy_callback.h index ad7abf35..a79519b4 100644 --- a/src/include/darma/interface/app/keyword_arguments/copy_callback.h +++ b/src/include/darma/interface/app/keyword_arguments/copy_callback.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, copy_callback); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, copy_callback); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, copy_callback); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, copy_callback); diff --git a/src/include/darma/interface/app/keyword_arguments/data.h b/src/include/darma/interface/app/keyword_arguments/data.h index c0047ea8..5a84d154 100644 --- a/src/include/darma/interface/app/keyword_arguments/data.h +++ b/src/include/darma/interface/app/keyword_arguments/data.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, data); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, data); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, data); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, data); diff --git a/src/include/darma/interface/app/keyword_arguments/in_out.h b/src/include/darma/interface/app/keyword_arguments/in_out.h index de9caf2f..be6c0ca8 100644 --- a/src/include/darma/interface/app/keyword_arguments/in_out.h +++ b/src/include/darma/interface/app/keyword_arguments/in_out.h @@ -49,11 +49,11 @@ DeclareDarmaTypeTransparentKeyword(collectives, in_out); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, in_out); } // end namespace keyword_arguments_for_allreduce -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, in_out); diff --git a/src/include/darma/interface/app/keyword_arguments/index.h b/src/include/darma/interface/app/keyword_arguments/index.h index 32372b01..ad638e42 100644 --- a/src/include/darma/interface/app/keyword_arguments/index.h +++ b/src/include/darma/interface/app/keyword_arguments/index.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, index); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, index); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, index); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, index); diff --git a/src/include/darma/interface/app/keyword_arguments/index_range.h b/src/include/darma/interface/app/keyword_arguments/index_range.h index 07312322..08de8915 100644 --- a/src/include/darma/interface/app/keyword_arguments/index_range.h +++ b/src/include/darma/interface/app/keyword_arguments/index_range.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(create_concurrent_work, index_range); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_access_handle_collection { AliasDarmaKeyword(create_concurrent_work, index_range); } // end namespace keyword_arguments_for_access_handle_collection @@ -58,7 +58,7 @@ namespace darma_runtime { AliasDarmaKeyword(create_concurrent_work, index_range); } // end namespace keyword_arguments_for_mpi_context -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(create_concurrent_work, index_range); diff --git a/src/include/darma/interface/app/keyword_arguments/indices.h b/src/include/darma/interface/app/keyword_arguments/indices.h index 1c7df657..6e67f80f 100644 --- a/src/include/darma/interface/app/keyword_arguments/indices.h +++ b/src/include/darma/interface/app/keyword_arguments/indices.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, indices); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, indices); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, indices); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, indices); diff --git a/src/include/darma/interface/app/keyword_arguments/input.h b/src/include/darma/interface/app/keyword_arguments/input.h index 1e36f496..fe685dbd 100644 --- a/src/include/darma/interface/app/keyword_arguments/input.h +++ b/src/include/darma/interface/app/keyword_arguments/input.h @@ -49,11 +49,11 @@ DeclareDarmaTypeTransparentKeyword(collectives, input); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, input); } // end namespace keyword_arguments_for_allreduce -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, input); diff --git a/src/include/darma/interface/app/keyword_arguments/is_parallel.h b/src/include/darma/interface/app/keyword_arguments/is_parallel.h index 4c8bab35..fe9fa4d6 100644 --- a/src/include/darma/interface/app/keyword_arguments/is_parallel.h +++ b/src/include/darma/interface/app/keyword_arguments/is_parallel.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(task_creation, is_parallel); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_create_work { AliasDarmaKeyword(task_creation, is_parallel); } // end namespace keyword_arguments_for_create_work @@ -62,7 +62,7 @@ namespace darma_runtime { namespace keyword_arguments_for_create_work_while { AliasDarmaKeyword(task_creation, is_parallel); } // end namespace keyword_arguments_for_create_work_while -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(task_creation, is_parallel); diff --git a/src/include/darma/interface/app/keyword_arguments/n_pieces.h b/src/include/darma/interface/app/keyword_arguments/n_pieces.h index a04d297c..1ec671ac 100644 --- a/src/include/darma/interface/app/keyword_arguments/n_pieces.h +++ b/src/include/darma/interface/app/keyword_arguments/n_pieces.h @@ -51,11 +51,11 @@ DeclareDarmaTypeTransparentKeyword(collectives, n_pieces); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, n_pieces); } // end namespace keyword_arguments_for_allreduce -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, n_pieces); diff --git a/src/include/darma/interface/app/keyword_arguments/name.h b/src/include/darma/interface/app/keyword_arguments/name.h index 0a714cde..44cc3ca7 100644 --- a/src/include/darma/interface/app/keyword_arguments/name.h +++ b/src/include/darma/interface/app/keyword_arguments/name.h @@ -51,7 +51,7 @@ DeclareDarmaTypeTransparentKeyword(task_creation, name); DeclareStandardDarmaKeywordArgumentAliases(task_creation, name); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_create_work { AliasDarmaKeyword(task_creation, name); @@ -61,6 +61,6 @@ namespace keyword_arguments_for_create_concurrent_work { AliasDarmaKeyword(task_creation, name); } // end namespace keyword_arguments_for_create_work -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_APP_KEYWORD_ARGUMENTS_NAME_H diff --git a/src/include/darma/interface/app/keyword_arguments/output.h b/src/include/darma/interface/app/keyword_arguments/output.h index e2732335..87710003 100644 --- a/src/include/darma/interface/app/keyword_arguments/output.h +++ b/src/include/darma/interface/app/keyword_arguments/output.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(collectives, output); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, output); } // end namespace keyword_arguments_for_allreduce @@ -59,7 +59,7 @@ namespace darma_runtime { namespace keyword_arguments_for_access_handle_collection { AliasDarmaKeyword(collectives, output); } // end namespace keyword_arguments_for_access_handle_collection -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, output); diff --git a/src/include/darma/interface/app/keyword_arguments/piece.h b/src/include/darma/interface/app/keyword_arguments/piece.h index 1d48c767..127e7bd5 100644 --- a/src/include/darma/interface/app/keyword_arguments/piece.h +++ b/src/include/darma/interface/app/keyword_arguments/piece.h @@ -51,11 +51,11 @@ DeclareDarmaTypeTransparentKeyword(collectives, piece); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, piece); } // end namespace keyword_arguments_for_allreduce -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, piece); diff --git a/src/include/darma/interface/app/keyword_arguments/size.h b/src/include/darma/interface/app/keyword_arguments/size.h index 2a857dd6..32ee8438 100644 --- a/src/include/darma/interface/app/keyword_arguments/size.h +++ b/src/include/darma/interface/app/keyword_arguments/size.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(mpi_context, size); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_acquire_access { AliasDarmaKeyword(mpi_context, size); } // end namespace keyword_arguments_for_acquire_access @@ -61,7 +61,7 @@ namespace darma_runtime { namespace keyword_arguments_for_piecewise_handle { AliasDarmaKeyword(mpi_context, size); } // end namespace keyword_arguments_for_piecewise_handle -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(mpi_context, size); diff --git a/src/include/darma/interface/app/keyword_arguments/tag.h b/src/include/darma/interface/app/keyword_arguments/tag.h index 2ea256b0..896a9079 100644 --- a/src/include/darma/interface/app/keyword_arguments/tag.h +++ b/src/include/darma/interface/app/keyword_arguments/tag.h @@ -49,7 +49,7 @@ DeclareDarmaTypeTransparentKeyword(collectives, tag); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_allreduce { AliasDarmaKeyword(collectives, tag); } // end namespace keyword_arguments_for_allreduce @@ -59,7 +59,7 @@ namespace darma_runtime { namespace keyword_arguments_for_access_handle_collection { AliasDarmaKeyword(collectives, tag); } // end namespace keyword_arguments_for_access_handle_collection -} // end namespace darma_runtime +} // end namespace darma DeclareStandardDarmaKeywordArgumentAliases(collectives, tag); diff --git a/src/include/darma/interface/app/keyword_arguments/version.h b/src/include/darma/interface/app/keyword_arguments/version.h index cffc42e5..055c9e2d 100644 --- a/src/include/darma/interface/app/keyword_arguments/version.h +++ b/src/include/darma/interface/app/keyword_arguments/version.h @@ -51,7 +51,7 @@ DeclareDarmaTypeTransparentKeyword(publication, version); DeclareStandardDarmaKeywordArgumentAliases(publication, version); -namespace darma_runtime { +namespace darma { namespace keyword_arguments_for_read_access { AliasDarmaKeyword(publication, version); @@ -65,7 +65,7 @@ namespace keyword_arguments_for_access_handle_publish { AliasDarmaKeyword(publication, version); } // end namespace keyword_arguments_for_read_access -} // end namespace darma_runtime +} // end namespace darma // TODO deprecate these diff --git a/src/include/darma/interface/app/oo.h b/src/include/darma/interface/app/oo.h index 12728fb4..1823f5ba 100644 --- a/src/include/darma/interface/app/oo.h +++ b/src/include/darma/interface/app/oo.h @@ -49,7 +49,7 @@ #if _darma_has_feature(oo_interface) -namespace darma_runtime { +namespace darma { namespace oo { template @@ -91,7 +91,7 @@ template using modifies_values_ = modifies_value_; } // end namespace oo -} // end namespace darma_runtime +} // end namespace darma #include #include diff --git a/src/include/darma/interface/app/permissions_downgrades.h b/src/include/darma/interface/app/permissions_downgrades.h index 1f82d5bf..68eea88e 100644 --- a/src/include/darma/interface/app/permissions_downgrades.h +++ b/src/include/darma/interface/app/permissions_downgrades.h @@ -45,8 +45,8 @@ #ifndef DARMAFRONTEND_INTERFACE_APP_PERMISSIONS_DOWNGRADES_H #define DARMAFRONTEND_INTERFACE_APP_PERMISSIONS_DOWNGRADES_H -namespace darma_runtime { +namespace darma { -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_INTERFACE_APP_PERMISSIONS_DOWNGRADES_H diff --git a/src/include/darma/interface/app/read_access.h b/src/include/darma/interface/app/read_access.h index 2d6d2019..aca0039a 100644 --- a/src/include/darma/interface/app/read_access.h +++ b/src/include/darma/interface/app/read_access.h @@ -57,7 +57,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -67,17 +67,17 @@ struct _read_access_helper { decltype(auto) operator()( types::key_t const& version_key, - darma_runtime::detail::variadic_arguments_begin_tag, + darma::detail::variadic_arguments_begin_tag, Args&&... args ) const { - auto backend_runtime = darma_runtime::abstract::backend::get_backend_runtime(); - auto key = darma_runtime::make_key(std::forward(args)...); - auto var_h = darma_runtime::detail::make_shared< - darma_runtime::detail::VariableHandle + auto backend_runtime = darma::abstract::backend::get_backend_runtime(); + auto key = darma::make_key(std::forward(args)...); + auto var_h = darma::detail::make_shared< + darma::detail::VariableHandle >(key); - using namespace darma_runtime::detail::flow_relationships; - using namespace darma_runtime::abstract::frontend; + using namespace darma::detail::flow_relationships; + using namespace darma::abstract::frontend; auto use_holder = std::make_shared( detail::HandleUse( @@ -107,7 +107,7 @@ struct _read_access_helper { ); use_holder->could_be_alias = true; - return darma_runtime::ReadAccessHandle( + return darma::ReadAccessHandle( var_h, std::move(use_holder) ); @@ -127,7 +127,7 @@ auto read_access( KeyExprParts&&... parts ) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< variadic_positional_overload_description< _optional_keyword @@ -138,7 +138,7 @@ read_access( return parser() .with_converters( [](auto&&... parts) { - return darma_runtime::make_key(std::forward(parts)...); + return darma::make_key(std::forward(parts)...); } ) .with_default_generators( @@ -148,7 +148,7 @@ read_access( .invoke(detail::_read_access_helper{}); } -} // end namespace darma_runtime +} // end namespace darma #endif // _darma_has_feature(arbitrary_publish_fetch) #endif // OLD CODE diff --git a/src/include/darma/interface/app/resource_count.h b/src/include/darma/interface/app/resource_count.h index 172f27a3..ea7bbb63 100644 --- a/src/include/darma/interface/app/resource_count.h +++ b/src/include/darma/interface/app/resource_count.h @@ -52,7 +52,7 @@ #include -namespace darma_runtime { +namespace darma { // Constants... namespace constants_for_resource_count { @@ -77,9 +77,9 @@ static constexpr auto HardwareThreads = HardwareThread; } // end namespace constants_for_resource_count -} // end namespace darma_runtime +} // end namespace darma -namespace darma_runtime { +namespace darma { namespace detail { @@ -199,13 +199,13 @@ auto resource_count_impl( template auto resource_count(Args&&... args) { using _check_kwargs_asserting_t = typename detail::only_allowed_kwargs_given< - darma_runtime::keyword_tags_for_resource_count::depth, - darma_runtime::keyword_tags_for_resource_count::per + darma::keyword_tags_for_resource_count::depth, + darma::keyword_tags_for_resource_count::per >::template static_assert_correct::type; return detail::resource_count_impl(std::forward(args)...); } -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_APP_RESOURCE_COUNT_H diff --git a/src/include/darma/interface/app/vector_view.h b/src/include/darma/interface/app/vector_view.h index 938d25c8..5a0a4cd4 100644 --- a/src/include/darma/interface/app/vector_view.h +++ b/src/include/darma/interface/app/vector_view.h @@ -52,7 +52,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -255,15 +255,15 @@ class vector_view } // end namespace darma -namespace darma_runtime { +namespace darma { namespace serialization { template -struct Serializer<::darma_runtime::vector_view> { +struct Serializer<::darma::vector_view> { private: - using view_t = ::darma_runtime::vector_view; + using view_t = ::darma::vector_view; public: @@ -285,6 +285,6 @@ struct Serializer<::darma_runtime::vector_view> { } // end namespace serialization -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_APP_VECTOR_VIEW_H diff --git a/src/include/darma/interface/backend/backend_fwd.h b/src/include/darma/interface/backend/backend_fwd.h index ca80cee4..bffa3214 100644 --- a/src/include/darma/interface/backend/backend_fwd.h +++ b/src/include/darma/interface/backend/backend_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_BACKEND_FWD_H #define DARMA_INTERFACE_BACKEND_FWD_H -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -61,6 +61,6 @@ class TaskCollectionContextHandle; } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_FWD_H diff --git a/src/include/darma/interface/backend/darma_region.h b/src/include/darma/interface/backend/darma_region.h index 4224f55e..aa9331e5 100644 --- a/src/include/darma/interface/backend/darma_region.h +++ b/src/include/darma/interface/backend/darma_region.h @@ -49,7 +49,7 @@ #include -namespace darma_runtime { +namespace darma { namespace backend { #if _darma_has_feature(darma_regions) @@ -98,6 +98,6 @@ with_active_runtime_instance( #endif // _darma_has_feature(darma_regions) } // end namespace backend -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_INTERFACE_BACKEND_DARMA_REGIONS_H diff --git a/src/include/darma/interface/backend/flow.h b/src/include/darma/interface/backend/flow.h index 719b34a8..2b213940 100644 --- a/src/include/darma/interface/backend/flow.h +++ b/src/include/darma/interface/backend/flow.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_BACKEND_FLOW_H #define DARMA_INTERFACE_BACKEND_FLOW_H -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -153,6 +153,6 @@ class Flow { }; } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_FLOW_H diff --git a/src/include/darma/interface/backend/legacy_runtime.h b/src/include/darma/interface/backend/legacy_runtime.h index 6f3ad820..662bed28 100644 --- a/src/include/darma/interface/backend/legacy_runtime.h +++ b/src/include/darma/interface/backend/legacy_runtime.h @@ -49,7 +49,7 @@ #include "runtime.h" -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -293,7 +293,7 @@ class LegacyFlowsFromMethodsRuntime : public Runtime { virtual void register_use(frontend::UsePendingRegistration* use) override { - using namespace darma_runtime::abstract::frontend; + using namespace darma::abstract::frontend; types::flow_t in_flow; auto const& in_rel = use->get_in_flow_relationship(); @@ -498,6 +498,6 @@ class LegacyFlowsFromMethodsRuntime : public Runtime { } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_LEGACY_RUNTIME_H diff --git a/src/include/darma/interface/backend/mpi_interop.h b/src/include/darma/interface/backend/mpi_interop.h index c8f215d0..25e65689 100644 --- a/src/include/darma/interface/backend/mpi_interop.h +++ b/src/include/darma/interface/backend/mpi_interop.h @@ -51,7 +51,7 @@ #include -namespace darma_runtime { +namespace darma { namespace backend { @@ -92,7 +92,7 @@ run_distributed_region( } // end namespace backend -} // end namespace darma_runtime +} // end namespace darma #endif diff --git a/src/include/darma/interface/backend/mpi_interop_fwd.h b/src/include/darma/interface/backend/mpi_interop_fwd.h index 4835805a..a4923aef 100644 --- a/src/include/darma/interface/backend/mpi_interop_fwd.h +++ b/src/include/darma/interface/backend/mpi_interop_fwd.h @@ -53,17 +53,17 @@ #include -namespace darma_runtime { +namespace darma { namespace backend { types::runtime_context_token_t -create_runtime_context(darma_runtime::types::MPI_Comm); +create_runtime_context(darma::types::MPI_Comm); types::piecewise_collection_token_t register_piecewise_collection( types::runtime_context_token_t, - std::shared_ptr, + std::shared_ptr, size_t ); @@ -76,7 +76,7 @@ release_piecewise_collection( types::persistent_collection_token_t register_persistent_collection( types::runtime_context_token_t, - std::shared_ptr, + std::shared_ptr, size_t ); @@ -106,7 +106,7 @@ run_distributed_region_worker(types::runtime_context_token_t); } // end namespace backend -} // end namespace darma_runtime +} // end namespace darma #endif diff --git a/src/include/darma/interface/backend/parallel_for.h b/src/include/darma/interface/backend/parallel_for.h index 3268006e..b27ce169 100644 --- a/src/include/darma/interface/backend/parallel_for.h +++ b/src/include/darma/interface/backend/parallel_for.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_BACKEND_PARALLEL_FOR_H #define DARMA_INTERFACE_BACKEND_PARALLEL_FOR_H -namespace darma_runtime { +namespace darma { namespace backend { @@ -70,6 +70,6 @@ void execute_parallel_for( } // end namespace backend -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_PARALLEL_FOR_H diff --git a/src/include/darma/interface/backend/region_context_handle.h b/src/include/darma/interface/backend/region_context_handle.h index 9b20c181..e2a95c43 100644 --- a/src/include/darma/interface/backend/region_context_handle.h +++ b/src/include/darma/interface/backend/region_context_handle.h @@ -51,7 +51,7 @@ // TODO delete this file -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -62,6 +62,6 @@ struct TaskCollectionContextHandle { } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_REGION_CONTEXT_HANDLE_H diff --git a/src/include/darma/interface/backend/runtime.h b/src/include/darma/interface/backend/runtime.h index 9106724e..97a093a0 100644 --- a/src/include/darma/interface/backend/runtime.h +++ b/src/include/darma/interface/backend/runtime.h @@ -63,7 +63,7 @@ #include "backend_fwd.h" -namespace darma_runtime { +namespace darma { namespace abstract { @@ -84,8 +84,8 @@ class Runtime { using destructible_use_t = frontend::DestructibleUse; using use_pending_release_t = frontend::UsePendingRelease; using use_collection_t = abstract::frontend::UseCollection; - using pub_details_t = darma_runtime::abstract::frontend::PublicationDetails; - using collective_details_t = darma_runtime::abstract::frontend::CollectiveDetails; + using pub_details_t = darma::abstract::frontend::PublicationDetails; + using collective_details_t = darma::abstract::frontend::CollectiveDetails; using memory_details_t = abstract::frontend::MemoryRequirementDetails; using task_collection_t = abstract::frontend::TaskCollection; using task_collection_unique_ptr = std::unique_ptr; @@ -480,15 +480,15 @@ typedef Runtime runtime_t; } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma /** @brief Calls the application-provided darma_main() and then deletes the * backend runtime before returning. * * Invokes darma_main() via a call to the function pointer returned by - * darma_runtime::detail::_darma__generate_main_function_ptr<>(). After - * returning from darma_main(), the darma_runtime::detail::backend_runtime + * darma::detail::_darma__generate_main_function_ptr<>(). After + * returning from darma_main(), the darma::detail::backend_runtime * pointer must be deleted. It is a debug-mode error for darma_main() to * return without having invoked Runtime::finalize() if * darma_backend_initialize() was also called. @@ -500,12 +500,12 @@ void backend_santioned_exit(int const); #include -namespace darma_runtime { +namespace darma { void abort( std::string const& abort_str = std::string{} ); -} // end darma_runtime +} // end darma #include diff --git a/src/include/darma/interface/backend/serialization_policy.h b/src/include/darma/interface/backend/serialization_policy.h index 20199922..e8871235 100644 --- a/src/include/darma/interface/backend/serialization_policy.h +++ b/src/include/darma/interface/backend/serialization_policy.h @@ -50,7 +50,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -123,6 +123,6 @@ struct SerializationPolicy { } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_BACKEND_SERIALIZATION_POLICY_H diff --git a/src/include/darma/interface/backend/types.h b/src/include/darma/interface/backend/types.h index 25e1a065..baa4d309 100644 --- a/src/include/darma/interface/backend/types.h +++ b/src/include/darma/interface/backend/types.h @@ -51,7 +51,7 @@ #include -namespace darma_runtime { +namespace darma { // Key utility functions // TODO these should be somewhere else... @@ -59,15 +59,15 @@ namespace darma_runtime { template inline types::key_t make_key(Args&&... args) { - return darma_runtime::detail::key_traits::maker()(std::forward(args)...); + return darma::detail::key_traits::maker()(std::forward(args)...); } //template //inline types::key_t //make_key_from_tuple(TupleType&& tup) { -// return darma_runtime::detail::key_traits::maker_from_tuple()(std::forward(tup)); +// return darma::detail::key_traits::maker_from_tuple()(std::forward(tup)); //} -} // end namespace darma_runtime +} // end namespace darma #endif /* SRC_ABSTRACT_BACKEND_TYPES_H_ */ diff --git a/src/include/darma/interface/defaults/darma_main.h b/src/include/darma/interface/defaults/darma_main.h index 272fac97..0f9c43b8 100644 --- a/src/include/darma/interface/defaults/darma_main.h +++ b/src/include/darma/interface/defaults/darma_main.h @@ -50,7 +50,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -71,13 +71,13 @@ register_user_main(T main_fxn) { } } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #define darma_main(...) \ _darma__ignore_this = 42; \ int _darma__user_main(__VA_ARGS__); \ int _darma__ignore_this_too = \ - ::darma_runtime::detail::register_user_main((int(*)(__VA_ARGS__))_darma__user_main); \ + ::darma::detail::register_user_main((int(*)(__VA_ARGS__))_darma__user_main); \ int _darma__user_main(__VA_ARGS__) diff --git a/src/include/darma/interface/defaults/key.h b/src/include/darma/interface/defaults/key.h index 0e7efcba..9c02d763 100644 --- a/src/include/darma/interface/defaults/key.h +++ b/src/include/darma/interface/defaults/key.h @@ -55,7 +55,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace stream_key { @@ -100,15 +100,15 @@ struct StreamKey { public: - StreamKey() : StreamKey(darma_runtime::detail::variadic_constructor_arg) { } + StreamKey() : StreamKey(darma::detail::variadic_constructor_arg) { } template explicit StreamKey( - const darma_runtime::detail::variadic_constructor_arg_t, + const darma::detail::variadic_constructor_arg_t, Types&&... data ) { std::stringstream sstr; - darma_runtime::meta::tuple_for_each(std::make_tuple(data...), [&sstr](const auto& val) { + darma::meta::tuple_for_each(std::make_tuple(data...), [&sstr](const auto& val) { sstr << val << std::endl; }); val_ = sstr.str(); @@ -120,7 +120,7 @@ struct StreamKey { std::tuple&& data ) { std::stringstream sstr; - darma_runtime::meta::tuple_for_each(data, [&sstr](const auto& val) { + darma::meta::tuple_for_each(data, [&sstr](const auto& val) { sstr << val << std::endl; }); val_ = sstr.str(); @@ -194,14 +194,14 @@ inline std::ostream& operator<<(std::ostream& o, StreamKey const& k) { namespace detail { template <> -struct key_traits +struct key_traits { struct maker { constexpr maker() = default; template - inline darma_runtime::stream_key::StreamKey + inline darma::stream_key::StreamKey operator()(Args&&... args) const { - return darma_runtime::stream_key::StreamKey( + return darma::stream_key::StreamKey( detail::variadic_constructor_arg, std::forward(args)... ); @@ -211,49 +211,49 @@ struct key_traits struct maker_from_tuple { constexpr maker_from_tuple() = default; template - inline darma_runtime::stream_key::StreamKey + inline darma::stream_key::StreamKey operator()(std::tuple&& data) const { - return darma_runtime::stream_key::StreamKey( + return darma::stream_key::StreamKey( std::forward>(data) ); } }; - typedef darma_runtime::stream_key::key_hash hasher; - typedef darma_runtime::stream_key::key_equal key_equal; + typedef darma::stream_key::key_hash hasher; + typedef darma::stream_key::key_equal key_equal; }; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma namespace std { template<> -struct hash { +struct hash { size_t - operator()(const darma_runtime::stream_key::StreamKey& a) const { - return darma_runtime::stream_key::key_hash()(a); + operator()(const darma::stream_key::StreamKey& a) const { + return darma::stream_key::key_hash()(a); } }; } // end namespace std -DARMA_STATIC_ASSERT_VALID_KEY_TYPE(darma_runtime::stream_key::StreamKey); +DARMA_STATIC_ASSERT_VALID_KEY_TYPE(darma::stream_key::StreamKey); -namespace darma_runtime { +namespace darma { namespace defaults { -typedef darma_runtime::stream_key::StreamKey Key; +typedef darma::stream_key::StreamKey Key; } // end namespace defaults -} // end namespace darma_runtime +} // end namespace darma -namespace darma_runtime { namespace types { - typedef darma_runtime::defaults::Key key_t; -}} // end namespace darma_runtime::types +namespace darma { namespace types { + typedef darma::defaults::Key key_t; +}} // end namespace darma::types #endif /* DARMA_STREAM_KEY_H_ */ diff --git a/src/include/darma/interface/defaults/pointers.h b/src/include/darma/interface/defaults/pointers.h index 44a8d610..2d404647 100644 --- a/src/include/darma/interface/defaults/pointers.h +++ b/src/include/darma/interface/defaults/pointers.h @@ -2,10 +2,10 @@ #include -namespace darma_runtime { namespace types { +namespace darma { namespace types { template using shared_ptr_template = std::shared_ptr; template using unique_ptr_template = std::unique_ptr; -}} // end namespace darma_runtime::types +}} // end namespace darma::types diff --git a/src/include/darma/interface/frontend/array_concept_manager.h b/src/include/darma/interface/frontend/array_concept_manager.h index 8fa7daa0..4493306f 100644 --- a/src/include/darma/interface/frontend/array_concept_manager.h +++ b/src/include/darma/interface/frontend/array_concept_manager.h @@ -50,7 +50,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -147,6 +147,6 @@ class ArrayConceptManager { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_ARRAY_CONCEPT_MANAGER_H diff --git a/src/include/darma/interface/frontend/array_movement_manager.h b/src/include/darma/interface/frontend/array_movement_manager.h index cce0591e..752ae341 100644 --- a/src/include/darma/interface/frontend/array_movement_manager.h +++ b/src/include/darma/interface/frontend/array_movement_manager.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -173,7 +173,7 @@ class ArrayMovementManager { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_ARRAY_MOVEMENT_MANAGER_H diff --git a/src/include/darma/interface/frontend/collective_details.h b/src/include/darma/interface/frontend/collective_details.h index 0d5efc97..27613c8e 100644 --- a/src/include/darma/interface/frontend/collective_details.h +++ b/src/include/darma/interface/frontend/collective_details.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -81,7 +81,7 @@ class CollectiveDetails { reduce_operation() const =0; #if _darma_has_feature(task_collection_token) - virtual darma_runtime::types::task_collection_token_t const& + virtual darma::types::task_collection_token_t const& get_task_collection_token() const =0; #endif // _darma_has_feature(task_collection_token) @@ -90,6 +90,6 @@ class CollectiveDetails { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_COLLECTIVE_DETAILS_H diff --git a/src/include/darma/interface/frontend/detail/task.crtp_impl.h b/src/include/darma/interface/frontend/detail/task.crtp_impl.h index baa3398d..6f99057d 100644 --- a/src/include/darma/interface/frontend/detail/task.crtp_impl.h +++ b/src/include/darma/interface/frontend/detail/task.crtp_impl.h @@ -52,12 +52,12 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_TASK_CRTP_IMPL_H diff --git a/src/include/darma/interface/frontend/element_range.h b/src/include/darma/interface/frontend/element_range.h index e2e3ac06..0399a94c 100644 --- a/src/include/darma/interface/frontend/element_range.h +++ b/src/include/darma/interface/frontend/element_range.h @@ -52,7 +52,7 @@ #include "serialization_manager.h" #include "array_concept_manager.h" -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -97,6 +97,6 @@ class ElementRange { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_ELEMENT_RANGE_H diff --git a/src/include/darma/interface/frontend/flow_relationship.h b/src/include/darma/interface/frontend/flow_relationship.h index d199894c..778addc3 100644 --- a/src/include/darma/interface/frontend/flow_relationship.h +++ b/src/include/darma/interface/frontend/flow_relationship.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -150,6 +150,6 @@ class FlowRelationship { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_FLOW_RELATIONSHIP_H diff --git a/src/include/darma/interface/frontend/frontend_fwd.h b/src/include/darma/interface/frontend/frontend_fwd.h index a8dfc975..d6aebe7e 100644 --- a/src/include/darma/interface/frontend/frontend_fwd.h +++ b/src/include/darma/interface/frontend/frontend_fwd.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_FRONTEND_FWD_H #define DARMA_INTERFACE_FRONTEND_FWD_H -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -83,6 +83,6 @@ class UniquelyOwnedUse; } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_FWD_H diff --git a/src/include/darma/interface/frontend/handle.h b/src/include/darma/interface/frontend/handle.h index 22d43a0a..a74be53e 100644 --- a/src/include/darma/interface/frontend/handle.h +++ b/src/include/darma/interface/frontend/handle.h @@ -50,7 +50,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -140,6 +140,6 @@ class Handle { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_HANDLE_H diff --git a/src/include/darma/interface/frontend/index_range.h b/src/include/darma/interface/frontend/index_range.h index 99626787..65caf2c5 100644 --- a/src/include/darma/interface/frontend/index_range.h +++ b/src/include/darma/interface/frontend/index_range.h @@ -49,7 +49,7 @@ #include // size_t -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -73,6 +73,6 @@ class IndexRange } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_INDEX_RANGE_H diff --git a/src/include/darma/interface/frontend/memory_requirement_details.h b/src/include/darma/interface/frontend/memory_requirement_details.h index 48a67253..d0b2aef0 100644 --- a/src/include/darma/interface/frontend/memory_requirement_details.h +++ b/src/include/darma/interface/frontend/memory_requirement_details.h @@ -45,7 +45,7 @@ #ifndef DARMA_INTERFACE_FRONTEND_ALLOCATION_DETAILS_H #define DARMA_INTERFACE_FRONTEND_ALLOCATION_DETAILS_H -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -121,6 +121,6 @@ struct MemoryRequirementDetails { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_ALLOCATION_DETAILS_H diff --git a/src/include/darma/interface/frontend/publication_details.h b/src/include/darma/interface/frontend/publication_details.h index 4543eda7..69365239 100644 --- a/src/include/darma/interface/frontend/publication_details.h +++ b/src/include/darma/interface/frontend/publication_details.h @@ -52,7 +52,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -90,7 +90,7 @@ class PublicationDetails { #if _darma_has_feature(task_collection_token) virtual - darma_runtime::types::task_collection_token_t const& + darma::types::task_collection_token_t const& get_task_collection_token() const =0; #endif @@ -98,6 +98,6 @@ class PublicationDetails { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_PUBLICATION_DETAILS_H diff --git a/src/include/darma/interface/frontend/reduce_operation.h b/src/include/darma/interface/frontend/reduce_operation.h index 798bf1fe..0a632a7e 100644 --- a/src/include/darma/interface/frontend/reduce_operation.h +++ b/src/include/darma/interface/frontend/reduce_operation.h @@ -52,7 +52,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -118,6 +118,6 @@ class ReduceOp : public serialization::PolymorphicSerializableObject { } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_REDUCE_OPERATION_H diff --git a/src/include/darma/interface/frontend/serialization_manager.h b/src/include/darma/interface/frontend/serialization_manager.h index 0fecf58d..cad5276d 100644 --- a/src/include/darma/interface/frontend/serialization_manager.h +++ b/src/include/darma/interface/frontend/serialization_manager.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { @@ -185,7 +185,7 @@ class SerializationManager { } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/interface/frontend/task.h b/src/include/darma/interface/frontend/task.h index ba5f404f..818e9c6a 100644 --- a/src/include/darma/interface/frontend/task.h +++ b/src/include/darma/interface/frontend/task.h @@ -59,7 +59,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { @@ -166,16 +166,16 @@ class Task #if _darma_has_feature(create_parallel_for_custom_cpu_set) - //virtual darma_runtime::types::resource_pack_t const& get_resource_pack() const =0; + //virtual darma::types::resource_pack_t const& get_resource_pack() const =0; - virtual void set_resource_pack(darma_runtime::types::resource_pack_t const&) =0; + virtual void set_resource_pack(darma::types::resource_pack_t const&) =0; #endif /** @brief Indicates whether the task represents a parallel_for loop * * @return True if and only if this task directly wraps a parallel_for created via - * darma_runtime::backend::execute_parallel_for() + * darma::backend::execute_parallel_for() */ virtual bool is_parallel_for_task() const =0; @@ -207,7 +207,7 @@ make_empty_running_task(); } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/interface/frontend/task_collection.h b/src/include/darma/interface/frontend/task_collection.h index 5f272105..0feedbb8 100644 --- a/src/include/darma/interface/frontend/task_collection.h +++ b/src/include/darma/interface/frontend/task_collection.h @@ -55,7 +55,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { @@ -147,6 +147,6 @@ class TaskCollection } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_TASK_COLLECTION_H diff --git a/src/include/darma/interface/frontend/task_collection_task.h b/src/include/darma/interface/frontend/task_collection_task.h index 0ba63c7b..bd1278f6 100644 --- a/src/include/darma/interface/frontend/task_collection_task.h +++ b/src/include/darma/interface/frontend/task_collection_task.h @@ -45,7 +45,7 @@ #ifndef DARMA_TASK_COLLECTION_TASK_H #define DARMA_TASK_COLLECTION_TASK_H -namespace darma_runtime { +namespace darma { namespace abstract { @@ -63,6 +63,6 @@ class TaskCollectionTask : public TaskImpl { } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_TASK_COLLECTION_TASK_H diff --git a/src/include/darma/interface/frontend/top_level.h b/src/include/darma/interface/frontend/top_level.h index 3fd4ecd7..65c06146 100644 --- a/src/include/darma/interface/frontend/top_level.h +++ b/src/include/darma/interface/frontend/top_level.h @@ -51,7 +51,7 @@ #include "top_level_task.h" #include "types/concrete_task_t.h" -namespace darma_runtime { +namespace darma { namespace frontend { @@ -64,6 +64,6 @@ std::unique_ptr> darma_top_level_setup(std::vector&& args); } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_TOP_LEVEL_H diff --git a/src/include/darma/interface/frontend/top_level_task.h b/src/include/darma/interface/frontend/top_level_task.h index b0694f77..9a739f1f 100644 --- a/src/include/darma/interface/frontend/top_level_task.h +++ b/src/include/darma/interface/frontend/top_level_task.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace abstract { @@ -68,6 +68,6 @@ struct TopLevelTask: ConcreteBasicTask { } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_TOP_LEVEL_TASK_H diff --git a/src/include/darma/interface/frontend/types.h b/src/include/darma/interface/frontend/types.h index cd35cca4..4f72d878 100644 --- a/src/include/darma/interface/frontend/types.h +++ b/src/include/darma/interface/frontend/types.h @@ -56,7 +56,7 @@ #ifndef DARMA_CUSTOM_HANDLE_CONTAINER #include -namespace darma_runtime { +namespace darma { namespace types { // TODO this needs to be changed to something like use_iterable @@ -64,7 +64,7 @@ namespace types { using handle_container_template = std::set; } // end namespace types -} // end namespace darma_runtime +} // end namespace darma #endif #include diff --git a/src/include/darma/interface/frontend/types/concrete_condition_task_t.h b/src/include/darma/interface/frontend/types/concrete_condition_task_t.h index aeb3b331..accc7813 100644 --- a/src/include/darma/interface/frontend/types/concrete_condition_task_t.h +++ b/src/include/darma/interface/frontend/types/concrete_condition_task_t.h @@ -47,12 +47,12 @@ #include -namespace darma_runtime { +namespace darma { namespace types { -typedef darma_runtime::detail::ConditionTaskImpl concrete_condition_task_t; +typedef darma::detail::ConditionTaskImpl concrete_condition_task_t; } // end namespace types -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_TYPES_CONDITION_TASK_T_H diff --git a/src/include/darma/interface/frontend/types/concrete_task_t.h b/src/include/darma/interface/frontend/types/concrete_task_t.h index 6c2ca283..d3a52c57 100644 --- a/src/include/darma/interface/frontend/types/concrete_task_t.h +++ b/src/include/darma/interface/frontend/types/concrete_task_t.h @@ -47,12 +47,12 @@ #include -namespace darma_runtime { +namespace darma { namespace types { -typedef darma_runtime::detail::TaskBase concrete_task_t; +typedef darma::detail::TaskBase concrete_task_t; } // end namespace types -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_TYPES_CONCRETE_TASK_T_H diff --git a/src/include/darma/interface/frontend/types/concrete_top_level_task_t.h b/src/include/darma/interface/frontend/types/concrete_top_level_task_t.h index aad341c1..ab6f89be 100644 --- a/src/include/darma/interface/frontend/types/concrete_top_level_task_t.h +++ b/src/include/darma/interface/frontend/types/concrete_top_level_task_t.h @@ -47,12 +47,12 @@ #include -namespace darma_runtime { +namespace darma { namespace types { -typedef darma_runtime::detail::TopLevelTaskImpl concrete_top_level_task_t; +typedef darma::detail::TopLevelTaskImpl concrete_top_level_task_t; } // end namespace types -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTEFACE_FRONTEND_TYPES_CONCRETE_TOP_LEVEL_TASK_T_H diff --git a/src/include/darma/interface/frontend/types/task_collection_task_t.h b/src/include/darma/interface/frontend/types/task_collection_task_t.h index 4d7e84ce..209de19e 100644 --- a/src/include/darma/interface/frontend/types/task_collection_task_t.h +++ b/src/include/darma/interface/frontend/types/task_collection_task_t.h @@ -48,7 +48,7 @@ #include #include "concrete_task_t.h" -namespace darma_runtime { +namespace darma { namespace types { @@ -56,6 +56,6 @@ using task_collection_task_t = abstract::frontend::TaskCollectionTask -namespace darma_runtime { +namespace darma { namespace frontend { /** @@ -59,6 +59,6 @@ types::unique_ptr_template unpack_task(void const* packed_data); } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_INTERFACE_FRONTEND_UNPACK_TASK_H diff --git a/src/include/darma/interface/frontend/use.h b/src/include/darma/interface/frontend/use.h index 9b9f2a73..f8b69b60 100644 --- a/src/include/darma/interface/frontend/use.h +++ b/src/include/darma/interface/frontend/use.h @@ -58,7 +58,7 @@ #include -namespace darma_runtime { +namespace darma { namespace frontend { /** @@ -87,9 +87,9 @@ typedef enum struct Permissions { } permissions_t; inline std::string -permissions_to_string(darma_runtime::frontend::permissions_t per) { +permissions_to_string(darma::frontend::permissions_t per) { switch(per) { -#define _DARMA__perm_case(val) case darma_runtime::frontend::Permissions::val: return #val; +#define _DARMA__perm_case(val) case darma::frontend::Permissions::val: return #val; _DARMA__perm_case(None) _DARMA__perm_case(Read) _DARMA__perm_case(Modify) @@ -210,9 +210,9 @@ typedef enum struct CoherenceMode { } coherence_mode_t; inline std::string -coherence_mode_to_string(darma_runtime::frontend::coherence_mode_t mode) { +coherence_mode_to_string(darma::frontend::coherence_mode_t mode) { switch(mode) { -#define _DARMA__coh_case(val) case darma_runtime::frontend::CoherenceMode::val: return #val; +#define _DARMA__coh_case(val) case darma::frontend::CoherenceMode::val: return #val; _DARMA__coh_case(Sequential) _DARMA__coh_case(Commutative) _DARMA__coh_case(Relaxed) @@ -262,7 +262,7 @@ namespace frontend { class Use { public: - using permissions_t = darma_runtime::frontend::permissions_t; + using permissions_t = darma::frontend::permissions_t; /** @brief Return a pointer to the handle that this object encapsulates a * use of. @@ -278,7 +278,7 @@ class Use { * * @return */ - virtual darma_runtime::frontend::permissions_t + virtual darma::frontend::permissions_t immediate_permissions() const =0; /** @brief Get the scheduling permissions needed for the Flow returned by @@ -286,10 +286,10 @@ class Use { * * @return */ - virtual darma_runtime::frontend::permissions_t + virtual darma::frontend::permissions_t scheduling_permissions() const =0; - virtual darma_runtime::frontend::coherence_mode_t + virtual darma::frontend::coherence_mode_t coherence_mode() const =0; /** @brief Whether or not the Use manages the outer scope control flow for @@ -486,7 +486,7 @@ ToUse use_cast( Use* from_use ) { - return darma_runtime::utility::safe_dynamic_cast( + return darma::utility::safe_dynamic_cast( from_use ); } @@ -496,7 +496,7 @@ ToUse use_cast( Use const* from_use ) { - return darma_runtime::utility::safe_dynamic_cast( + return darma::utility::safe_dynamic_cast( from_use ); } @@ -506,13 +506,13 @@ use_cast( //use_pointer_cast( // Use const* from_use //) { -// return darma_runtime::detail::safe_dynamic_pointer_cast( +// return darma::detail::safe_dynamic_pointer_cast( // from_use // ); //} } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPLEMENTATION_FRONTEND_USE_H diff --git a/src/include/darma/interface/frontend/use_collection.h b/src/include/darma/interface/frontend/use_collection.h index 97f08d14..55521da1 100644 --- a/src/include/darma/interface/frontend/use_collection.h +++ b/src/include/darma/interface/frontend/use_collection.h @@ -49,7 +49,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace abstract { @@ -111,6 +111,6 @@ class UseCollection { } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_USE_COLLECTION_H diff --git a/src/include/darma/interface/frontend/while_do_closure.h b/src/include/darma/interface/frontend/while_do_closure.h index b14e93af..5ecb582b 100644 --- a/src/include/darma/interface/frontend/while_do_closure.h +++ b/src/include/darma/interface/frontend/while_do_closure.h @@ -47,7 +47,7 @@ #include "task.h" -namespace darma_runtime { +namespace darma { namespace abstract { namespace frontend { @@ -67,6 +67,6 @@ struct WhileDoClosure } // end namespace frontend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_WHILE_DO_CLOSURE_H diff --git a/src/include/darma/key/SSO_key.h b/src/include/darma/key/SSO_key.h index e753de5d..aacdf06f 100644 --- a/src/include/darma/key/SSO_key.h +++ b/src/include/darma/key/SSO_key.h @@ -58,7 +58,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -661,7 +661,7 @@ struct key_traits< // end Serializer specialization for SSOKey //============================================================================== -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/key/SSO_key.impl.h b/src/include/darma/key/SSO_key.impl.h index bf5be24e..d9a1f38b 100644 --- a/src/include/darma/key/SSO_key.impl.h +++ b/src/include/darma/key/SSO_key.impl.h @@ -47,7 +47,7 @@ #include "SSO_key.h" -namespace darma_runtime { +namespace darma { namespace detail { //============================================================================== @@ -71,7 +71,7 @@ struct _do_add_component { DARMA_FORCE_INLINE void _impl(T&& arg, Ts&&... args) { actual_component_count += - darma_runtime::detail::_impl::sso_key_add(this_, buffer, std::forward(arg)); + darma::detail::_impl::sso_key_add(this_, buffer, std::forward(arg)); _impl(std::forward(args)...); } @@ -190,6 +190,6 @@ SSOKey #include -namespace darma_runtime { +namespace darma { namespace detail { namespace _impl { @@ -79,6 +79,6 @@ template < class SSOKey; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEY_SSO_KEY_FWD_H diff --git a/src/include/darma/key/bytes_convert.h b/src/include/darma/key/bytes_convert.h index 3411e4d3..4fe0f46d 100644 --- a/src/include/darma/key/bytes_convert.h +++ b/src/include/darma/key/bytes_convert.h @@ -59,7 +59,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -558,6 +558,6 @@ using bytes_size_known_statically = } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_BYTES_CONVERT_H diff --git a/src/include/darma/key/bytes_type_metadata.h b/src/include/darma/key/bytes_type_metadata.h index 5f5222df..66f84fad 100644 --- a/src/include/darma/key/bytes_type_metadata.h +++ b/src/include/darma/key/bytes_type_metadata.h @@ -51,7 +51,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -265,7 +265,7 @@ category_extension_bytes_value(const void* md) { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEY_BYTES_TYPE_METADATA_H diff --git a/src/include/darma/key/dependent_on/serialization/SSO_key_serialization.h b/src/include/darma/key/dependent_on/serialization/SSO_key_serialization.h index cd96f8a3..59c84c90 100644 --- a/src/include/darma/key/dependent_on/serialization/SSO_key_serialization.h +++ b/src/include/darma/key/dependent_on/serialization/SSO_key_serialization.h @@ -53,7 +53,7 @@ #include -namespace darma_runtime { +namespace darma { namespace serialization { template < @@ -63,17 +63,17 @@ template < typename ComponentCountOrdinal > struct Serializer< - darma_runtime::detail::SSOKey< + darma::detail::SSOKey< BufferSize, BackendAssignedKeyType, PieceSizeOrdinal, ComponentCountOrdinal > > { - using sso_key_t = darma_runtime::detail::SSOKey< + using sso_key_t = darma::detail::SSOKey< BufferSize, BackendAssignedKeyType, PieceSizeOrdinal, ComponentCountOrdinal >; - using key_traits_t = darma_runtime::detail::key_traits; + using key_traits_t = darma::detail::key_traits; template static void compute_size(sso_key_t const& val, ArchiveT& ar) { @@ -84,20 +84,20 @@ struct Serializer< ); ar % val.mode; switch (val.mode) { - case darma_runtime::detail::_impl::BackendAssigned: + case darma::detail::_impl::BackendAssigned: ar % val.repr.as_backend_assigned.backend_assigned_key; break; - case darma_runtime::detail::_impl::Short: + case darma::detail::_impl::Short: ar % val.repr.as_short.size; // This could be smaller... ar % val.repr.as_short.data; break; - case darma_runtime::detail::_impl::Long: + case darma::detail::_impl::Long: // don't really need to store size since range does it ar % val.repr.as_long.size; ar.add_to_size_raw(val.repr.as_long.size); break; - case darma_runtime::detail::_impl::NeedsBackendAssignedKey: + case darma::detail::_impl::NeedsBackendAssignedKey: DARMA_ASSERT_UNREACHABLE_FAILURE("NeedsBackendAssignedKey"); // LCOV_EXCL_LINE break; // LCOV_EXCL_LINE } @@ -112,15 +112,15 @@ struct Serializer< ); ar << val.mode; switch (val.mode) { - case darma_runtime::detail::_impl::BackendAssigned: + case darma::detail::_impl::BackendAssigned: ar << val.repr.as_backend_assigned.backend_assigned_key; break; - case darma_runtime::detail::_impl::Short: + case darma::detail::_impl::Short: ar << val.repr.as_short.size; // This could be smaller... ar << val.repr.as_short.data; break; - case darma_runtime::detail::_impl::Long: + case darma::detail::_impl::Long: // don't really need to store size since range does it ar << val.repr.as_long.size; ar.pack_data_raw( @@ -128,7 +128,7 @@ struct Serializer< val.repr.as_long.data + val.repr.as_long.size ); break; - case darma_runtime::detail::_impl::NeedsBackendAssignedKey: + case darma::detail::_impl::NeedsBackendAssignedKey: DARMA_ASSERT_UNREACHABLE_FAILURE("NeedsBackendAssignedKey"); // LCOV_EXCL_LINE break; // LCOV_EXCL_LINE } @@ -162,19 +162,19 @@ SSOKey> repr.as_backend_assigned.backend_assigned_key; break; } - case darma_runtime::detail::_impl::Short: { + case darma::detail::_impl::Short: { repr.as_short = _short{}; ar >> repr.as_short.size; // This could be smaller... ar >> repr.as_short.data; break; } - case darma_runtime::detail::_impl::Long: { + case darma::detail::_impl::Long: { repr.as_long = _long{}; // don't really need to store size since range does it ar >> repr.as_long.size; @@ -185,7 +185,7 @@ SSOKey(repr.as_long.data, repr.as_long.size); break; } - case darma_runtime::detail::_impl::NeedsBackendAssignedKey: { + case darma::detail::_impl::NeedsBackendAssignedKey: { DARMA_ASSERT_UNREACHABLE_FAILURE("NeedsBackendAssignedKey"); // LCOV_EXCL_LINE break; // LCOV_EXCL_LINE } @@ -194,6 +194,6 @@ SSOKey -namespace darma_runtime { +namespace darma { namespace serialization { template <> -struct is_directly_serializable +struct is_directly_serializable : std::true_type { }; } // end namespace serialization -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_BYTES_TYPE_METADATA_SERIALIZATION_H diff --git a/src/include/darma/key/dependent_on/serialization/raw_bytes_serialization.h b/src/include/darma/key/dependent_on/serialization/raw_bytes_serialization.h index 459e1c14..a95c2371 100644 --- a/src/include/darma/key/dependent_on/serialization/raw_bytes_serialization.h +++ b/src/include/darma/key/dependent_on/serialization/raw_bytes_serialization.h @@ -49,19 +49,19 @@ #include -namespace darma_runtime { +namespace darma { namespace serialization { template <> -struct Serializer { +struct Serializer { template - void get_size(darma_runtime::detail::raw_bytes const& val, Archive& ar) const { + void get_size(darma::detail::raw_bytes const& val, Archive& ar) const { ar % val.get_size(); ar.add_to_size_raw(val.get_size()); } template - void pack(darma_runtime::detail::raw_bytes const& val, Archive& ar) const { + void pack(darma::detail::raw_bytes const& val, Archive& ar) const { ar << val.get_size(); ar.pack_data_raw((char*)val.data.get(), (char*)val.data.get() + val.get_size()); } @@ -69,13 +69,13 @@ struct Serializer { void unpack(void* allocated, Archive& ar) const { size_t size = 0; ar >> size; - auto* val = new (allocated) darma_runtime::detail::raw_bytes(size); + auto* val = new (allocated) darma::detail::raw_bytes(size); ar.template unpack_data_raw(val->data.get(), size); } }; } // end namespace serialization -} // end namespace darma_runtime +} // end namespace darma #endif //DARMAFRONTEND_RAW_BYTES_SERIALIZATION_H diff --git a/src/include/darma/key/key_concept.h b/src/include/darma/key/key_concept.h index 2b287a8f..841818bf 100644 --- a/src/include/darma/key/key_concept.h +++ b/src/include/darma/key/key_concept.h @@ -51,7 +51,7 @@ #include // std::integral_constant -namespace darma_runtime { +namespace darma { namespace detail { template @@ -67,7 +67,7 @@ struct meets_key_concept { // Must specialize the key_traits class template //using specializes_key_traits_archetype = decltype( std::declval>() ); - using specializes_key_traits_archetype = darma_runtime::detail::key_traits; + using specializes_key_traits_archetype = darma::detail::key_traits; // This will be the type tinympl::nonesuch if the specialization doesn't exist // and key_traits if it does (see tinympl::detected_t) @@ -242,31 +242,31 @@ operator<<(std::ostream& o, Key const& k) { -} // end namespace darma_runtime +} // end namespace darma #define DARMA_STATIC_ASSERT_VALID_KEY_TYPE(K) \ - static_assert(darma_runtime::detail::meets_key_concept::has_traits_specialization, \ + static_assert(darma::detail::meets_key_concept::has_traits_specialization, \ "key_traits not specialized for type" #K); \ - static_assert(darma_runtime::detail::meets_key_concept::has_key_equal, \ + static_assert(darma::detail::meets_key_concept::has_key_equal, \ "key_traits<" #K "> specialization missing key_equal member type"); \ - static_assert(darma_runtime::detail::meets_key_concept::key_equal_works, \ + static_assert(darma::detail::meets_key_concept::key_equal_works, \ "key_traits<" #K ">::key_equal does not work as expected"); \ - static_assert(darma_runtime::detail::meets_key_concept::has_hasher, \ + static_assert(darma::detail::meets_key_concept::has_hasher, \ "key_traits<" #K "> specialization missing hasher member type"); \ - static_assert(darma_runtime::detail::meets_key_concept::hasher_works, \ + static_assert(darma::detail::meets_key_concept::hasher_works, \ "key_traits<" #K ">::hasher does not work as expected"); \ - static_assert(darma_runtime::detail::meets_key_concept::has_maker, \ + static_assert(darma::detail::meets_key_concept::has_maker, \ "key_traits<" #K "> specialization missing maker member type"); \ - static_assert(darma_runtime::detail::meets_key_concept::has_component_method, \ + static_assert(darma::detail::meets_key_concept::has_component_method, \ #K " is missing template method component()"); \ - static_assert(darma_runtime::detail::meets_key_concept::key_component_method_works, \ + static_assert(darma::detail::meets_key_concept::key_component_method_works, \ "return value of component() for " #K " does not have an as<>() method that returns the component as a type"); \ -// static_assert(darma_runtime::detail::meets_key_concept::has_maker_from_tuple, \ +// static_assert(darma::detail::meets_key_concept::has_maker_from_tuple, \ // "key_traits<" #K "> specialization missing maker_from_tuple member type"); \ -//static_assert(not darma_runtime::detail::meets_key_concept::value, +//static_assert(not darma::detail::meets_key_concept::value, // "oops, int shouldn't be a valid key"); #endif /* FRONTEND_INCLUDE_DARMA_KEY_CONCEPT_H_ */ diff --git a/src/include/darma/key/key_fwd.h b/src/include/darma/key/key_fwd.h index 397427a1..8b438a69 100644 --- a/src/include/darma/key/key_fwd.h +++ b/src/include/darma/key/key_fwd.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -56,6 +56,6 @@ struct bytes_convert; } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEY_KEY_FWD_H diff --git a/src/include/darma/key/raw_bytes.h b/src/include/darma/key/raw_bytes.h index 018387db..9a49aa1f 100644 --- a/src/include/darma/key/raw_bytes.h +++ b/src/include/darma/key/raw_bytes.h @@ -50,7 +50,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -100,6 +100,6 @@ struct bytes_convert { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEY_RAW_BYTES_H diff --git a/src/include/darma/keyword_arguments/check_allowed_kwargs.h b/src/include/darma/keyword_arguments/check_allowed_kwargs.h index 36abd7eb..278d68e1 100644 --- a/src/include/darma/keyword_arguments/check_allowed_kwargs.h +++ b/src/include/darma/keyword_arguments/check_allowed_kwargs.h @@ -54,7 +54,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { template @@ -124,7 +124,7 @@ struct only_allowed_kwargs_given { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif /* SRC_INCLUDE_DARMA_IMPL_KEYWORD_ARGUMENTS_CHECK_ALLOWED_KWARGS_H_ */ diff --git a/src/include/darma/keyword_arguments/errors.h b/src/include/darma/keyword_arguments/errors.h index 2c69d097..68dafa69 100644 --- a/src/include/darma/keyword_arguments/errors.h +++ b/src/include/darma/keyword_arguments/errors.h @@ -46,7 +46,7 @@ #ifndef DARMA_IMPL_KEYWORD_ARGUMENTS_ERRORS_H #define DARMA_IMPL_KEYWORD_ARGUMENTS_ERRORS_H -namespace darma_runtime { +namespace darma { namespace detail { namespace _DARMA__error__ { @@ -57,6 +57,6 @@ struct __________Unknown_keyword_argument_; } // end namespace _DARMA____error____ } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEYWORD_ARGUMENTS_ERRORS_H diff --git a/src/include/darma/keyword_arguments/get_kwarg.h b/src/include/darma/keyword_arguments/get_kwarg.h index 252dcbbc..f9369d83 100644 --- a/src/include/darma/keyword_arguments/get_kwarg.h +++ b/src/include/darma/keyword_arguments/get_kwarg.h @@ -65,7 +65,7 @@ // TODO extract arguments given as either positional or keyword // TODO switch to auto (or decltype(auto), or auto&&) return values -namespace darma_runtime { namespace detail { +namespace darma { namespace detail { namespace m = tinympl; namespace mv = tinympl::variadic; @@ -569,7 +569,7 @@ struct n_positional_args //////////////////////////////////////////////////////////////////////////////// -}} // end namespace darma_runtime::detail +}} // end namespace darma::detail diff --git a/src/include/darma/keyword_arguments/keyword_argument_name.h b/src/include/darma/keyword_arguments/keyword_argument_name.h index 97cfcf10..4435592c 100644 --- a/src/include/darma/keyword_arguments/keyword_argument_name.h +++ b/src/include/darma/keyword_arguments/keyword_argument_name.h @@ -50,7 +50,7 @@ #include -namespace darma_runtime { namespace detail { +namespace darma { namespace detail { template struct extract_tag; @@ -112,6 +112,6 @@ struct is_keyword_argument_name< > : public std::true_type { }; -}} // end namespace darma_runtime::detail +}} // end namespace darma::detail #endif /* KEYWORD_ARGUMENTS_KEYWORD_ARGUMENT_NAME_H_ */ diff --git a/src/include/darma/keyword_arguments/keyword_tag.h b/src/include/darma/keyword_arguments/keyword_tag.h index 331a537a..6c66a5e3 100644 --- a/src/include/darma/keyword_arguments/keyword_tag.h +++ b/src/include/darma/keyword_arguments/keyword_tag.h @@ -47,7 +47,7 @@ #include -namespace darma_runtime { +namespace darma { namespace detail { @@ -86,7 +86,7 @@ struct extract_type_if_tag< struct unknown_type { }; -}} // end namespace darma_runtime::detail +}} // end namespace darma::detail diff --git a/src/include/darma/keyword_arguments/kwarg_expression.h b/src/include/darma/keyword_arguments/kwarg_expression.h index 40fe3cf8..228b7fe7 100644 --- a/src/include/darma/keyword_arguments/kwarg_expression.h +++ b/src/include/darma/keyword_arguments/kwarg_expression.h @@ -53,7 +53,7 @@ #include #include -namespace darma_runtime { +namespace darma { namespace detail { //////////////////////////////////////////////////////////////////////////////// @@ -203,7 +203,7 @@ struct is_kwarg_expression_with_tag< //////////////////////////////////////////////////////////////////////////////// } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/include/darma/keyword_arguments/kwarg_expression_fwd.h b/src/include/darma/keyword_arguments/kwarg_expression_fwd.h index 932d4c61..939ed30c 100644 --- a/src/include/darma/keyword_arguments/kwarg_expression_fwd.h +++ b/src/include/darma/keyword_arguments/kwarg_expression_fwd.h @@ -45,7 +45,7 @@ #ifndef SRC_KEYWORD_ARGUMENTS_KWARG_EXPRESSION_FWD_H_ #define SRC_KEYWORD_ARGUMENTS_KWARG_EXPRESSION_FWD_H_ -namespace darma_runtime { namespace detail { +namespace darma { namespace detail { template class kwarg_expression; @@ -59,7 +59,7 @@ class multiarg_typeless_kwarg_expression; template struct is_kwarg_expression; -}} // end namespace darma_runtime::detail +}} // end namespace darma::detail diff --git a/src/include/darma/keyword_arguments/macros.h b/src/include/darma/keyword_arguments/macros.h index 93f06084..3d8ca040 100644 --- a/src/include/darma/keyword_arguments/macros.h +++ b/src/include/darma/keyword_arguments/macros.h @@ -3,7 +3,7 @@ // ************************************************************************ // // keyword_arguments/macros.h -// darma_runtime +// darma // Copyright (C) 2015 Sandia Corporation // // Under the terms of Contract DE-NA-0003525 with NTESS, LLC, @@ -57,21 +57,21 @@ #define _darma_detail_remove_parens(...) __VA_ARGS__ #define _darma_declare_keyword_tag_typeless(argument_for, name) \ -namespace darma_runtime { \ +namespace darma { \ namespace keyword_tags_for_##argument_for { \ \ class name : public detail::keyword_tag \ { \ public: \ typedef std::true_type is_tag_t; \ - typedef _darma_detail_remove_parens (darma_runtime::detail::unknown_type) value_t; \ + typedef _darma_detail_remove_parens (darma::detail::unknown_type) value_t; \ }; \ \ } /* end keyword_tags_for_ */ \ namespace keyword_arguments_for_##argument_for { \ \ typedef detail::typeless_keyword_argument_name< \ - darma_runtime::keyword_tags_for_##argument_for::name \ + darma::keyword_tags_for_##argument_for::name \ > name##_keyword_name_t; \ \ namespace { \ @@ -79,27 +79,27 @@ namespace { static constexpr name##_keyword_name_t name; \ } /* end of anonymous namespace */ \ } /* end keyword_arguments_for_ */ \ -} /* end namespace darma_runtime */ +} /* end namespace darma */ #define _darma_declare_keyword_tag_data(argument_for, name, argtype) \ -namespace darma_runtime { \ +namespace darma { \ namespace detail { \ template<> \ -struct tag_data \ +struct tag_data \ { \ typedef keyword_arguments_for_##argument_for::name##_keyword_name_t keyword_name_t; \ typedef _darma_detail_remove_parens argtype value_t; \ static constexpr bool has_default_value = false; \ static constexpr bool has_type = not \ - std::is_same::type::value; \ + std::is_same::type::value; \ }; \ } /* end namespace detail */ \ -} /* end namespace darma_runtime */ +} /* end namespace darma */ // This is the only way we should declare keyword arguments from now on #define DeclareDarmaTypeTransparentKeyword(argument_for, name) \ _darma_declare_keyword_tag_typeless(argument_for, name) \ - _darma_declare_keyword_tag_data(argument_for, name, (darma_runtime::detail::unknown_type)) + _darma_declare_keyword_tag_data(argument_for, name, (darma::detail::unknown_type)) //////////////////////////////////////////////////////////////////////////////// @@ -108,20 +108,20 @@ struct tag_data namespace { \ /* anonymous namespace for linking purposes */ \ static constexpr const \ -::darma_runtime::keyword_arguments_for_##original_argument_for::name##_keyword_name_t& \ -name = ::darma_runtime::keyword_arguments_for_##original_argument_for::name; \ +::darma::keyword_arguments_for_##original_argument_for::name##_keyword_name_t& \ +name = ::darma::keyword_arguments_for_##original_argument_for::name; \ } /* end anonymous namespace */ #define AliasDarmaKeywordAs(original_argument_for, name, as_name) \ namespace { \ /* anonymous namespace for linking purposes */ \ static constexpr const \ -::darma_runtime::keyword_arguments_for_##original_argument_for::name##_keyword_name_t& \ -as_name = ::darma_runtime::keyword_arguments_for_##original_argument_for::name; \ +::darma::keyword_arguments_for_##original_argument_for::name##_keyword_name_t& \ +as_name = ::darma::keyword_arguments_for_##original_argument_for::name; \ } /* end anonymous namespace */ #define DeclareStandardDarmaKeywordArgumentAliases(original_argument_for, name) \ -namespace darma_runtime { \ +namespace darma { \ namespace keyword_arguments { \ AliasDarmaKeyword(original_argument_for, name); \ } \ @@ -139,7 +139,7 @@ AliasDarmaKeywordAs(original_argument_for, name, DARMA_CONCAT_TOKEN_(DARMA_CONCAT_TOKEN_(_, name), _) \ ); \ } \ -} /* end namespace darma_runtime */ +} /* end namespace darma */ diff --git a/src/include/darma/keyword_arguments/parse.h b/src/include/darma/keyword_arguments/parse.h index 658295d2..66fe71d3 100644 --- a/src/include/darma/keyword_arguments/parse.h +++ b/src/include/darma/keyword_arguments/parse.h @@ -122,7 +122,7 @@ struct ___expected_positional_argument_only_ { } // end namespace _darma__errors #endif -namespace darma_runtime { +namespace darma { namespace detail { @@ -1613,6 +1613,6 @@ struct kwarg_parser { } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma #endif //DARMA_IMPL_KEYWORD_ARGUMENTS_PARSE_H diff --git a/src/tests/frontend_compilation_benchmark/darma_types.h b/src/tests/frontend_compilation_benchmark/darma_types.h index 0457f14e..315be942 100644 --- a/src/tests/frontend_compilation_benchmark/darma_types.h +++ b/src/tests/frontend_compilation_benchmark/darma_types.h @@ -65,9 +65,9 @@ struct MockResourcePack { } // end namespace mock backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using resource_pack_t = ::mock_backend::MockResourcePack; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { class MockFlow { @@ -214,12 +214,12 @@ class MockAntiFlow { #include -namespace darma_runtime { namespace types { +namespace darma { namespace types { typedef ::mock_backend::MockFlow flow_t; #if _darma_has_feature(anti_flows) using anti_flow_t = ::mock_backend::MockAntiFlow; #endif // _darma_has_feature(anti_flows) -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -238,9 +238,9 @@ struct MockTaskCollectionToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using task_collection_token_t = mock_backend::MockTaskCollectionToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -258,15 +258,15 @@ struct MockRuntimeInstanceToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using runtime_instance_token_t = mock_backend::MockRuntimeInstanceToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types #include -namespace darma_runtime { namespace types { - typedef darma_runtime::detail::SSOKey<> key_t; -}} // end namespace darma_runtime::types +namespace darma { namespace types { + typedef darma::detail::SSOKey<> key_t; +}} // end namespace darma::types #include diff --git a/src/tests/frontend_compilation_benchmark/matchers.h b/src/tests/frontend_compilation_benchmark/matchers.h index e035e8ef..79b8f5cc 100644 --- a/src/tests/frontend_compilation_benchmark/matchers.h +++ b/src/tests/frontend_compilation_benchmark/matchers.h @@ -53,8 +53,8 @@ #include inline std::string -relationship_to_string(darma_runtime::abstract::frontend::FlowRelationship::flow_relationship_description_t rel) { -#define _flow_rel_str_case(rel) case darma_runtime::abstract::frontend::FlowRelationship::rel : return #rel +relationship_to_string(darma::abstract::frontend::FlowRelationship::flow_relationship_description_t rel) { +#define _flow_rel_str_case(rel) case darma::abstract::frontend::FlowRelationship::rel : return #rel switch(rel) { _flow_rel_str_case(Same); _flow_rel_str_case(Initial); @@ -80,8 +80,8 @@ relationship_to_string(darma_runtime::abstract::frontend::FlowRelationship::flow using namespace ::testing; //bool operator==( -// darma_runtime::abstract::frontend::Use const* const a, -// darma_runtime::abstract::frontend::Use const* const b +// darma::abstract::frontend::Use const* const a, +// darma::abstract::frontend::Use const* const b //) { // return a->get_in_flow() == b->get_in_flow() // and a->get_out_flow() == b->get_out_flow() @@ -110,10 +110,10 @@ MATCHER_P3(IsUseWithInFlow, f_in, scheduling_permissions, immediate_permissions, using namespace mock_backend; if(f_in != arg->get_in_flow()) return false; - if(immediate_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != ::darma::frontend::Permissions::_notGiven) { if(immediate_permissions != (arg->immediate_permissions())) return false; } - if(scheduling_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != ::darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != (arg->scheduling_permissions())) return false; } return true; @@ -129,7 +129,7 @@ MATCHER_P4(IsUseWithFlows, f_in, f_out, scheduling_permissions, immediate_permis return false; } - auto* arg_cast = darma_runtime::abstract::frontend::use_cast(arg); + auto* arg_cast = darma::abstract::frontend::use_cast(arg); #if DARMA_SAFE_TEST_FRONTEND_PRINTERS *result_listener << "arg (unprinted for safety)"; @@ -143,10 +143,10 @@ MATCHER_P4(IsUseWithFlows, f_in, f_out, scheduling_permissions, immediate_permis using namespace mock_backend; if(f_in != arg_cast->get_in_flow()) return false; if(f_out != arg_cast->get_out_flow()) return false; - if(immediate_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != ::darma::frontend::Permissions::_notGiven) { if(immediate_permissions != (arg->immediate_permissions())) return false; } - if(scheduling_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != ::darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != (arg->scheduling_permissions())) return false; } return true; @@ -275,10 +275,10 @@ MATCHER_P7(IsUseWithFlowRelationships, f_in_rel, f_in, f_out_rel, f_out, out_rel } if(arg->get_out_flow_relationship().use_corresponding_in_flow_as_related() xor out_rel_is_in) return false; - if(immediate_permissions != darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != darma::frontend::Permissions::_notGiven) { if(immediate_permissions != arg->immediate_permissions()) return false; } - if(scheduling_permissions != darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != arg->scheduling_permissions()) return false; } return true; @@ -354,8 +354,8 @@ MATCHER_P(UseRefIsNonNull, use, "Use* reference is non-null at time of invocatio MATCHER_P(UseInGetDependencies, use, "task->get_dependencies() contains " + PrintToString(use)) { auto deps = arg->get_dependencies(); if(deps.find( - ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::DependencyUse* >(use) ) != deps.end()) { return true; @@ -375,8 +375,8 @@ MATCHER_P(UseInGetDependencies, use, "task->get_dependencies() contains " + Prin MATCHER_P(CollectionUseInGetDependencies, use, "task->get_dependencies() contains " + PrintToString(use)) { auto deps = arg->get_dependencies(); if(deps.find( - ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::DependencyUse* >(use) ) != deps.end()) { return true; @@ -428,8 +428,8 @@ MATCHER_P(UsesInGetDependencies, uses, } try { if (deps.find( - ::darma_runtime::utility::try_dynamic_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::utility::try_dynamic_cast< + ::darma::abstract::frontend::DependencyUse* >(*use) ) == deps.end()) { *result_listener << "at least one use not found; "; @@ -455,7 +455,7 @@ MATCHER_P(UsesInGetDependencies, uses, MATCHER_P(HasName, name_key, "object has name key " + PrintToString(name_key)) { auto arg_name = arg->get_name(); - if(darma_runtime::detail::key_traits::key_equal()(arg_name, name_key)) { + if(darma::detail::key_traits::key_equal()(arg_name, name_key)) { return true; } else { diff --git a/src/tests/frontend_compilation_benchmark/test_create_work.cc b/src/tests/frontend_compilation_benchmark/test_create_work.cc index 9b7c7971..3e20db6f 100644 --- a/src/tests/frontend_compilation_benchmark/test_create_work.cc +++ b/src/tests/frontend_compilation_benchmark/test_create_work.cc @@ -86,8 +86,8 @@ struct TestModCaptureMN TEST_P(TestModCaptureMN, mod_capture_MN) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -161,8 +161,8 @@ INSTANTIATE_TEST_CASE_P( TEST_F(TestCreateWork, mod_capture_MN_vector) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; DECLARE_MOCK_FLOWS(finit1, finit2, fnull1, fnull2, fout1, fout2); @@ -229,8 +229,8 @@ struct TestRoCaptureRN TEST_P(TestRoCaptureRN, ro_capture_RN) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -250,7 +250,7 @@ TEST_P(TestRoCaptureRN, ro_capture_RN) { // ro-capture of RN EXPECT_CALL(*mock_runtime, register_use(IsUseWithFlows( - &f_fetch, &f_fetch, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + &f_fetch, &f_fetch, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read ))).WillOnce(SaveArg<0>(&read_use)); } @@ -295,8 +295,8 @@ struct TestCaptureMM TEST_P(TestCaptureMM, capture_MM) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; bool ro_capture = std::get<0>(GetParam()); @@ -415,9 +415,9 @@ TEST_P(TestCaptureMM, capture_MM) { EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( #if _darma_has_feature(anti_flows) - f_forwarded, nullptr, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + f_forwarded, nullptr, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read #else - f_forwarded, f_forwarded, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + f_forwarded, f_forwarded, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read #endif // _darma_has_feature(anti_flows) ))).WillOnce(Invoke([&](auto&& use){ use->get_data_pointer_reference() = (void*)(&value); @@ -425,7 +425,7 @@ TEST_P(TestCaptureMM, capture_MM) { })); // Expect the continuing context use to be registered after the captured context EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( - f_forwarded, f_outer_out, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Read + f_forwarded, f_outer_out, darma::frontend::Permissions::Modify, darma::frontend::Permissions::Read ))).WillOnce(Invoke([&](auto&& use){ // Shouldn't be necessary // use->get_data_pointer_reference() = (void*)(&value); @@ -469,9 +469,9 @@ INSTANTIATE_TEST_CASE_P( TEST_F(TestCreateWork, named_task) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; EXPECT_CALL(*mock_runtime, @@ -495,9 +495,9 @@ TEST_F(TestCreateWork, named_task) { TEST_F(TestCreateWork, handle_aliasing) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -550,9 +550,9 @@ struct TestScheduleOnly TEST_P(TestScheduleOnly, schedule_only) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -684,9 +684,9 @@ INSTANTIATE_TEST_CASE_P( #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestCreateWork, death_schedule_only) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; MockFlow finit, fnull, f_sched_out; use_t* use_sched_capt = nullptr; @@ -737,8 +737,8 @@ TEST_F(TestCreateWork, death_schedule_only) { #if 0 TEST_F(TestCreateWork, mod_capture_MN_nested_MR) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -851,9 +851,9 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, ::testing::Values(0, 1, 2, 3, 4, 5, 6), int ) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_commutative_access; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_commutative_access; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -899,14 +899,14 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, [&](abstract::frontend::DependencyUse* use) { return use->get_in_flow() == fcomm_out && use->get_out_flow() == fnull - && use->immediate_permissions() == darma_runtime::frontend::Permissions::None + && use->immediate_permissions() == darma::frontend::Permissions::None && ( // The ones that don't do explicit releases will have "None" scheduling // permissions on the last use ((semantic_mode == 0 || semantic_mode > 3) - && use->scheduling_permissions() == darma_runtime::frontend::Permissions::Modify) + && use->scheduling_permissions() == darma::frontend::Permissions::Modify) || ((semantic_mode == 1 || semantic_mode == 2 || semantic_mode == 3) - && use->scheduling_permissions() == darma_runtime::frontend::Permissions::None) + && use->scheduling_permissions() == darma::frontend::Permissions::None) ); } ))).WillOnce(SaveArg<0>(&last_use)); @@ -1036,7 +1036,7 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, TEST_F(TestCreateWork, mod_capture_new) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1099,7 +1099,7 @@ TEST_F(TestCreateWork, mod_capture_new) { TEST_F(TestCreateWork, mod_capture_new_track_same) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_compilation_benchmark/test_kwarg_functor.jin.cc b/src/tests/frontend_compilation_benchmark/test_kwarg_functor.jin.cc index 2ff958c3..aadff00d 100755 --- a/src/tests/frontend_compilation_benchmark/test_kwarg_functor.jin.cc +++ b/src/tests/frontend_compilation_benchmark/test_kwarg_functor.jin.cc @@ -52,7 +52,7 @@ //////////////////////////////////////////////////////////////////////////////// -namespace darma_runtime { +namespace darma { void test_kwarg_functor() { @@ -65,7 +65,7 @@ void test_kwarg_functor() { } -} // end namespace darma_runtime +} // end namespace darma //////////////////////////////////////////////////////////////////////////////// diff --git a/src/tests/frontend_compilation_benchmark/test_kwarg_header.h b/src/tests/frontend_compilation_benchmark/test_kwarg_header.h index 8571576b..5be27e01 100644 --- a/src/tests/frontend_compilation_benchmark/test_kwarg_header.h +++ b/src/tests/frontend_compilation_benchmark/test_kwarg_header.h @@ -69,7 +69,7 @@ DeclareStandardDarmaKeywordArgumentAliases(compilation, arg6); DeclareStandardDarmaKeywordArgumentAliases(compilation, arg7); DeclareStandardDarmaKeywordArgumentAliases(compilation, arg8); -namespace darma_runtime { +namespace darma { namespace test_detail { @@ -126,7 +126,7 @@ template void foo_kwarg_lambda_test_one(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword @@ -148,7 +148,7 @@ template void foo_kwarg_lambda_test_two(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword, @@ -184,7 +184,7 @@ template void foo_kwarg_functor_test_one(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword @@ -206,7 +206,7 @@ template void foo_kwarg_functor_test_two(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _optional_keyword, @@ -237,6 +237,6 @@ foo_kwarg_functor_test_two(Args&&... args) { .invoke(test_detail::foo{}); } -} // end namespace darma_runtime +} // end namespace darma #endif diff --git a/src/tests/frontend_validation/darma_types.h b/src/tests/frontend_validation/darma_types.h index 7480967a..925df94e 100644 --- a/src/tests/frontend_validation/darma_types.h +++ b/src/tests/frontend_validation/darma_types.h @@ -65,9 +65,9 @@ struct MockResourcePack { } // end namespace mock backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using resource_pack_t = ::mock_backend::MockResourcePack; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { class MockFlow { @@ -214,12 +214,12 @@ class MockAntiFlow { #include -namespace darma_runtime { namespace types { +namespace darma { namespace types { typedef ::mock_backend::MockFlow flow_t; #if _darma_has_feature(anti_flows) using anti_flow_t = ::mock_backend::MockAntiFlow; #endif // _darma_has_feature(anti_flows) -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -238,9 +238,9 @@ struct MockTaskCollectionToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using task_collection_token_t = mock_backend::MockTaskCollectionToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -266,15 +266,15 @@ struct MockRuntimeInstanceToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using runtime_instance_token_t = mock_backend::MockRuntimeInstanceToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types #include -namespace darma_runtime { namespace types { - typedef darma_runtime::detail::SSOKey<> key_t; -}} // end namespace darma_runtime::types +namespace darma { namespace types { + typedef darma::detail::SSOKey<> key_t; +}} // end namespace darma::types #include @@ -305,9 +305,9 @@ struct MockRuntimeContextToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using runtime_context_token_t = mock_backend::MockRuntimeContextToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -336,9 +336,9 @@ struct MockRuntimePiecewiseCollectionToken { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using piecewise_collection_token_t = mock_backend::MockRuntimePiecewiseCollectionToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -367,9 +367,9 @@ struct MockRuntimePersistentCollectionToken { } // end namespace mock_backend -namespace darma_runtime {namespace types { +namespace darma {namespace types { using persistent_collection_token_t = mock_backend::MockRuntimePersistentCollectionToken; -}} // end namespace darma_runtime::types +}} // end namespace darma::types namespace mock_backend { @@ -386,9 +386,9 @@ struct MockRuntimeMPIComm { } // end namespace mock_backend -namespace darma_runtime { namespace types { +namespace darma { namespace types { using MPI_Comm = mock_backend::MockRuntimeMPIComm; -}} // end namespace darma_runtime::types +}} // end namespace darma::types #endif /* SRC_TESTS_FRONTEND_VALIDATION_DARMA_TYPES_H_ */ diff --git a/src/tests/frontend_validation/helpers.h b/src/tests/frontend_validation/helpers.h index de66df62..43309de2 100644 --- a/src/tests/frontend_validation/helpers.h +++ b/src/tests/frontend_validation/helpers.h @@ -60,17 +60,17 @@ permissions_to_string(int i) { else return ""; } -namespace darma_runtime { +namespace darma { namespace frontend { inline std::ostream& -operator<<(std::ostream& o, darma_runtime::frontend::Permissions per) { +operator<<(std::ostream& o, darma::frontend::Permissions per) { o << permissions_to_string(per); return o; } } // end namespace frontend -} // end namespace darma_runtime +} // end namespace darma diff --git a/src/tests/frontend_validation/matchers.h b/src/tests/frontend_validation/matchers.h index 2a3fba21..345bdd10 100644 --- a/src/tests/frontend_validation/matchers.h +++ b/src/tests/frontend_validation/matchers.h @@ -53,8 +53,8 @@ #include inline std::string -relationship_to_string(darma_runtime::abstract::frontend::FlowRelationship::flow_relationship_description_t rel) { -#define _flow_rel_str_case(rel) case darma_runtime::abstract::frontend::FlowRelationship::rel : return #rel +relationship_to_string(darma::abstract::frontend::FlowRelationship::flow_relationship_description_t rel) { +#define _flow_rel_str_case(rel) case darma::abstract::frontend::FlowRelationship::rel : return #rel switch(rel) { _flow_rel_str_case(Same); _flow_rel_str_case(Initial); @@ -80,8 +80,8 @@ relationship_to_string(darma_runtime::abstract::frontend::FlowRelationship::flow using namespace ::testing; //bool operator==( -// darma_runtime::abstract::frontend::Use const* const a, -// darma_runtime::abstract::frontend::Use const* const b +// darma::abstract::frontend::Use const* const a, +// darma::abstract::frontend::Use const* const b //) { // return a->get_in_flow() == b->get_in_flow() // and a->get_out_flow() == b->get_out_flow() @@ -110,10 +110,10 @@ MATCHER_P3(IsUseWithInFlow, f_in, scheduling_permissions, immediate_permissions, using namespace mock_backend; if(f_in != arg->get_in_flow()) return false; - if(immediate_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != ::darma::frontend::Permissions::_notGiven) { if(immediate_permissions != (arg->immediate_permissions())) return false; } - if(scheduling_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != ::darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != (arg->scheduling_permissions())) return false; } return true; @@ -129,7 +129,7 @@ MATCHER_P4(IsUseWithFlows, f_in, f_out, scheduling_permissions, immediate_permis return false; } - auto* arg_cast = darma_runtime::abstract::frontend::use_cast(arg); + auto* arg_cast = darma::abstract::frontend::use_cast(arg); #if DARMA_SAFE_TEST_FRONTEND_PRINTERS *result_listener << "arg (unprinted for safety)"; @@ -143,10 +143,10 @@ MATCHER_P4(IsUseWithFlows, f_in, f_out, scheduling_permissions, immediate_permis using namespace mock_backend; if(f_in != arg_cast->get_in_flow()) return false; if(f_out != arg_cast->get_out_flow()) return false; - if(immediate_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != ::darma::frontend::Permissions::_notGiven) { if(immediate_permissions != (arg->immediate_permissions())) return false; } - if(scheduling_permissions != ::darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != ::darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != (arg->scheduling_permissions())) return false; } return true; @@ -275,10 +275,10 @@ MATCHER_P7(IsUseWithFlowRelationships, f_in_rel, f_in, f_out_rel, f_out, out_rel } if(arg->get_out_flow_relationship().use_corresponding_in_flow_as_related() xor out_rel_is_in) return false; - if(immediate_permissions != darma_runtime::frontend::Permissions::_notGiven) { + if(immediate_permissions != darma::frontend::Permissions::_notGiven) { if(immediate_permissions != arg->immediate_permissions()) return false; } - if(scheduling_permissions != darma_runtime::frontend::Permissions::_notGiven) { + if(scheduling_permissions != darma::frontend::Permissions::_notGiven) { if(scheduling_permissions != arg->scheduling_permissions()) return false; } return true; @@ -354,8 +354,8 @@ MATCHER_P(UseRefIsNonNull, use, "Use* reference is non-null at time of invocatio MATCHER_P(UseInGetDependencies, use, "task->get_dependencies() contains " + PrintToString(use)) { auto deps = arg->get_dependencies(); if(deps.find( - ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::DependencyUse* >(use) ) != deps.end()) { return true; @@ -375,8 +375,8 @@ MATCHER_P(UseInGetDependencies, use, "task->get_dependencies() contains " + Prin MATCHER_P(CollectionUseInGetDependencies, use, "task->get_dependencies() contains " + PrintToString(use)) { auto deps = arg->get_dependencies(); if(deps.find( - ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::DependencyUse* >(use) ) != deps.end()) { return true; @@ -428,8 +428,8 @@ MATCHER_P(UsesInGetDependencies, uses, } try { if (deps.find( - ::darma_runtime::utility::try_dynamic_cast< - ::darma_runtime::abstract::frontend::DependencyUse* + ::darma::utility::try_dynamic_cast< + ::darma::abstract::frontend::DependencyUse* >(*use) ) == deps.end()) { *result_listener << "at least one use not found; "; @@ -455,7 +455,7 @@ MATCHER_P(UsesInGetDependencies, uses, MATCHER_P(HasName, name_key, "object has name key " + PrintToString(name_key)) { auto arg_name = arg->get_name(); - if(darma_runtime::detail::key_traits::key_equal()(arg_name, name_key)) { + if(darma::detail::key_traits::key_equal()(arg_name, name_key)) { return true; } else { diff --git a/src/tests/frontend_validation/mock_backend.h b/src/tests/frontend_validation/mock_backend.h index eb1e9ab6..e292883b 100644 --- a/src/tests/frontend_validation/mock_backend.h +++ b/src/tests/frontend_validation/mock_backend.h @@ -62,25 +62,25 @@ namespace mock_backend { class MockRuntime - : public darma_runtime::abstract::backend::LegacyFlowsFromMethodsRuntime, - public darma_runtime::abstract::backend::Context, - public darma_runtime::abstract::backend::MemoryManager + : public darma::abstract::backend::LegacyFlowsFromMethodsRuntime, + public darma::abstract::backend::Context, + public darma::abstract::backend::MemoryManager { public: - using task_t = darma_runtime::abstract::backend::runtime_t::task_t; - using task_unique_ptr = darma_runtime::abstract::backend::runtime_t::task_unique_ptr; - using runtime_t = darma_runtime::abstract::backend::Runtime; - using handle_t = darma_runtime::abstract::frontend::Handle; - using use_t = darma_runtime::abstract::frontend::Use; - using destructible_use_t = darma_runtime::abstract::frontend::DestructibleUse; - using key_t = darma_runtime::types::key_t; - using publication_details_t = darma_runtime::abstract::frontend::PublicationDetails; - using flow_t = darma_runtime::types::flow_t; - using top_level_task_t = darma_runtime::abstract::backend::runtime_t::top_level_task_t; - using top_level_task_unique_ptr = darma_runtime::abstract::backend::runtime_t::top_level_task_unique_ptr; - using task_collection_t = darma_runtime::abstract::backend::runtime_t::task_collection_t; - using task_collection_unique_ptr = darma_runtime::abstract::backend::runtime_t::task_collection_unique_ptr; + using task_t = darma::abstract::backend::runtime_t::task_t; + using task_unique_ptr = darma::abstract::backend::runtime_t::task_unique_ptr; + using runtime_t = darma::abstract::backend::Runtime; + using handle_t = darma::abstract::frontend::Handle; + using use_t = darma::abstract::frontend::Use; + using destructible_use_t = darma::abstract::frontend::DestructibleUse; + using key_t = darma::types::key_t; + using publication_details_t = darma::abstract::frontend::PublicationDetails; + using flow_t = darma::types::flow_t; + using top_level_task_t = darma::abstract::backend::runtime_t::top_level_task_t; + using top_level_task_unique_ptr = darma::abstract::backend::runtime_t::top_level_task_unique_ptr; + using task_collection_t = darma::abstract::backend::runtime_t::task_collection_t; + using task_collection_unique_ptr = darma::abstract::backend::runtime_t::task_collection_unique_ptr; void register_task( @@ -103,7 +103,7 @@ class MockRuntime void publish_use( std::unique_ptr&& pub_use, - darma_runtime::abstract::frontend::PublicationDetails* details + darma::abstract::frontend::PublicationDetails* details ) override { publish_use_gmock_proxy(pub_use.get(), details); backend_owned_uses.emplace_back(std::move(pub_use)); @@ -111,7 +111,7 @@ class MockRuntime void allreduce_use( std::unique_ptr&& use_in_out, - darma_runtime::abstract::frontend::CollectiveDetails const* details, + darma::abstract::frontend::CollectiveDetails const* details, key_t const& tag ) override { allreduce_use_gmock_proxy(use_in_out.get(), details, tag); @@ -121,7 +121,7 @@ class MockRuntime void allreduce_use( std::unique_ptr&& use_in, std::unique_ptr&& use_out, - darma_runtime::abstract::frontend::CollectiveDetails const* details, + darma::abstract::frontend::CollectiveDetails const* details, key_t const& tag ) override { allreduce_use_gmock_proxy(use_in.get(), use_out.get(), details, tag); @@ -132,7 +132,7 @@ class MockRuntime void reduce_collection_use( std::unique_ptr&& use_collection_in, std::unique_ptr&& use_out, - darma_runtime::abstract::frontend::CollectiveDetails const* details, + darma::abstract::frontend::CollectiveDetails const* details, key_t const& tag ) override { reduce_collection_use_gmock_proxy(use_collection_in.get(), use_out.get(), @@ -155,19 +155,19 @@ class MockRuntime MOCK_METHOD1(register_task_gmock_proxy, void(task_t* task)); MOCK_METHOD1(register_task_collection_gmock_proxy, void(task_collection_t*)); MOCK_METHOD0(make_data_store, - std::shared_ptr() + std::shared_ptr() ); MOCK_CONST_METHOD0(get_running_task, task_t*()); MOCK_METHOD1(legacy_register_use, void( - darma_runtime::abstract::frontend::DependencyUse* + darma::abstract::frontend::DependencyUse* )); MOCK_METHOD1(reregister_migrated_use, void( - darma_runtime::abstract::frontend::RegisteredUse* + darma::abstract::frontend::RegisteredUse* )); MOCK_METHOD1(legacy_release_use, void( - darma_runtime::abstract::frontend::DependencyUse* + darma::abstract::frontend::DependencyUse* )); MOCK_METHOD1(make_initial_flow, flow_t(std::shared_ptr const&)); @@ -186,20 +186,20 @@ class MockRuntime MOCK_METHOD1(allocate, void*(std::size_t)); //MOCK_METHOD2(allocate, void*(size_t, - // darma_runtime::abstract::frontend::MemoryRequirementDetails const&)); + // darma::abstract::frontend::MemoryRequirementDetails const&)); MOCK_METHOD2(deallocate, void(void*, size_t)); MOCK_METHOD3(allreduce_use_gmock_proxy, void(use_t*, - darma_runtime::abstract::frontend::CollectiveDetails const*, + darma::abstract::frontend::CollectiveDetails const*, key_t const& )); MOCK_METHOD4(allreduce_use_gmock_proxy, void(use_t*, use_t*, - darma_runtime::abstract::frontend::CollectiveDetails const*, + darma::abstract::frontend::CollectiveDetails const*, key_t const& )); MOCK_METHOD4(reduce_collection_use_gmock_proxy, void(use_t*, use_t*, - darma_runtime::abstract::frontend::CollectiveDetails const*, + darma::abstract::frontend::CollectiveDetails const*, key_t const& )); MOCK_METHOD1(release_flow, void(flow_t&)); @@ -209,7 +209,7 @@ class MockRuntime MOCK_METHOD1(make_unpacked_flow, flow_t(void const*&)); #if _darma_has_feature(anti_flows) - using anti_flow_t = darma_runtime::types::anti_flow_t; + using anti_flow_t = darma::types::anti_flow_t; MOCK_METHOD1(get_packed_anti_flow_size, size_t(anti_flow_t const&)); MOCK_METHOD2(pack_anti_flow, void(anti_flow_t&, void*&)); @@ -225,8 +225,8 @@ class MockRuntime MOCK_METHOD1(make_next_flow_collection, flow_t(flow_t&)); // "New" methods - MOCK_METHOD1(register_use, void(darma_runtime::abstract::frontend::UsePendingRegistration*)); - MOCK_METHOD1(release_use, void(darma_runtime::abstract::frontend::UsePendingRelease*)); + MOCK_METHOD1(register_use, void(darma::abstract::frontend::UsePendingRegistration*)); + MOCK_METHOD1(release_use, void(darma::abstract::frontend::UsePendingRelease*)); #ifdef __clang__ #if __has_warning("-Winconsistent-missing-override") @@ -263,11 +263,11 @@ class MockRuntime void setup_legacy_delegators() { ON_CALL(*this, register_use(::testing::_)) .WillByDefault(::testing::Invoke([this](auto* use) { - this->darma_runtime::abstract::backend::LegacyFlowsFromMethodsRuntime::register_use(use); + this->darma::abstract::backend::LegacyFlowsFromMethodsRuntime::register_use(use); })); ON_CALL(*this, release_use(::testing::_)) .WillByDefault(::testing::Invoke([this](auto* use) { - this->darma_runtime::abstract::backend::LegacyFlowsFromMethodsRuntime::release_use(use); + this->darma::abstract::backend::LegacyFlowsFromMethodsRuntime::release_use(use); })); } @@ -281,7 +281,7 @@ class MockRuntime class MockSerializationPolicy - : public darma_runtime::abstract::backend::SerializationPolicy + : public darma::abstract::backend::SerializationPolicy { public: @@ -292,7 +292,7 @@ class MockSerializationPolicy }; struct MockConcurrentRegionContextHandle - : public darma_runtime::abstract::backend::TaskCollectionContextHandle + : public darma::abstract::backend::TaskCollectionContextHandle { public: MOCK_CONST_METHOD0(get_backend_index, size_t()); diff --git a/src/tests/frontend_validation/mock_free_functions.h b/src/tests/frontend_validation/mock_free_functions.h index 446c8ad3..2c4d0481 100644 --- a/src/tests/frontend_validation/mock_free_functions.h +++ b/src/tests/frontend_validation/mock_free_functions.h @@ -61,16 +61,16 @@ #include -namespace darma_runtime { +namespace darma { namespace backend { -using namespace darma_runtime::types; +using namespace darma::types; -inline runtime_context_token_t create_runtime_context(darma_runtime::types::MPI_Comm) {return { 1 };} +inline runtime_context_token_t create_runtime_context(darma::types::MPI_Comm) {return { 1 };} inline piecewise_collection_token_t register_piecewise_collection(runtime_context_token_t, - std::shared_ptr, + std::shared_ptr, size_t ) { return piecewise_collection_token_t(); @@ -94,7 +94,7 @@ run_distributed_region( std::function ) { } -inline void run_distributed_region_worker(darma_runtime::types::runtime_context_token_t) { } +inline void run_distributed_region_worker(darma::types::runtime_context_token_t) { } inline void release_piecewise_collection( @@ -108,7 +108,7 @@ release_persistent_collection( types::persistent_collection_token_t ) { /* TODO trigger mock here */ } -inline void conversion_to_ahc(double,darma_runtime::AccessHandleCollection>) { } +inline void conversion_to_ahc(double,darma::AccessHandleCollection>) { } } // end namespace backend diff --git a/src/tests/frontend_validation/mock_key.h b/src/tests/frontend_validation/mock_key.h index 63084054..8ebb47ec 100644 --- a/src/tests/frontend_validation/mock_key.h +++ b/src/tests/frontend_validation/mock_key.h @@ -96,15 +96,15 @@ struct StreamKey { public: - StreamKey() : StreamKey(darma_runtime::detail::variadic_constructor_arg) { } + StreamKey() : StreamKey(darma::detail::variadic_constructor_arg) { } template explicit StreamKey( - const darma_runtime::detail::variadic_constructor_arg_t, + const darma::detail::variadic_constructor_arg_t, Types&&... data ) { std::stringstream sstr; - darma_runtime::meta::tuple_for_each(std::make_tuple(data...), [&sstr](const auto& val) { + darma::meta::tuple_for_each(std::make_tuple(data...), [&sstr](const auto& val) { sstr << val << std::endl; }); val_ = sstr.str(); @@ -116,7 +116,7 @@ struct StreamKey { std::tuple&& data ) { std::stringstream sstr; - darma_runtime::meta::tuple_for_each(data, [&sstr](const auto& val) { + darma::meta::tuple_for_each(data, [&sstr](const auto& val) { sstr << val << std::endl; }); val_ = sstr.str(); @@ -188,7 +188,7 @@ inline std::ostream& operator<<(std::ostream& o, StreamKey const& k) { } // end namespace mock_backend -namespace darma_runtime { +namespace darma { namespace detail { @@ -225,7 +225,7 @@ struct key_traits } // end namespace detail -} // end namespace darma_runtime +} // end namespace darma namespace std { diff --git a/src/tests/frontend_validation/test_access_handle.cc b/src/tests/frontend_validation/test_access_handle.cc index c483e7c2..1e178ea1 100644 --- a/src/tests/frontend_validation/test_access_handle.cc +++ b/src/tests/frontend_validation/test_access_handle.cc @@ -73,7 +73,7 @@ class TestAccessHandle_publish_MM_Test; //////////////////////////////////////////////////////////////////////////////// // Static traits tests -using namespace darma_runtime; +using namespace darma; STATIC_ASSERT_TYPE_EQ( AccessHandle& h) { } TEST_F(TestAccessHandle, function_call) { @@ -143,9 +143,9 @@ TEST_F(TestAccessHandle, function_call) { /* TEST_F(TestAccessHandle, get_reference) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -208,9 +208,9 @@ TEST_F(TestAccessHandle, get_reference) { // //TEST_F(TestAccessHandle, set_value) { // using namespace ::testing; -// using namespace darma_runtime; +// using namespace darma; // using namespace mock_backend; -// using namespace darma_runtime::keyword_arguments_for_publication; +// using namespace darma::keyword_arguments_for_publication; // // mock_runtime->save_tasks = true; // @@ -253,9 +253,9 @@ TEST_F(TestAccessHandle, get_reference) { // //TEST_F(TestAccessHandle, publish_MN) { // using namespace ::testing; -// using namespace darma_runtime; +// using namespace darma; // using namespace mock_backend; -// using namespace darma_runtime::keyword_arguments_for_publication; +// using namespace darma::keyword_arguments_for_publication; // // mock_runtime->save_tasks = false; // @@ -298,9 +298,9 @@ TEST_F(TestAccessHandle, get_reference) { // //TEST_F(TestAccessHandle, publish_MM) { // using namespace ::testing; -// using namespace darma_runtime; +// using namespace darma; // using namespace mock_backend; -// using namespace darma_runtime::keyword_arguments_for_publication; +// using namespace darma::keyword_arguments_for_publication; // // mock_runtime->save_tasks = true; // @@ -365,9 +365,9 @@ TEST_F(TestAccessHandle, get_reference) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_capture_released) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -394,9 +394,9 @@ TEST_F(TestAccessHandle, death_capture_released) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_publish_released) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -420,9 +420,9 @@ TEST_F(TestAccessHandle, death_publish_released) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_get_value) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -442,9 +442,9 @@ TEST_F(TestAccessHandle, death_get_value) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_set_value) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -464,9 +464,9 @@ TEST_F(TestAccessHandle, death_set_value) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_get_reference) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -486,9 +486,9 @@ TEST_F(TestAccessHandle, death_get_reference) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_set_value_2) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; EXPECT_DEATH( { @@ -512,9 +512,9 @@ TEST_F(TestAccessHandle, death_set_value_2) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_get_value_after_release) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; EXPECT_DEATH( { @@ -540,9 +540,9 @@ TEST_F(TestAccessHandle, death_get_value_after_release) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_emplace_value_after_release) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; EXPECT_DEATH( { @@ -568,9 +568,9 @@ TEST_F(TestAccessHandle, death_emplace_value_after_release) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_dereference) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; @@ -591,9 +591,9 @@ TEST_F(TestAccessHandle, death_dereference) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestAccessHandle, death_dereference_arrow) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_validation/test_anti_flows.cc b/src/tests/frontend_validation/test_anti_flows.cc index bce4a6cf..b63f3aa5 100644 --- a/src/tests/frontend_validation/test_anti_flows.cc +++ b/src/tests/frontend_validation/test_anti_flows.cc @@ -91,7 +91,7 @@ class TestAntiFlows TEST_F(TestAntiFlows, high_level_example_0) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; DECLARE_MOCK_FLOWS(f0, f1, f2); DECLARE_MOCK_ANTI_FLOWS(fbar0, fbar1); @@ -182,7 +182,7 @@ TEST_F(TestAntiFlows, high_level_example_0) { TEST_F(TestAntiFlows, high_level_example_1) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; DECLARE_MOCK_FLOWS(f0, f1, f2, f3, f4, f5, f6); DECLARE_MOCK_ANTI_FLOWS(fbar0, fbar1, fbar2, fbar3, fbar4, fbar5); @@ -372,7 +372,7 @@ TEST_F(TestAntiFlows, high_level_example_1) { TEST_F(TestAntiFlows, high_level_example_3) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; DECLARE_MOCK_FLOWS(f0, f1, f2, f3, f4, f5, f6, f7, f8, f9); DECLARE_MOCK_ANTI_FLOWS(fbar1, fbar2, fbar3, fbar4, fbar5, fbar6, fbar7, fbar8); diff --git a/src/tests/frontend_validation/test_array.cc b/src/tests/frontend_validation/test_array.cc index 8eefa269..f157e9f8 100644 --- a/src/tests/frontend_validation/test_array.cc +++ b/src/tests/frontend_validation/test_array.cc @@ -50,8 +50,8 @@ #include #include -using namespace darma_runtime; -using namespace darma_runtime::detail; +using namespace darma; +using namespace darma::detail; TEST(TestIndexDecomposition, vector_simple) { using namespace ::testing; @@ -80,7 +80,7 @@ TEST(TestIndexDecomposition, vector_pack) { std::vector v = { 3, 1, 4, 1, 5, 9 }; serialization::SimplePackUnpackArchive ar; - using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; + using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; ArchiveAccess::start_sizing(ar); traits::get_packed_size(v, ar, 1, 5); diff --git a/src/tests/frontend_validation/test_collectives.cc b/src/tests/frontend_validation/test_collectives.cc index d805ff47..debc59d0 100644 --- a/src/tests/frontend_validation/test_collectives.cc +++ b/src/tests/frontend_validation/test_collectives.cc @@ -121,10 +121,10 @@ struct Test_simple_allreduce TEST_P(Test_simple_allreduce, overloads) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_collectives; + using namespace darma; + using namespace darma::keyword_arguments_for_collectives; using namespace mock_backend; - using darma_runtime::frontend::Permissions; + using darma::frontend::Permissions; mock_runtime->save_tasks = true; @@ -219,10 +219,10 @@ struct Test_different_inout_allreduce TEST_P(Test_different_inout_allreduce, overload) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_collectives; + using namespace darma; + using namespace darma::keyword_arguments_for_collectives; using namespace mock_backend; - using darma_runtime::frontend::Permissions; + using darma::frontend::Permissions; mock_runtime->save_tasks = true; @@ -327,8 +327,8 @@ INSTANTIATE_TEST_CASE_P( //////////////////////////////////////////////////////////////////////////////// //TEST(TestReduceOp, string) { -// using namespace darma_runtime; -// using namespace darma_runtime::detail; +// using namespace darma; +// using namespace darma::detail; // // auto* reduce_op = _impl::_get_static_reduce_op_instance< // detail::ReduceOperationWrapper< Add, std::string > diff --git a/src/tests/frontend_validation/test_create_parallel_for.cc b/src/tests/frontend_validation/test_create_parallel_for.cc index 27aab197..60cd36b1 100644 --- a/src/tests/frontend_validation/test_create_parallel_for.cc +++ b/src/tests/frontend_validation/test_create_parallel_for.cc @@ -80,9 +80,9 @@ class TestCreateParallelFor //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, simple_lambda) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -103,9 +103,9 @@ TEST_F(TestCreateParallelFor, simple_lambda) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, simple_lambda_capture) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -154,9 +154,9 @@ TEST_F(TestCreateParallelFor, simple_lambda_capture) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, simple_functor) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -181,9 +181,9 @@ TEST_F(TestCreateParallelFor, simple_functor) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, simple_functor_args) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -210,9 +210,9 @@ TEST_F(TestCreateParallelFor, simple_functor_args) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, functor_args) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -266,9 +266,9 @@ TEST_F(TestCreateParallelFor, functor_args) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateParallelFor, resource_pack_passthrough) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_validation/test_create_work.cc b/src/tests/frontend_validation/test_create_work.cc index da7a392a..145131ed 100644 --- a/src/tests/frontend_validation/test_create_work.cc +++ b/src/tests/frontend_validation/test_create_work.cc @@ -85,8 +85,8 @@ struct TestModCaptureMN TEST_P(TestModCaptureMN, mod_capture_MN) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -155,8 +155,8 @@ INSTANTIATE_TEST_CASE_P( TEST_F(TestCreateWork, mod_capture_MN_vector) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; DECLARE_MOCK_FLOWS(finit1, finit2, fnull1, fnull2, fout1, fout2); @@ -218,8 +218,8 @@ struct TestRoCaptureRN TEST_P(TestRoCaptureRN, ro_capture_RN) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -239,7 +239,7 @@ TEST_P(TestRoCaptureRN, ro_capture_RN) { // ro-capture of RN EXPECT_CALL(*mock_runtime, register_use(IsUseWithFlows( - &f_fetch, &f_fetch, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + &f_fetch, &f_fetch, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read ))).WillOnce(SaveArg<0>(&read_use)); } @@ -284,8 +284,8 @@ struct TestCaptureMM TEST_P(TestCaptureMM, capture_MM) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; bool ro_capture = std::get<0>(GetParam()); @@ -399,9 +399,9 @@ TEST_P(TestCaptureMM, capture_MM) { EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( #if _darma_has_feature(anti_flows) - f_forwarded, nullptr, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + f_forwarded, nullptr, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read #else - f_forwarded, f_forwarded, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read + f_forwarded, f_forwarded, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read #endif // _darma_has_feature(anti_flows) ))).WillOnce(Invoke([&](auto&& use){ use->get_data_pointer_reference() = (void*)(&value); @@ -409,7 +409,7 @@ TEST_P(TestCaptureMM, capture_MM) { })); // Expect the continuing context use to be registered after the captured context EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( - f_forwarded, f_outer_out, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Read + f_forwarded, f_outer_out, darma::frontend::Permissions::Modify, darma::frontend::Permissions::Read ))).WillOnce(Invoke([&](auto&& use){ // Shouldn't be necessary // use->get_data_pointer_reference() = (void*)(&value); @@ -453,9 +453,9 @@ INSTANTIATE_TEST_CASE_P( TEST_F(TestCreateWork, named_task) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; EXPECT_CALL(*mock_runtime, @@ -479,9 +479,9 @@ TEST_F(TestCreateWork, named_task) { TEST_F(TestCreateWork, handle_aliasing) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -534,9 +534,9 @@ struct TestScheduleOnly TEST_P(TestScheduleOnly, schedule_only) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -668,9 +668,9 @@ INSTANTIATE_TEST_CASE_P( #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestCreateWork, death_schedule_only) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_publication; MockFlow finit, fnull, f_sched_out; use_t* use_sched_capt = nullptr; @@ -721,8 +721,8 @@ TEST_F(TestCreateWork, death_schedule_only) { #if 0 TEST_F(TestCreateWork, mod_capture_MN_nested_MR) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -835,9 +835,9 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, ::testing::Values(0, 1, 2, 3, 4, 5, 6), int ) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_commutative_access; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_commutative_access; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -883,14 +883,14 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, [&](abstract::frontend::DependencyUse* use) { return use->get_in_flow() == fcomm_out && use->get_out_flow() == fnull - && use->immediate_permissions() == darma_runtime::frontend::Permissions::None + && use->immediate_permissions() == darma::frontend::Permissions::None && ( // The ones that don't do explicit releases will have "None" scheduling // permissions on the last use ((semantic_mode == 0 || semantic_mode > 3) - && use->scheduling_permissions() == darma_runtime::frontend::Permissions::Modify) + && use->scheduling_permissions() == darma::frontend::Permissions::Modify) || ((semantic_mode == 1 || semantic_mode == 2 || semantic_mode == 3) - && use->scheduling_permissions() == darma_runtime::frontend::Permissions::None) + && use->scheduling_permissions() == darma::frontend::Permissions::None) ); } ))).WillOnce(SaveArg<0>(&last_use)); @@ -1020,7 +1020,7 @@ TEST_F_WITH_PARAMS(TestCreateWork, comm_capture_cc_from_mn, TEST_F(TestCreateWork, mod_capture_new) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1078,7 +1078,7 @@ TEST_F(TestCreateWork, mod_capture_new) { TEST_F(TestCreateWork, mod_capture_new_track_same) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_validation/test_create_work_if.cc b/src/tests/frontend_validation/test_create_work_if.cc index 8220e65b..57682a92 100644 --- a/src/tests/frontend_validation/test_create_work_if.cc +++ b/src/tests/frontend_validation/test_create_work_if.cc @@ -73,8 +73,8 @@ class TestCreateWorkIf }; -using namespace darma_runtime; -using namespace darma_runtime::experimental; +using namespace darma; +using namespace darma::experimental; //////////////////////////////////////////////////////////////////////////////// @@ -84,9 +84,9 @@ using namespace darma_runtime::experimental; //{ }; TEST_F(TestCreateWorkIf, basic_same_always_false) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -145,9 +145,9 @@ TEST_F(TestCreateWorkIf, basic_same_always_false) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_same_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -240,9 +240,9 @@ TEST_F(TestCreateWorkIf, basic_same_always_true) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_same_always_true_functor) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -340,9 +340,9 @@ TEST_F(TestCreateWorkIf, basic_same_always_true_functor) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_different_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -444,9 +444,9 @@ TEST_F(TestCreateWorkIf, basic_different_always_true) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, if_else_same_different_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -556,9 +556,9 @@ TEST_F(TestCreateWorkIf, if_else_same_different_always_true) { // TODO make this and the next one into a parameterized test TEST_F(TestCreateWorkIf, if_else_same_same_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -646,9 +646,9 @@ TEST_F(TestCreateWorkIf, if_else_same_same_always_true) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, if_else_same_same_always_false) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -730,9 +730,9 @@ TEST_F(TestCreateWorkIf, if_else_same_same_always_false) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_same_read_only) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -810,9 +810,9 @@ TEST_F(TestCreateWorkIf, basic_same_read_only) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_same_read_only_write_else) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -897,9 +897,9 @@ TEST_F(TestCreateWorkIf, basic_same_read_only_write_else) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, basic_same_true_if_lambda_then_functor) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -989,9 +989,9 @@ TEST_F(TestCreateWorkIf, basic_same_true_if_lambda_then_functor) { TEST_F(TestCreateWorkIf, same_false_if_lambda_then_lambda_else_functor) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1089,9 +1089,9 @@ struct TestFunctorLambdaTrueFalse { }; TEST_P(TestFunctorLambdaTrueFalse, same_if_then_else) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1255,9 +1255,9 @@ INSTANTIATE_TEST_CASE_P( //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, multiple_different_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; - using namespace darma_runtime::keyword_arguments_for_parallel_for; + using namespace darma::keyword_arguments_for_parallel_for; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1386,10 +1386,10 @@ TEST_F(TestCreateWorkIf, multiple_different_always_true) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkIf, collection_then_always_true) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments; + using namespace darma::keyword_arguments; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_validation/test_create_work_while.cc b/src/tests/frontend_validation/test_create_work_while.cc index 10d6adb3..d7bf6768 100644 --- a/src/tests/frontend_validation/test_create_work_while.cc +++ b/src/tests/frontend_validation/test_create_work_while.cc @@ -73,7 +73,7 @@ class TestCreateWorkWhile }; -using namespace darma_runtime; +using namespace darma; //////////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_always_false, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -174,7 +174,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_always_false, //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, two_same_always_false) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -265,7 +265,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, two_handles_one_iteration, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -499,7 +499,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, one_handle_four_iterations, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -697,7 +697,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, two_handles_one_iteration_two_in_while, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -900,7 +900,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_one_iteration, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1056,7 +1056,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_one_iteration, //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, basic_different_always_false) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1132,7 +1132,7 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_four_iterations, ::testing::Combine(::testing::Bool(), ::testing::Bool()), std::tuple ) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1321,10 +1321,10 @@ TEST_F_WITH_PARAMS(TestCreateWorkWhile, basic_same_four_iterations, //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, collection_one_iteration) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments; + using namespace darma::keyword_arguments; mock_runtime->save_tasks = true; @@ -1568,7 +1568,7 @@ TEST_F(TestCreateWorkWhile, collection_one_iteration) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, functor_same_always_false) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1630,7 +1630,7 @@ TEST_F(TestCreateWorkWhile, functor_same_always_false) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, while_nested_read) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1797,7 +1797,7 @@ TEST_F(TestCreateWorkWhile, while_nested_read) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, basic_same_one_iter_nested) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; @@ -1924,10 +1924,10 @@ TEST_F(TestCreateWorkWhile, basic_same_one_iter_nested) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestCreateWorkWhile, basic_coll_one_iter_nested) { - using namespace darma_runtime; + using namespace darma; using namespace ::testing; using namespace mock_backend; - using namespace darma_runtime::keyword_arguments; + using namespace darma::keyword_arguments; mock_runtime->save_tasks = true; @@ -2108,10 +2108,10 @@ TEST_F(TestCreateWorkWhile, basic_coll_one_iter_nested) { //////////////////////////////////////////////////////////////////////////////// //TEST_F(TestCreateWorkWhile, nested_in_call_two_iters) { -// using namespace darma_runtime; +// using namespace darma; // using namespace ::testing; // using namespace mock_backend; -// using namespace darma_runtime::keyword_arguments; +// using namespace darma::keyword_arguments; // // // diff --git a/src/tests/frontend_validation/test_frontend.h b/src/tests/frontend_validation/test_frontend.h index a5087165..a758dc47 100644 --- a/src/tests/frontend_validation/test_frontend.h +++ b/src/tests/frontend_validation/test_frontend.h @@ -91,7 +91,7 @@ extern ::testing::StrictMock* sequence_marker; extern std::unique_ptr mock_runtime; -namespace darma_runtime { +namespace darma { namespace abstract { namespace backend { @@ -109,7 +109,7 @@ inline MemoryManager* get_backend_memory_manager() { } // end namespace backend } // end namespace abstract -} // end namespace darma_runtime +} // end namespace darma //============================================================================== // @@ -153,16 +153,16 @@ struct UseDescription { mock_backend::MockFlow expected_in_flow; mock_backend::MockFlow expected_out_flow; std::string var_name; - darma_runtime::abstract::frontend::Use::permissions_t expected_sched_permissions; - darma_runtime::abstract::frontend::Use::permissions_t expected_immed_permissions; + darma::abstract::frontend::Use::permissions_t expected_sched_permissions; + darma::abstract::frontend::Use::permissions_t expected_immed_permissions; UseDescription() = default; UseDescription(UseDescription const&) = default; UseDescription( std::string const& name, mock_backend::MockFlow in, mock_backend::MockFlow out, - darma_runtime::abstract::frontend::Use::permissions_t sched, - darma_runtime::abstract::frontend::Use::permissions_t immed + darma::abstract::frontend::Use::permissions_t sched, + darma::abstract::frontend::Use::permissions_t immed ) : var_name(name), expected_in_flow(in), expected_out_flow(out), expected_sched_permissions(sched), expected_immed_permissions(immed) @@ -183,16 +183,16 @@ struct UseDescription { #define EXPECT_FIRST_TASK_RUNNING() \ EXPECT_CALL(*mock_runtime, get_running_task()) \ - .WillRepeatedly(::testing::Return((darma_runtime::abstract::frontend::Task*)mock_runtime->registered_tasks.front().get())) + .WillRepeatedly(::testing::Return((darma::abstract::frontend::Task*)mock_runtime->registered_tasks.front().get())) #define EXPECT_REGISTER_USE(use_ptr, fin, fout, sched, immed) \ ::_impl::in_sequence_wrapper( \ EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( \ - fin, fout, ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + fin, fout, ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ))), [&](auto&& exp) -> decltype(auto) { \ return exp.WillOnce(::testing::Invoke([&](auto&& use_arg) { \ use_ptr = use_arg; \ - described_uses_[use_ptr] = ::_impl::UseDescription(#use_ptr, fin, fout, ::darma_runtime::frontend::Permissions::sched, darma_runtime::frontend::Permissions::immed); \ + described_uses_[use_ptr] = ::_impl::UseDescription(#use_ptr, fin, fout, ::darma::frontend::Permissions::sched, darma::frontend::Permissions::immed); \ })); \ } \ ) @@ -200,11 +200,11 @@ struct UseDescription { #define EXPECT_REGISTER_USE_AND_SET_BUFFER(use_ptr, fin, fout, sched, immed, value) \ ::_impl::in_sequence_wrapper( \ EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( \ - fin, fout, ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + fin, fout, ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ))), [&](auto&& exp) -> decltype(auto) { return exp.WillOnce( \ ::testing::Invoke( \ [&](auto&& use_arg) { use_ptr = use_arg; \ - described_uses_[use_ptr] = _impl::UseDescription(#use_ptr, fin, fout, ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed); \ + described_uses_[use_ptr] = _impl::UseDescription(#use_ptr, fin, fout, ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed); \ use_arg->get_data_pointer_reference() = &value; \ } \ )); } \ @@ -275,7 +275,7 @@ struct UseDescription { #define EXPECT_RO_CAPTURE_RN_RR_MN_OR_MR(fread, use_ptr) \ EXPECT_CALL(*mock_runtime, legacy_register_use( \ IsUseWithInFlow( \ - fread, ::darma_runtime::frontend::Permissions::_notGiven /* i.e, anything */, ::darma_runtime::frontend::Permissions::Read \ + fread, ::darma::frontend::Permissions::_notGiven /* i.e, anything */, ::darma::frontend::Permissions::Read \ ) \ )).WillOnce(SaveArg<0>(&use_ptr)) @@ -283,7 +283,7 @@ struct UseDescription { #define EXPECT_RO_CAPTURE_RN_RR_MN_OR_MR_AND_SET_BUFFER(fread, use_ptr, value) \ EXPECT_CALL(*mock_runtime, legacy_register_use( \ IsUseWithInFlow( \ - fread, ::darma_runtime::frontend::Permissions::_notGiven /* i.e., anything */, ::darma_runtime::frontend::Permissions::Read \ + fread, ::darma::frontend::Permissions::_notGiven /* i.e., anything */, ::darma::frontend::Permissions::Read \ ) \ )).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ use_ptr = use_arg; use_arg->get_data_pointer_reference() = &value; \ @@ -304,9 +304,9 @@ struct UseDescription { #define EXPECT_NEW_REGISTER_USE(use_ptr, fin, fin_rel, fin_src, fout, fout_rel, fout_src, out_rel_is_in, sched, immed, will_be_dep) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ UseWillBeDependency(will_be_dep) \ ))).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ @@ -324,13 +324,13 @@ struct UseDescription { ) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_desc, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_desc, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_desc, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_desc, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ IsUseWithAntiFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fantiin_desc, fantiin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fantiout_desc, fantiout_src, antiout_rel_is_anti_in \ + ::darma::abstract::frontend::FlowRelationship::fantiin_desc, fantiin_src, \ + ::darma::abstract::frontend::FlowRelationship::fantiout_desc, fantiout_src, antiout_rel_is_anti_in \ ), \ UseWillBeDependency(will_be_dep) \ ))).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ @@ -350,13 +350,13 @@ struct UseDescription { ) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_desc, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_desc, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_desc, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_desc, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ IsUseWithAntiFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fantiin_desc, fantiin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fantiout_desc, fantiout_src, antiout_rel_is_anti_in \ + ::darma::abstract::frontend::FlowRelationship::fantiin_desc, fantiin_src, \ + ::darma::abstract::frontend::FlowRelationship::fantiout_desc, fantiout_src, antiout_rel_is_anti_in \ ), \ UseWillBeDependency(will_be_dep) \ ))).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ @@ -365,7 +365,7 @@ struct UseDescription { use_arg->set_out_flow(fout); \ use_arg->set_anti_in_flow(fanti_in); \ use_arg->set_anti_out_flow(fanti_out); \ - ::darma_runtime::abstract::frontend::use_cast<::darma_runtime::abstract::frontend::DependencyUse*>( \ + ::darma::abstract::frontend::use_cast<::darma::abstract::frontend::DependencyUse*>( \ use_ptr \ )->get_data_pointer_reference() = &(value); \ })) @@ -373,16 +373,16 @@ struct UseDescription { #define EXPECT_NEW_REGISTER_USE_AND_SET_BUFFER(use_ptr, fin, fin_rel, fin_src, fout, fout_rel, fout_src, out_rel_is_in, sched, immed, will_be_dep, value) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ UseWillBeDependency(will_be_dep) \ ))).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ use_ptr = use_arg; \ use_arg->set_in_flow(fin); \ use_arg->set_out_flow(fout); \ - ::darma_runtime::abstract::frontend::use_cast<::darma_runtime::abstract::frontend::DependencyUse*>( \ + ::darma::abstract::frontend::use_cast<::darma::abstract::frontend::DependencyUse*>( \ use_ptr \ )->get_data_pointer_reference() = &(value); \ })) @@ -390,9 +390,9 @@ struct UseDescription { #define EXPECT_NEW_REGISTER_USE_WITH_EXTRA_CONSTRAINTS(use_ptr, fin, fin_rel, fin_src, fout, fout_rel, fout_src, out_rel_is_in, sched, immed, will_be_dep, extra_constraints...) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ UseWillBeDependency(will_be_dep), \ extra_constraints \ @@ -408,9 +408,9 @@ struct UseDescription { ) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_rel, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_rel, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ UseWillBeDependency(will_be_dep), \ extra_constraints \ @@ -418,7 +418,7 @@ struct UseDescription { use_ptr = use_arg; \ use_arg->set_in_flow(fin); \ use_arg->set_out_flow(fout); \ - ::darma_runtime::abstract::frontend::use_cast<::darma_runtime::abstract::frontend::DependencyUse*>( \ + ::darma::abstract::frontend::use_cast<::darma::abstract::frontend::DependencyUse*>( \ use_ptr \ )->get_data_pointer_reference() = &(value); \ })) @@ -426,17 +426,17 @@ struct UseDescription { #define EXPECT_NEW_REGISTER_USE_COLLECTION(use_ptr, fin, fin_rel, fin_src, \ fout, fout_rel, fout_src, out_rel_is_in, sched, immed, will_be_dep, collsize) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf(IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::fin_rel|::darma_runtime::abstract::frontend::FlowRelationship::Collection, fin_src, \ - ::darma_runtime::abstract::frontend::FlowRelationship::fout_rel|::darma_runtime::abstract::frontend::FlowRelationship::Collection, fout_src, out_rel_is_in, \ - ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed \ + ::darma::abstract::frontend::FlowRelationship::fin_rel|::darma::abstract::frontend::FlowRelationship::Collection, fin_src, \ + ::darma::abstract::frontend::FlowRelationship::fout_rel|::darma::abstract::frontend::FlowRelationship::Collection, fout_src, out_rel_is_in, \ + ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed \ ), \ UseWillBeDependency(will_be_dep), \ ::testing::Truly([=](auto* use){ \ return ( \ use->manages_collection() \ and \ - ::darma_runtime::abstract::frontend::use_cast< \ - ::darma_runtime::abstract::frontend::CollectionManagingUse* \ + ::darma::abstract::frontend::use_cast< \ + ::darma::abstract::frontend::CollectionManagingUse* \ >(use)->get_managed_collection()->size() == collsize \ ); \ })))).WillOnce(::testing::Invoke([&](auto&& use_arg) { \ @@ -448,9 +448,9 @@ struct UseDescription { #define EXPECT_NEW_INITIAL_ACCESS(fin, fout, use_ptr, key) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::Initial, nullptr, \ - ::darma_runtime::abstract::frontend::FlowRelationship::Null, nullptr, false, \ - ::darma_runtime::frontend::Permissions::Modify, ::darma_runtime::frontend::Permissions::None \ + ::darma::abstract::frontend::FlowRelationship::Initial, nullptr, \ + ::darma::abstract::frontend::FlowRelationship::Null, nullptr, false, \ + ::darma::frontend::Permissions::Modify, ::darma::frontend::Permissions::None \ ), \ UseWillBeDependency(false), \ IsUseWithHandleKey(key) \ @@ -463,9 +463,9 @@ struct UseDescription { #define EXPECT_NEW_INITIAL_ACCESS_COLLECTION(fin, fout, use_ptr, key, collsize) \ EXPECT_CALL(*mock_runtime, register_use(::testing::AllOf( \ IsUseWithFlowRelationships( \ - ::darma_runtime::abstract::frontend::FlowRelationship::InitialCollection, nullptr, \ - ::darma_runtime::abstract::frontend::FlowRelationship::NullCollection, nullptr, false, \ - ::darma_runtime::frontend::Permissions::Modify, ::darma_runtime::frontend::Permissions::None \ + ::darma::abstract::frontend::FlowRelationship::InitialCollection, nullptr, \ + ::darma::abstract::frontend::FlowRelationship::NullCollection, nullptr, false, \ + ::darma::frontend::Permissions::Modify, ::darma::frontend::Permissions::None \ ), \ UseWillBeDependency(false), \ IsUseWithHandleKey(key), \ @@ -473,8 +473,8 @@ struct UseDescription { return ( \ use->manages_collection() \ and \ - ::darma_runtime::abstract::frontend::use_cast< \ - ::darma_runtime::abstract::frontend::CollectionManagingUse* \ + ::darma::abstract::frontend::use_cast< \ + ::darma::abstract::frontend::CollectionManagingUse* \ >(use)->get_managed_collection()->size() == collsize \ ); \ }) \ @@ -539,13 +539,13 @@ auto make_flows(char const* names) { #define EXPECT_REGISTER_USE_COLLECTION(use_coll, fin, fout, sched, immed, collsize) \ EXPECT_CALL(*mock_runtime, legacy_register_use(::testing::AllOf( \ - IsUseWithFlows(fin, fout, ::darma_runtime::frontend::Permissions::sched, ::darma_runtime::frontend::Permissions::immed), \ + IsUseWithFlows(fin, fout, ::darma::frontend::Permissions::sched, ::darma::frontend::Permissions::immed), \ ::testing::Truly([=](auto* use){ \ return ( \ use->manages_collection() \ and \ - ::darma_runtime::abstract::frontend::use_cast< \ - ::darma_runtime::abstract::frontend::CollectionManagingUse* \ + ::darma::abstract::frontend::use_cast< \ + ::darma::abstract::frontend::CollectionManagingUse* \ >(use)->get_managed_collection()->size() == collsize \ ); \ }) \ @@ -567,10 +567,10 @@ class TestFrontend { public: - typedef darma_runtime::abstract::backend::runtime_t::task_t task_t; - typedef darma_runtime::types::key_t key_t; - using use_t = darma_runtime::abstract::frontend::Use; - using handle_t = darma_runtime::abstract::frontend::Handle; + typedef darma::abstract::backend::runtime_t::task_t task_t; + typedef darma::types::key_t key_t; + using use_t = darma::abstract::frontend::Use; + using handle_t = darma::abstract::frontend::Handle; using flow_t = mock_backend::MockFlow; protected: @@ -580,7 +580,7 @@ class TestFrontend int argc = 1; char const* args[] = { "" }; char** argv = const_cast(&args[0]); - top_level_task = darma_runtime::frontend::darma_top_level_setup( + top_level_task = darma::frontend::darma_top_level_setup( argc, argv ); } @@ -621,7 +621,7 @@ class TestFrontend } auto is_handle_with_key( - darma_runtime::types::key_t const& key + darma::types::key_t const& key ) { return ::testing::Truly([=](auto&& h) { return h->get_key() == key; @@ -663,7 +663,7 @@ class TestFrontend namespace std { -using use_t = darma_runtime::abstract::frontend::Use; +using use_t = darma::abstract::frontend::Use; inline std::ostream& operator<<(std::ostream& o, use_t* const& u) { @@ -685,12 +685,12 @@ operator<<(std::ostream& o, use_t* const& u) { if(handle) { o << "get_key() << "}, in_flow " - << darma_runtime::abstract::frontend::use_cast< - darma_runtime::abstract::frontend::RegisteredUse* + << darma::abstract::frontend::use_cast< + darma::abstract::frontend::RegisteredUse* >(u)->get_in_flow() << ", out_flow" - << darma_runtime::abstract::frontend::use_cast< - darma_runtime::abstract::frontend::RegisteredUse* + << darma::abstract::frontend::use_cast< + darma::abstract::frontend::RegisteredUse* >(u)->get_out_flow() << ", sched=" << permissions_to_string(u->scheduling_permissions()) << ", immed=" diff --git a/src/tests/frontend_validation/test_functor.cc b/src/tests/frontend_validation/test_functor.cc index b523254d..f76048a2 100644 --- a/src/tests/frontend_validation/test_functor.cc +++ b/src/tests/frontend_validation/test_functor.cc @@ -142,7 +142,7 @@ struct SimpleFunctorWithDowngradePermissions { } static void permissions_downgrades(AccessHandle handle) { - darma_runtime::detail::permissions_downgrades(reads(handle)); + darma::detail::permissions_downgrades(reads(handle)); } }; @@ -164,7 +164,7 @@ struct SimpleFunctorWithRequiredPermissions { } static void required_permissions(AccessHandle handle1, AccessHandle handle2) { - darma_runtime::detail::required_permissions(reads(handle2)); + darma::detail::required_permissions(reads(handle2)); } }; @@ -199,7 +199,7 @@ TEST_F(TestFunctor, simpler) { TEST_F(TestFunctor, simpler_named) { using namespace ::testing; testing::internal::CaptureStdout(); - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_task_creation; mock_runtime->save_tasks = true; @@ -229,7 +229,7 @@ struct TestFunctorModCaptures TEST_P(TestFunctorModCaptures, Parametrized) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; static_assert(std::is_convertible>::value, "any_arg not convertible!"); @@ -254,18 +254,18 @@ TEST_P(TestFunctorModCaptures, Parametrized) { EXPECT_CALL(*mock_runtime, make_next_flow(f_initial)) .WillOnce(Return(f_task_out)); - darma_runtime::frontend::permissions_t expected_scheduling_permissions; + darma::frontend::permissions_t expected_scheduling_permissions; if(test_type == "simple_handle") { - expected_scheduling_permissions = darma_runtime::frontend::Permissions::Modify; + expected_scheduling_permissions = darma::frontend::Permissions::Modify; } else { - expected_scheduling_permissions = darma_runtime::frontend::Permissions::None; + expected_scheduling_permissions = darma::frontend::Permissions::None; } EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( f_initial, f_task_out, expected_scheduling_permissions, - darma_runtime::frontend::Permissions::Modify + darma::frontend::Permissions::Modify ))).WillOnce(SaveArg<0>(&task_use)); EXPECT_REGISTER_USE(use_cont, f_task_out, f_null, Modify, None); EXPECT_RELEASE_USE(use_initial); @@ -336,13 +336,13 @@ TEST_P(TestFunctorROCaptures, Parameterized) { //-------------------- // Expect ro capture: - darma_runtime::frontend::permissions_t expected_scheduling_permissions; + darma::frontend::permissions_t expected_scheduling_permissions; if(test_type == "convert" || test_type == "convert_value" || test_type == "convert_long" || test_type == "convert_string") { - expected_scheduling_permissions = darma_runtime::frontend::Permissions::None; + expected_scheduling_permissions = darma::frontend::Permissions::None; } else { - expected_scheduling_permissions = darma_runtime::frontend::Permissions::Read; + expected_scheduling_permissions = darma::frontend::Permissions::Read; } int data = 0; @@ -355,7 +355,7 @@ TEST_P(TestFunctorROCaptures, Parameterized) { fl_init, fl_init, #endif // _darma_has_feature(anti_flows) expected_scheduling_permissions, - darma_runtime::frontend::Permissions::Read + darma::frontend::Permissions::Read ) )).WillOnce( Invoke([&](auto* use) { @@ -649,7 +649,7 @@ TEST_F(TestFunctor, schedule_only) { TEST_F(TestFunctor, functor_with_permissions_downgrades) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; static_assert(std::is_convertible>::value, "any_arg not convertible!"); @@ -671,8 +671,8 @@ TEST_F(TestFunctor, functor_with_permissions_downgrades) { EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( f_initial, nullptr, - darma_runtime::frontend::Permissions::Read, - darma_runtime::frontend::Permissions::Read + darma::frontend::Permissions::Read, + darma::frontend::Permissions::Read ))).WillOnce(SaveArg<0>(&task_use)); EXPECT_REGISTER_TASK(task_use); @@ -702,7 +702,7 @@ TEST_F(TestFunctor, functor_with_permissions_downgrades) { TEST_F(TestFunctor, functor_with_required_permissions) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; static_assert(std::is_convertible>::value, "any_arg not convertible!"); @@ -726,8 +726,8 @@ TEST_F(TestFunctor, functor_with_required_permissions) { EXPECT_CALL(*mock_runtime, legacy_register_use(IsUseWithFlows( f_initial_2, nullptr, - darma_runtime::frontend::Permissions::Read, - darma_runtime::frontend::Permissions::Read + darma::frontend::Permissions::Read, + darma::frontend::Permissions::Read ))).WillOnce(SaveArg<0>(&task_use)); EXPECT_REGISTER_TASK(task_use); diff --git a/src/tests/frontend_validation/test_functor.h b/src/tests/frontend_validation/test_functor.h index 3feb0f4f..62891704 100644 --- a/src/tests/frontend_validation/test_functor.h +++ b/src/tests/frontend_validation/test_functor.h @@ -54,7 +54,7 @@ #include #include -using namespace darma_runtime; +using namespace darma; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/tests/frontend_validation/test_functor_migrate.cc b/src/tests/frontend_validation/test_functor_migrate.cc index 1a9a9a2b..4314e5b5 100644 --- a/src/tests/frontend_validation/test_functor_migrate.cc +++ b/src/tests/frontend_validation/test_functor_migrate.cc @@ -236,18 +236,18 @@ TEST_F_WITH_PARAMS( #else f_set_42_out_migrated, f_set_42_out_migrated, #endif // _darma_has_feature(anti_flows) - use_lambda ? darma_runtime::frontend::Permissions::Read : darma_runtime::frontend::Permissions::None, - darma_runtime::frontend::Permissions::Read + use_lambda ? darma::frontend::Permissions::Read : darma::frontend::Permissions::None, + darma::frontend::Permissions::Read ))).WillOnce(Invoke([&](auto&& rereg_use) { - darma_runtime::abstract::frontend::use_cast< - darma_runtime::abstract::frontend::DependencyUse* + darma::abstract::frontend::use_cast< + darma::abstract::frontend::DependencyUse* >(rereg_use)->get_data_pointer_reference() = &value; migrated_use = rereg_use; })); char const* unpack_spot = buffer; - auto migrated_task = darma_runtime::serialization - ::PolymorphicSerializableObject + auto migrated_task = darma::serialization + ::PolymorphicSerializableObject ::unpack(unpack_spot); ASSERT_THAT(migrated_task->get_dependencies().size(), Eq(1)); @@ -258,8 +258,8 @@ TEST_F_WITH_PARAMS( #else f_set_42_out_migrated, f_set_42_out_migrated, #endif // _darma_has_feature(anti_flows) - use_lambda ? darma_runtime::frontend::Permissions::Read : darma_runtime::frontend::Permissions::None, - darma_runtime::frontend::Permissions::Read + use_lambda ? darma::frontend::Permissions::Read : darma::frontend::Permissions::None, + darma::frontend::Permissions::Read ) ); diff --git a/src/tests/frontend_validation/test_index_range.cc b/src/tests/frontend_validation/test_index_range.cc index ce41a4f4..0ed1e300 100644 --- a/src/tests/frontend_validation/test_index_range.cc +++ b/src/tests/frontend_validation/test_index_range.cc @@ -50,8 +50,8 @@ #include #include -using namespace darma_runtime; -using namespace darma_runtime::detail; +using namespace darma; +using namespace darma::detail; TEST(TestIndexRange, pack_unpack_contiguous) { diff --git a/src/tests/frontend_validation/test_initial_access.cc b/src/tests/frontend_validation/test_initial_access.cc index 47684038..4fc10dc9 100644 --- a/src/tests/frontend_validation/test_initial_access.cc +++ b/src/tests/frontend_validation/test_initial_access.cc @@ -74,7 +74,7 @@ class TestInitialAccess TEST_F(TestInitialAccess, call_sequence) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; DECLARE_MOCK_FLOWS(f_in_1, f_out_1); use_t* use_init = nullptr; @@ -111,7 +111,7 @@ TEST_F(TestInitialAccess, call_sequence) { // Same as call_sequence, but uses helper to verify that other uses of helper should be valid TEST_F(TestInitialAccess, call_sequence_helper) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; DECLARE_MOCK_FLOWS(f_in, f_out); @@ -141,7 +141,7 @@ TEST_F(TestInitialAccess, call_sequence_helper) { // Same as call_sequence, but with delayed assignment TEST_F(TestInitialAccess, call_sequence_helper_2) { using namespace ::testing; - using namespace darma_runtime; + using namespace darma; using namespace mock_backend; DECLARE_MOCK_FLOWS(f_in, f_out, f_in_2, f_out_2); @@ -172,8 +172,8 @@ TEST_F(TestInitialAccess, call_sequence_helper_2) { TEST_F(TestInitialAccess, call_sequence_assign) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; DECLARE_MOCK_FLOWS(f_in_1, f_out_1, f_in_2, f_out_2); use_t* use_init1 = nullptr, *use_init2 = nullptr; @@ -210,9 +210,9 @@ TEST_F(TestInitialAccess, call_sequence_assign) { TEST_F(TestInitialAccess, call_sequence_copy_assign) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::detail; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::detail; + using namespace darma::keyword_arguments_for_publication; DECLARE_MOCK_FLOWS(f_in_1, f_out_1, f_in_2, f_out_2); use_t* use1 = nullptr, *use2 = nullptr; diff --git a/src/tests/frontend_validation/test_lambda_migrate.cc b/src/tests/frontend_validation/test_lambda_migrate.cc index 20491252..87693970 100644 --- a/src/tests/frontend_validation/test_lambda_migrate.cc +++ b/src/tests/frontend_validation/test_lambda_migrate.cc @@ -51,7 +51,7 @@ #include #include -using namespace darma_runtime; +using namespace darma; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/tests/frontend_validation/test_make_key_functor.cc b/src/tests/frontend_validation/test_make_key_functor.cc index 842d769c..3d7efee7 100644 --- a/src/tests/frontend_validation/test_make_key_functor.cc +++ b/src/tests/frontend_validation/test_make_key_functor.cc @@ -81,8 +81,8 @@ class TestMakeKeyFunctor TEST_F(TestMakeKeyFunctor, test_make_key_functor_int) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -123,7 +123,7 @@ TEST_F(TestMakeKeyFunctor, test_make_key_functor_int) { create_work([=]{ tmp.set_value(10); - auto created_key = darma_runtime::check_test_make_key_functor(version(1, tmp)); + auto created_key = darma::check_test_make_key_functor(version(1, tmp)); ASSERT_EQ(created_key.component<0>().as(), 1); ASSERT_EQ(created_key.component<1>().as(), 10); @@ -143,8 +143,8 @@ TEST_F(TestMakeKeyFunctor, test_make_key_functor_int) { TEST_F(TestMakeKeyFunctor, test_make_key_functor_string) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -185,7 +185,7 @@ TEST_F(TestMakeKeyFunctor, test_make_key_functor_string) { create_work([=]{ tmp.set_value("Hello DARMA user"); - auto created_key = darma_runtime::check_test_make_key_functor(version(1, tmp)); + auto created_key = darma::check_test_make_key_functor(version(1, tmp)); ASSERT_EQ(created_key.component<0>().as(), 1); ASSERT_EQ(created_key.component<1>().as(), "Hello DARMA user"); @@ -206,8 +206,8 @@ TEST_F(TestMakeKeyFunctor, test_make_key_functor_string) { #if defined(DEBUG) || !defined(NDEBUG) TEST_F(TestMakeKeyFunctor, test_key_functor_death) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -248,7 +248,7 @@ TEST_F(TestMakeKeyFunctor, test_key_functor_death) { create_work([=]{ tmp.set_value("Hello"); - auto created_key = darma_runtime::check_test_make_key_functor(version(1, tmp)); + auto created_key = darma::check_test_make_key_functor(version(1, tmp)); ASSERT_EQ(created_key.component<0>().as(), 1); ASSERT_EQ(created_key.component<1>().as(), "Hello"); @@ -257,7 +257,7 @@ TEST_F(TestMakeKeyFunctor, test_key_functor_death) { EXPECT_DEATH( { - auto created_key = darma_runtime::check_test_make_key_functor(version(1,tmp)); + auto created_key = darma::check_test_make_key_functor(version(1,tmp)); }, "`get_value\\(\\)` performed on AccessHandle" ); diff --git a/src/tests/frontend_validation/test_make_key_functor.h b/src/tests/frontend_validation/test_make_key_functor.h index 998e5622..46c7a3fc 100644 --- a/src/tests/frontend_validation/test_make_key_functor.h +++ b/src/tests/frontend_validation/test_make_key_functor.h @@ -48,7 +48,7 @@ #include #include -namespace darma_runtime { +namespace darma { template auto @@ -56,7 +56,7 @@ check_test_make_key_functor( Args... args ) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = detail::kwarg_parser< overload_description< _keyword @@ -72,6 +72,6 @@ check_test_make_key_functor( } -} // End namespace darma_runtime +} // End namespace darma #endif diff --git a/src/tests/frontend_validation/test_mpi_interop.cc b/src/tests/frontend_validation/test_mpi_interop.cc index 09ae4f5e..a4162982 100644 --- a/src/tests/frontend_validation/test_mpi_interop.cc +++ b/src/tests/frontend_validation/test_mpi_interop.cc @@ -81,8 +81,8 @@ class TestMPIInterop TEST_F(TestMPIInterop, baseline_test) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_mpi_context; + using namespace darma; + using namespace darma::keyword_arguments_for_mpi_context; using namespace mock_backend; /* @@ -135,12 +135,12 @@ TEST_F(TestMPIInterop, baseline_test) { double gb3 = 6; auto p1 = context.piecewise_acquired_collection("Giulio", index_range = Range1D(4)); auto p2 = context.piecewise_acquired_collection("Giulio2", size = 10); - auto token3 = context.piecewise_acquired_collection("Giulio3", index_range = Range1D(5), darma_runtime::keyword_arguments_for_mpi_context::index = 2, data = gb); - auto token4 = context.piecewise_acquired_collection("Giulio4", size = 10, darma_runtime::keyword_arguments_for_mpi_context::index = 2, data = gb); + auto token3 = context.piecewise_acquired_collection("Giulio3", index_range = Range1D(5), darma::keyword_arguments_for_mpi_context::index = 2, data = gb); + auto token4 = context.piecewise_acquired_collection("Giulio4", size = 10, darma::keyword_arguments_for_mpi_context::index = 2, data = gb); auto token5 = context.piecewise_acquired_collection("Giulio5", index_range = Range1D(6), indices(1,2,3),data(gb1,gb2,gb3)); auto token6 = context.piecewise_acquired_collection("Giulio6", size = 10, indices(1,2,3),data(gb1,gb2,gb3)); - p1.acquire_access(gb,darma_runtime::keyword_arguments_for_piecewise_handle::index = 2); + p1.acquire_access(gb,darma::keyword_arguments_for_piecewise_handle::index = 2); //conversion_to_ahc(gb,p1); } // handles deleted diff --git a/src/tests/frontend_validation/test_publish.cc b/src/tests/frontend_validation/test_publish.cc index 6a41d2de..83811f9e 100644 --- a/src/tests/frontend_validation/test_publish.cc +++ b/src/tests/frontend_validation/test_publish.cc @@ -78,9 +78,9 @@ class TestCreateWork TEST_F(TestCreateWork, publish_simple_MN) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; using namespace mock_backend; mock_runtime->save_tasks = true; diff --git a/src/tests/frontend_validation/test_read_access.cc b/src/tests/frontend_validation/test_read_access.cc index 926d0944..33b647fa 100644 --- a/src/tests/frontend_validation/test_read_access.cc +++ b/src/tests/frontend_validation/test_read_access.cc @@ -75,11 +75,11 @@ class TestReadAccess TEST_F(TestReadAccess, call_sequence) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; using namespace mock_backend; - auto my_version_tag = darma_runtime::make_key("my_version_tag"); + auto my_version_tag = darma::make_key("my_version_tag"); DECLARE_MOCK_FLOWS(f_in, f_out); use_t* use_read = nullptr; diff --git a/src/tests/frontend_validation/test_resource_count.cc b/src/tests/frontend_validation/test_resource_count.cc index a20707cc..c5ff41c2 100644 --- a/src/tests/frontend_validation/test_resource_count.cc +++ b/src/tests/frontend_validation/test_resource_count.cc @@ -77,50 +77,50 @@ class TestResourceCount TEST_F(TestResourceCount, execution_resources_simple) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::constants_for_resource_count; - using namespace darma_runtime::keyword_arguments; + using namespace darma; + using namespace darma::constants_for_resource_count; + using namespace darma::keyword_arguments; EXPECT_CALL(*mock_runtime, get_execution_resource_count(0)).Times(4); - darma_runtime::resource_count(Execution, Processes); - darma_runtime::resource_count(Execution, depth=0); - darma_runtime::resource_count(Execution, depth=Process); - darma_runtime::resource_count(Processes); + darma::resource_count(Execution, Processes); + darma::resource_count(Execution, depth=0); + darma::resource_count(Execution, depth=Process); + darma::resource_count(Processes); EXPECT_CALL(*mock_runtime, get_execution_resource_count(1)).Times(4); - darma_runtime::resource_count(Execution, Sockets); - darma_runtime::resource_count(Execution, depth=1); - darma_runtime::resource_count(Execution, depth=Socket); - darma_runtime::resource_count(Sockets); + darma::resource_count(Execution, Sockets); + darma::resource_count(Execution, depth=1); + darma::resource_count(Execution, depth=Socket); + darma::resource_count(Sockets); EXPECT_CALL(*mock_runtime, get_execution_resource_count(2)).Times(4); - darma_runtime::resource_count(Execution, Cores); - darma_runtime::resource_count(Execution, depth=2); - darma_runtime::resource_count(Execution, depth=Core); - darma_runtime::resource_count(Cores); + darma::resource_count(Execution, Cores); + darma::resource_count(Execution, depth=2); + darma::resource_count(Execution, depth=Core); + darma::resource_count(Cores); EXPECT_CALL(*mock_runtime, get_execution_resource_count(3)).Times(4); - darma_runtime::resource_count(Execution, HardwareThreads); - darma_runtime::resource_count(Execution, depth=3); - darma_runtime::resource_count(Execution, depth=HardwareThread); - darma_runtime::resource_count(HardwareThreads); + darma::resource_count(Execution, HardwareThreads); + darma::resource_count(Execution, depth=3); + darma::resource_count(Execution, depth=HardwareThread); + darma::resource_count(HardwareThreads); } TEST_F(TestResourceCount, execution_resources_per) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::constants_for_resource_count; - using namespace darma_runtime::keyword_arguments; + using namespace darma; + using namespace darma::constants_for_resource_count; + using namespace darma::keyword_arguments; EXPECT_CALL(*mock_runtime, get_execution_resource_count(0)).Times(3).WillRepeatedly(Return(10)); EXPECT_CALL(*mock_runtime, get_execution_resource_count(2)).Times(3).WillRepeatedly(Return(50)); - EXPECT_EQ(darma_runtime::resource_count(Execution, Cores, per=Process), 5); - EXPECT_EQ(darma_runtime::resource_count(Cores, per=Process), 5); + EXPECT_EQ(darma::resource_count(Execution, Cores, per=Process), 5); + EXPECT_EQ(darma::resource_count(Cores, per=Process), 5); // needs generalized keyword argument parsing, which isn't done yet - //EXPECT_EQ(darma_runtime::resource_count(per=Process, depth=2), 5); - //EXPECT_EQ(darma_runtime::resource_count(depth=2, per=Process), 5); - EXPECT_EQ(darma_runtime::resource_count(Execution, depth=2, per=Process), 5); + //EXPECT_EQ(darma::resource_count(per=Process, depth=2), 5); + //EXPECT_EQ(darma::resource_count(depth=2, per=Process), 5); + EXPECT_EQ(darma::resource_count(Execution, depth=2, per=Process), 5); } diff --git a/src/tests/frontend_validation/test_serialize.cc b/src/tests/frontend_validation/test_serialize.cc index 6d0cc572..292c8659 100644 --- a/src/tests/frontend_validation/test_serialize.cc +++ b/src/tests/frontend_validation/test_serialize.cc @@ -77,7 +77,7 @@ class TestSerialize //////////////////////////////////////////////////////////////////////////////// //TEST_F(TestSerialize, fundamental) { -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // // { // int value = 42; @@ -93,7 +93,7 @@ class TestSerialize ////////////////////////////////////////////////////////////////////////////////// // //TEST_F(TestSerialize, fundamental_chain) { -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // // int value = 42; // constexpr int n_reps = 10; @@ -111,7 +111,7 @@ class TestSerialize ////////////////////////////////////////////////////////////////////////////////// // //TEST_F(TestSerialize, vector_simple) { -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // using namespace std; // using namespace ::testing; // @@ -165,7 +165,7 @@ class TestSerialize //); // //static_assert(meta::is_container>::value, "map must be a Container"); -//static_assert(darma_runtime::serialization::Serializer>::is_insertable, +//static_assert(darma::serialization::Serializer>::is_insertable, // "map should be insertable" //); //using map_int_int = std::map; @@ -190,7 +190,7 @@ class TestSerialize // T t; //}; // -//namespace darma_runtime { +//namespace darma { //namespace serialization { // //template @@ -204,11 +204,11 @@ class TestSerialize //}; // //} // end namespace serialization -//} // end namespace darma_runtime +//} // end namespace darma // // -//static_assert(darma_runtime::serialization::detail::serializability_traits> -// ::template has_nonintrusive_serialize> +// ::template has_nonintrusive_serialize::value, // "Foo should have a nonintrusive serialize" //); @@ -223,9 +223,9 @@ class TestSerialize // using namespace std; // using namespace ::testing; // using namespace mock_backend; -// using namespace darma_runtime; -// using namespace darma_runtime::serialization; -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using namespace darma; +// using namespace darma::serialization; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // // std::vector value = { 3, 1, 4, 1, 5, 9, 2, 6 }; // @@ -365,12 +365,12 @@ class TestSerialize //TEST_F(TestSerializeWithMock, range) { // using namespace std; // using namespace ::testing; -// using namespace darma_runtime::serialization; +// using namespace darma::serialization; // // int my_val[5] = {1, 2, 3, 4, 5}; // int* value = &(my_val[0]); // -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // SimplePackUnpackArchive ar; // // ArchiveAccess::start_sizing(ar); @@ -397,12 +397,12 @@ class TestSerialize //TEST_F(TestSerializeWithMock, range_begin_end) { // using namespace std; // using namespace ::testing; -// using namespace darma_runtime::serialization; +// using namespace darma::serialization; // // int my_val[5] = {1, 2, 3, 4, 5}; // int* value = &(my_val[0]); // -// using darma_runtime::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; +// using darma::serialization::detail::DependencyHandle_attorneys::ArchiveAccess; // SimplePackUnpackArchive ar; // // ArchiveAccess::start_sizing(ar); diff --git a/src/tests/frontend_validation/test_sso_key.cc b/src/tests/frontend_validation/test_sso_key.cc index 01175455..d65990b8 100644 --- a/src/tests/frontend_validation/test_sso_key.cc +++ b/src/tests/frontend_validation/test_sso_key.cc @@ -54,8 +54,8 @@ #include -using namespace darma_runtime; -using namespace darma_runtime::detail; +using namespace darma; +using namespace darma::detail; //////////////////////////////////////////////////////////////////////////////// @@ -93,7 +93,7 @@ class TestSSOKey //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, sso_int) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k = maker(2,4,8); ASSERT_EQ(k.component<0>().as(), 2); @@ -105,7 +105,7 @@ TEST_F(TestSSOKey, sso_int) { } TEST_F(TestSSOKey, simple_string) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k = maker("hello", 2, "world!"); ASSERT_EQ(k.component<0>().as(), "hello"); @@ -116,7 +116,7 @@ TEST_F(TestSSOKey, simple_string) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, string_split) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; @@ -130,7 +130,7 @@ TEST_F(TestSSOKey, string_split) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, ints_split) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k = maker( 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 @@ -142,7 +142,7 @@ TEST_F(TestSSOKey, ints_split) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, ints_exact) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k = maker( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, "A" @@ -154,7 +154,7 @@ TEST_F(TestSSOKey, ints_exact) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, ints_exact_2) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k = maker( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, "Ab", @@ -167,7 +167,7 @@ TEST_F(TestSSOKey, ints_exact_2) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, string_span_3) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; const std::string s = "" "hello, there. How is it going today? " @@ -178,7 +178,7 @@ TEST_F(TestSSOKey, string_span_3) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, equal_multipart) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k1 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); sso_key_t k2 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); @@ -188,7 +188,7 @@ TEST_F(TestSSOKey, equal_multipart) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, hash_multipart) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k1 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); sso_key_t k2 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); @@ -201,7 +201,7 @@ typedef enum EnumTestA { OneA=1, TwoA=2, ThreeA=3 } EnumTestA; typedef enum EnumTestB { OneB=1, TwoB=2, ThreeB=3 } EnumTestB; TEST_F(TestSSOKey, enums) { - using namespace darma_runtime::detail; + using namespace darma::detail; using namespace ::testing; auto maker = typename key_traits::maker{}; auto kA = maker(OneA, TwoB, ThreeA); @@ -214,7 +214,7 @@ TEST_F(TestSSOKey, enums) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, equal_key_key) { - using namespace darma_runtime::detail; + using namespace darma::detail; auto maker = typename key_traits::maker{}; sso_key_t k1 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); sso_key_t k2 = maker(k1); @@ -230,7 +230,7 @@ TEST_F(TestSSOKey, equal_key_key) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, equal_backend_assigned) { - using namespace darma_runtime::detail; + using namespace darma::detail; using namespace ::testing; auto maker = typename key_traits::maker{}; sso_key_t backendk1 = maker(); @@ -247,9 +247,9 @@ TEST_F(TestSSOKey, equal_backend_assigned) { TEST_F(TestSSOKey, serialize_long) { - using namespace darma_runtime::detail; - using namespace darma_runtime::serialization; - using serialization_handler_t = darma_runtime::serialization::SimpleSerializationHandler<>; + using namespace darma::detail; + using namespace darma::serialization; + using serialization_handler_t = darma::serialization::SimpleSerializationHandler<>; auto maker = typename key_traits::maker{}; sso_key_t k1 = maker("hello", 2, 3, 4, 5, 6, "world!", "How is it going today?"); @@ -264,9 +264,9 @@ TEST_F(TestSSOKey, serialize_long) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, serialize_small) { - using namespace darma_runtime::detail; - using namespace darma_runtime::serialization; - using serialization_handler_t = darma_runtime::serialization::SimpleSerializationHandler<>; + using namespace darma::detail; + using namespace darma::serialization; + using serialization_handler_t = darma::serialization::SimpleSerializationHandler<>; auto maker = typename key_traits::maker{}; sso_key_t k1 = maker("me", 2); @@ -281,9 +281,9 @@ TEST_F(TestSSOKey, serialize_small) { //////////////////////////////////////////////////////////////////////////////// TEST_F(TestSSOKey, serialize_backend_assigned) { - using namespace darma_runtime::detail; - using namespace darma_runtime::serialization; - using serialization_handler_t = darma_runtime::serialization::SimpleSerializationHandler<>; + using namespace darma::detail; + using namespace darma::serialization; + using serialization_handler_t = darma::serialization::SimpleSerializationHandler<>; auto maker = typename key_traits::backend_maker{}; sso_key_t k1 = maker(314ul); diff --git a/src/tests/frontend_validation/test_task_collection.cc b/src/tests/frontend_validation/test_task_collection.cc index c68640f4..66007a15 100644 --- a/src/tests/frontend_validation/test_task_collection.cc +++ b/src/tests/frontend_validation/test_task_collection.cc @@ -94,10 +94,10 @@ class TestCreateConcurrentWork TEST_F_WITH_PARAMS(TestCreateConcurrentWork, simple, ::testing::Bool(), bool) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -123,24 +123,24 @@ TEST_F_WITH_PARAMS(TestCreateConcurrentWork, simple, ::testing::Bool(), bool) { } else { EXPECT_CALL(*mock_runtime, legacy_register_use(::testing::AllOf( - IsUseWithFlows(finit, fout_coll, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify), + IsUseWithFlows(finit, fout_coll, darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify), Truly([](auto* use){ return ( use->manages_collection() - and ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::CollectionManagingUse* + and ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::CollectionManagingUse* >(use)->get_managed_collection()->size() == 4 ); }) ))).WillOnce(Invoke([&](auto* use) { use_coll = use; })); EXPECT_CALL(*mock_runtime, legacy_register_use(AllOf( - IsUseWithFlows(fout_coll, fnull, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::None), + IsUseWithFlows(fout_coll, fnull, darma::frontend::Permissions::Modify, darma::frontend::Permissions::None), Truly([](auto* use){ return ( use->manages_collection() - and ::darma_runtime::abstract::frontend::use_cast< - ::darma_runtime::abstract::frontend::CollectionManagingUse* + and ::darma::abstract::frontend::use_cast< + ::darma::abstract::frontend::CollectionManagingUse* >(use)->get_managed_collection()->size() == 4 ); }) @@ -189,7 +189,7 @@ TEST_F_WITH_PARAMS(TestCreateConcurrentWork, simple, ::testing::Bool(), bool) { .WillOnce(Return(f_out_idx[i])); //EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx[i], f_in_idx[i], f_out_idx[i], Modify, Modify, (values[i])); EXPECT_CALL(*mock_runtime, legacy_register_use( - IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) )).WillOnce(Invoke([&](auto* use){ use_idx[i] = use; use->get_data_pointer_reference() = &values[i]; @@ -236,12 +236,12 @@ TEST_F_WITH_PARAMS(TestCreateConcurrentWork, simple, ::testing::Bool(), bool) { TEST_F(TestCreateConcurrentWork, simple_all_reduce) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; - using darma_runtime::frontend::Permissions; + using darma::frontend::Permissions; mock_runtime->save_tasks = true; @@ -314,7 +314,7 @@ TEST_F(TestCreateConcurrentWork, simple_all_reduce) { EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx[i], f_in_idx[i], f_out_idx[i], Modify, Modify, values[i]); // EXPECT_CALL(*mock_runtime, legacy_register_use( -// IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) +// IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) // )).WillOnce(Invoke([&](auto* use){ // use_idx[i] = use; // use->get_data_pointer_reference() = &values[i]; @@ -369,12 +369,12 @@ TEST_F(TestCreateConcurrentWork, simple_all_reduce) { TEST_F(TestCreateConcurrentWork, fetch) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; - using darma_runtime::frontend::Permissions; + using darma::frontend::Permissions; mock_runtime->save_tasks = true; @@ -450,7 +450,7 @@ TEST_F(TestCreateConcurrentWork, fetch) { EXPECT_CALL(*mock_runtime, make_indexed_local_flow(fout_coll, i)) .WillOnce(Return(f_out_idx[i])); EXPECT_CALL(*mock_runtime, legacy_register_use( - IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) )).WillOnce(Invoke([&](auto* use){ use_idx[i] = use; use->get_data_pointer_reference() = &values[i]; @@ -550,10 +550,10 @@ TEST_F(TestCreateConcurrentWork, fetch) { TEST_F(TestCreateConcurrentWork, migrate_simple) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -661,7 +661,7 @@ TEST_F(TestCreateConcurrentWork, migrate_simple) { })); EXPECT_CALL(*mock_runtime, reregister_migrated_use( - IsUseWithFlows(finit_unpacked, fout_unpacked, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + IsUseWithFlows(finit_unpacked, fout_unpacked, darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) )).WillOnce(SaveArg<0>(&use_migrated)); @@ -687,7 +687,7 @@ TEST_F(TestCreateConcurrentWork, migrate_simple) { .WillOnce(Return(f_out_idx[i])); //EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx[i], f_in_idx[i], f_out_idx[i], Modify, Modify, (values[i])); EXPECT_CALL(*mock_runtime, legacy_register_use( - IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) )).WillOnce(Invoke([&](auto* use){ use_idx[i] = use; use->get_data_pointer_reference() = &values[i]; @@ -720,10 +720,10 @@ TEST_F(TestCreateConcurrentWork, migrate_simple) { TEST_F(TestCreateConcurrentWork, many_to_one) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -771,7 +771,7 @@ TEST_F(TestCreateConcurrentWork, many_to_one) { } }; - using darma_runtime::Index1D; + using darma::Index1D; struct ModMapping { using from_index_type = Index1D; @@ -853,10 +853,10 @@ TEST_F(TestCreateConcurrentWork, many_to_one) { TEST_F(TestCreateConcurrentWork, simple_sq_brkt_same) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -932,7 +932,7 @@ TEST_F(TestCreateConcurrentWork, simple_sq_brkt_same) { EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx, f_in_idx, f_out_idx, Modify, Modify, value); //EXPECT_CALL(*mock_runtime, legacy_register_use( - // IsUseWithFlows(f_in_idx, f_out_idx, darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + // IsUseWithFlows(f_in_idx, f_out_idx, darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) //)).WillOnce(Invoke([&](auto* use){ // use_idx = use; // use->get_data_pointer_reference() = &value; @@ -993,10 +993,10 @@ TEST_F(TestCreateConcurrentWork, simple_sq_brkt_same) { TEST_F(TestCreateConcurrentWork, simple_unique_owner) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1073,10 +1073,10 @@ TEST_F(TestCreateConcurrentWork, simple_unique_owner) { TEST_F(TestCreateConcurrentWork, fetch_unique_owner) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1214,10 +1214,10 @@ TEST_F(TestCreateConcurrentWork, fetch_unique_owner) { TEST_F(TestCreateConcurrentWork, simple_collection_read) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1298,10 +1298,10 @@ TEST_F(TestCreateConcurrentWork, simple_collection_read) { TEST_F(TestCreateConcurrentWork, nested_in_create_work) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1402,7 +1402,7 @@ TEST_F(TestCreateConcurrentWork, nested_in_create_work) { .WillOnce(Return(f_out_idx[i])); EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx[i], f_in_idx[i], f_out_idx[i], Modify, Modify, values[i]); //EXPECT_CALL(*mock_runtime, register_use( - // IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + // IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) //)).WillOnce(Invoke([&](auto* use){ // use_idx[i] = use; // use->get_data_pointer_reference() = &values[i]; @@ -1431,10 +1431,10 @@ TEST_F(TestCreateConcurrentWork, nested_in_create_work) { TEST_F(TestCreateConcurrentWork, nested_in_create_work_functor) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1529,7 +1529,7 @@ TEST_F(TestCreateConcurrentWork, nested_in_create_work_functor) { .WillOnce(Return(f_out_idx[i])); EXPECT_REGISTER_USE_AND_SET_BUFFER(use_idx[i], f_in_idx[i], f_out_idx[i], Modify, Modify, values[i]); //EXPECT_CALL(*mock_runtime, register_use( - // IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + // IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) //)).WillOnce(Invoke([&](auto* use){ // use_idx[i] = use; // use->get_data_pointer_reference() = &values[i]; @@ -1564,9 +1564,9 @@ TEST_F(TestCreateConcurrentWork, handle_reduce) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::frontend; - using namespace darma_runtime::keyword_arguments; + using namespace darma; + using namespace darma::frontend; + using namespace darma::keyword_arguments; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1691,7 +1691,7 @@ TEST_F(TestCreateConcurrentWork, handle_reduce) EXPECT_CALL(*mock_runtime, make_indexed_local_flow(fout_coll, i)) .WillOnce(Return(f_out_idx[i])); EXPECT_CALL(*mock_runtime, legacy_register_use( - IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma_runtime::frontend::Permissions::Modify, darma_runtime::frontend::Permissions::Modify) + IsUseWithFlows(f_in_idx[i], f_out_idx[i], darma::frontend::Permissions::Modify, darma::frontend::Permissions::Modify) )).WillOnce(Invoke([&](auto* use) { use_idx[i] = use; use->get_data_pointer_reference() = &values[i]; @@ -1738,10 +1738,10 @@ TEST_F(TestCreateConcurrentWork, simple_read_only) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -1777,7 +1777,7 @@ TEST_F(TestCreateConcurrentWork, simple_read_only) Index1D index, ReadAccessHandleCollection> coll, std::string str_val, - darma_runtime::types::key_t key + darma::types::key_t key ) const { ASSERT_THAT(str_val, Eq("world")); @@ -1808,9 +1808,9 @@ TEST_F(TestCreateConcurrentWork, simple_read_only) .WillOnce(Return(f_in_idx[i])); EXPECT_CALL(*mock_runtime, legacy_register_use( #if _darma_has_feature(anti_flows) - IsUseWithFlows(f_in_idx[i], nullptr, darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read) + IsUseWithFlows(f_in_idx[i], nullptr, darma::frontend::Permissions::Read, darma::frontend::Permissions::Read) #else - IsUseWithFlows(f_in_idx[i], f_in_idx[i], darma_runtime::frontend::Permissions::Read, darma_runtime::frontend::Permissions::Read) + IsUseWithFlows(f_in_idx[i], f_in_idx[i], darma::frontend::Permissions::Read, darma::frontend::Permissions::Read) #endif // _darma_has_feature(anti_flows) )).WillOnce(Invoke([&](auto* use) { use_idx[i] = use; @@ -1867,11 +1867,11 @@ TEST_F(TestCreateConcurrentWork, simple_read_only) TEST_F(TestCreateConcurrentWork, simple_commutative) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_commutative_access; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_commutative_access; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -2052,8 +2052,8 @@ TEST_F(TestCreateConcurrentWork, simple_commutative) { TEST_F(TestCreateConcurrentWork, nested_reverse) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -2188,10 +2188,10 @@ TEST_F(TestCreateConcurrentWork, nested_reverse) { TEST_F(TestCreateConcurrentWork, mappings_same) { using namespace ::testing; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_publication; - using namespace darma_runtime::keyword_arguments_for_task_creation; - using namespace darma_runtime::keyword_arguments_for_access_handle_collection; + using namespace darma; + using namespace darma::keyword_arguments_for_publication; + using namespace darma::keyword_arguments_for_task_creation; + using namespace darma::keyword_arguments_for_access_handle_collection; using namespace mock_backend; mock_runtime->save_tasks = true; @@ -2272,7 +2272,7 @@ TEST_F(TestCreateConcurrentWork, mappings_same) { Mock::VerifyAndClearExpectations(mock_runtime.get()); - using namespace darma_runtime::abstract::frontend; + using namespace darma::abstract::frontend; EXPECT_THAT( use_cast(use_coll)->get_managed_collection()->has_same_mapping_as( diff --git a/src/tests/meta/test_any_convertible.cc b/src/tests/meta/test_any_convertible.cc index cac98dcd..87630cf3 100644 --- a/src/tests/meta/test_any_convertible.cc +++ b/src/tests/meta/test_any_convertible.cc @@ -116,7 +116,7 @@ using nomove_const_lval_ref = decltype(nomove_const_lval_ref_); using nomove_rval_ref = decltype(nomove_rval_ref_); using nomove_const_rval_ref = decltype(nomove_const_rval_ref_); -using namespace darma_runtime::meta; +using namespace darma::meta; //////////////////////////////////////////////////////////////////////////////// // diff --git a/src/tests/meta/test_callable_traits.cc b/src/tests/meta/test_callable_traits.cc index fd18ae9f..ed943f24 100644 --- a/src/tests/meta/test_callable_traits.cc +++ b/src/tests/meta/test_callable_traits.cc @@ -58,7 +58,7 @@ #include #include -using namespace darma_runtime::meta; +using namespace darma::meta; #define meta_fail "callable traits metatest failed" diff --git a/src/tests/meta/test_compressed_pair.cc b/src/tests/meta/test_compressed_pair.cc index 404a5b26..c2c938ec 100644 --- a/src/tests/meta/test_compressed_pair.cc +++ b/src/tests/meta/test_compressed_pair.cc @@ -48,7 +48,7 @@ #include "../metatest_helpers.h" -using namespace darma_runtime::utility; +using namespace darma::utility; struct Empty { }; diff --git a/src/tests/meta/test_detection.cc b/src/tests/meta/test_detection.cc index b83789a7..1a13078e 100644 --- a/src/tests/meta/test_detection.cc +++ b/src/tests/meta/test_detection.cc @@ -48,8 +48,8 @@ #include -using namespace darma_runtime; -using namespace darma_runtime::meta; +using namespace darma; +using namespace darma::meta; namespace m = tinympl; namespace mp = tinympl::placeholders; diff --git a/src/tests/meta/test_is_contiguous.cc b/src/tests/meta/test_is_contiguous.cc index 947b4247..6a693332 100644 --- a/src/tests/meta/test_is_contiguous.cc +++ b/src/tests/meta/test_is_contiguous.cc @@ -48,7 +48,7 @@ #include -using namespace darma_runtime::meta; +using namespace darma::meta; static_assert( is_contiguous_iterator::iterator>::value, diff --git a/src/tests/meta/test_is_iterator.cc b/src/tests/meta/test_is_iterator.cc index add772b9..aaf96b18 100644 --- a/src/tests/meta/test_is_iterator.cc +++ b/src/tests/meta/test_is_iterator.cc @@ -50,7 +50,7 @@ #include #include -using namespace darma_runtime::meta; +using namespace darma::meta; static_assert( iterator_traits< diff --git a/src/tests/meta/test_kwargs.cc b/src/tests/meta/test_kwargs.cc index 16367872..eb4ce10f 100644 --- a/src/tests/meta/test_kwargs.cc +++ b/src/tests/meta/test_kwargs.cc @@ -54,9 +54,9 @@ typedef EnableCTorBlabbermouth BlabberMouth; static MockBlabbermouthListener* listener; -using namespace darma_runtime; -using namespace darma_runtime::detail; -using namespace darma_runtime::meta; +using namespace darma; +using namespace darma::detail; +using namespace darma::meta; //////////////////////////////////////////////////////////////////////////////// @@ -133,7 +133,7 @@ DeclareDarmaTypeTransparentKeyword(testing, test_kwarg_2); DeclareDarmaTypeTransparentKeyword(testing, test_kwarg_3); DeclareDarmaTypeTransparentKeyword(testing, test_kwarg_4); -namespace kw = darma_runtime::keyword_tags_for_testing; +namespace kw = darma::keyword_tags_for_testing; template void desc_should_fail(Args&&...) { @@ -181,7 +181,7 @@ void assert_valid(Args&&... args) { template void test_function(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = kwarg_parser< overload_description< positional_or_keyword_argument, @@ -199,7 +199,7 @@ void test_function(Args&&... args) { template void test_function_variadics(Args&&... args) { - using namespace darma_runtime::detail; + using namespace darma::detail; using parser = kwarg_parser< variadic_positional_overload_description< positional_or_keyword_argument, @@ -223,9 +223,9 @@ struct B { double value = 0.0; }; TEST_F(TestKeywordArguments, static_tests) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using odesc0 = overload_description< positional_only_argument @@ -442,9 +442,9 @@ struct MyOverloads { TEST_F(TestKeywordArguments, overload_tests) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using odesc1 = overload_description< positional_or_keyword_argument, @@ -486,9 +486,9 @@ TEST_F(TestKeywordArguments, overload_tests) { TEST_F(TestKeywordArguments, overload_with_default_generators_tests) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using parser = kwarg_parser< overload_description< @@ -504,9 +504,9 @@ TEST_F(TestKeywordArguments, overload_with_default_generators_tests) { TEST_F(TestKeywordArguments, converter) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using parser = kwarg_parser< overload_description< @@ -532,9 +532,9 @@ using is_B = typename is_B_impl>::type; TEST_F(TestKeywordArguments, metafunction_predicate) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using parser = kwarg_parser< overload_description< @@ -556,9 +556,9 @@ TEST_F(TestKeywordArguments, metafunction_predicate) { TEST_F(TestKeywordArguments, invoke_lambda) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using parser = kwarg_parser< overload_description< @@ -586,9 +586,9 @@ TEST_F(TestKeywordArguments, invoke_lambda) { TEST_F(TestKeywordArguments, variadic_simple) { - using namespace darma_runtime::detail; - using namespace darma_runtime; - using namespace darma_runtime::keyword_arguments_for_testing; + using namespace darma::detail; + using namespace darma; + using namespace darma::keyword_arguments_for_testing; using odesc1 = variadic_positional_overload_description< _optional_keyword diff --git a/src/tests/meta/test_member_detector.cc b/src/tests/meta/test_member_detector.cc index 4ba17b9f..983537ae 100644 --- a/src/tests/meta/test_member_detector.cc +++ b/src/tests/meta/test_member_detector.cc @@ -45,8 +45,8 @@ #include #include -//using namespace darma_runtime; -//using namespace darma_runtime::meta; +//using namespace darma; +//using namespace darma::meta; // // //struct TestHasPolicy { diff --git a/src/tests/meta/test_splat_tuple.cc b/src/tests/meta/test_splat_tuple.cc index e805aa90..78ca8762 100644 --- a/src/tests/meta/test_splat_tuple.cc +++ b/src/tests/meta/test_splat_tuple.cc @@ -53,7 +53,7 @@ #include #include "blabbermouth.h" -using namespace darma_runtime; +using namespace darma; typedef EnableCTorBlabbermouth BlabberMouth; static MockBlabbermouthListener* listener; diff --git a/src/tests/meta/test_tuple_for_each.cc b/src/tests/meta/test_tuple_for_each.cc index 045295bd..ebb787c0 100644 --- a/src/tests/meta/test_tuple_for_each.cc +++ b/src/tests/meta/test_tuple_for_each.cc @@ -51,11 +51,11 @@ #include #include "blabbermouth.h" -using namespace darma_runtime::meta; +using namespace darma::meta; #include "blabbermouth.h" -using namespace darma_runtime; +using namespace darma; typedef EnableCTorBlabbermouth BlabberMouth; static MockBlabbermouthListener* listener; diff --git a/src/tests/meta/test_tuple_zip.cc b/src/tests/meta/test_tuple_zip.cc index 61459929..2561165d 100644 --- a/src/tests/meta/test_tuple_zip.cc +++ b/src/tests/meta/test_tuple_zip.cc @@ -54,7 +54,7 @@ #include #include "blabbermouth.h" -using namespace darma_runtime; +using namespace darma; typedef EnableCTorBlabbermouth BlabberMouth; //typedef EnableCTorBlabbermouth BlabberMouthWithDestructor; diff --git a/src/tests/test_keyword_arguments.cc b/src/tests/test_keyword_arguments.cc index c0c31c7c..c2c379b1 100644 --- a/src/tests/test_keyword_arguments.cc +++ b/src/tests/test_keyword_arguments.cc @@ -49,8 +49,8 @@ using std::cout; using std::endl; -using namespace darma_runtime; -using namespace darma_runtime::detail; +using namespace darma; +using namespace darma::detail; struct BlabberMouth { BlabberMouth(const std::string& str) : str_(str) { std::cout << "#!! String constructor: " << str_ << std::endl; } @@ -75,7 +75,7 @@ DeclareDarmaKeyword(testing, move_only, MovableOnly); DeclareDarmaKeyword(testing, string_arg, std::string); DeclareDarmaTypeTransparentKeyword(testing, foobar); -namespace kw = darma_runtime::keyword_tags_for_testing; +namespace kw = darma::keyword_tags_for_testing; template void print_string_arg(Args&&... args) { @@ -188,7 +188,7 @@ void print_blabbermouth_positional(Args&&... args) { } -using namespace darma_runtime::keyword_arguments_for_testing; +using namespace darma::keyword_arguments_for_testing;