-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes needed to adapt for HPX V1.5
- enable all tests for HPX
- Loading branch information
Showing
33 changed files
with
3,029 additions
and
2,882 deletions.
There are no files selected for viewing
Submodule cinch
updated
6 files
| +0 −11 | auxiliary/cinchtest.h | |
| +56 −11 | auxiliary/test-hpx.cc | |
| +1 −1 | cmake/detail/test-policies.cmake | |
| +1 −0 | cmake/devel.cmake | |
| +2 −0 | cmake/hpx.cmake | |
| +3 −3 | cmake/unit.cmake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| /* | ||
| @@@@@@@@ @@ @@@@@@ @@@@@@@@ @@ | ||
| /@@///// /@@ @@////@@ @@////// /@@ | ||
| /@@ /@@ @@@@@ @@ // /@@ /@@ | ||
| /@@@@@@@ /@@ @@///@@/@@ /@@@@@@@@@/@@ | ||
| /@@//// /@@/@@@@@@@/@@ ////////@@/@@ | ||
| /@@ /@@/@@//// //@@ @@ /@@/@@ | ||
| /@@ @@@//@@@@@@ //@@@@@@ @@@@@@@@ /@@ | ||
| // /// ////// ////// //////// // | ||
| Copyright (c) 2018, Los Alamos National Security, LLC | ||
| All rights reserved. | ||
| */ | ||
| #pragma once | ||
|
|
||
| /*! @file */ | ||
|
|
||
| //----------------------------------------------------------------------------// | ||
| // POLICY_NAMESPACE must be defined before including storage_class.h!!! | ||
| // Using this approach allows us to have only one storage_class_u | ||
| // definition that can be used by all data policies -> code reuse... | ||
| #define POLICY_NAMESPACE hpx | ||
| #include <flecsi/data/storage_class.h> | ||
| #undef POLICY_NAMESPACE | ||
| //----------------------------------------------------------------------------// | ||
|
|
||
| #include <flecsi/data/common/privilege.h> | ||
| #include <flecsi/data/data_client.h> | ||
| #include <flecsi/data/global_data_handle.h> | ||
| #include <flecsi/data/storage.h> | ||
| #include <flecsi/execution/context.h> | ||
|
|
||
| #include <flecsi/utils/const_string.h> | ||
|
|
||
| namespace flecsi { | ||
| namespace data { | ||
| namespace hpx { | ||
|
|
||
| //----------------------------------------------------------------------------// | ||
| // Global handle. | ||
| //----------------------------------------------------------------------------// | ||
|
|
||
| /*! | ||
| The color_handle_u provide an access to color variables that have | ||
| been registered in data model | ||
| \tparam T The type of the data variable. If this type is not | ||
| consistent with the type used to register the data, bad things | ||
| can happen. However, it can be useful to reinterpret the type, | ||
| e.g., when writing raw bytes. This class is part of the | ||
| low-level \e flecsi interface, so it is assumed that you | ||
| know what you are doing... | ||
| @tparam PERMISSIONS The permissions to the handle. | ||
| */ | ||
|
|
||
| template<typename T, size_t PERMISSIONS> | ||
| struct color_handle_u : public global_data_handle_u<T, PERMISSIONS> { | ||
|
|
||
| /*! | ||
| Type definitions. | ||
| */ | ||
|
|
||
| using base_t = global_data_handle_u<T, PERMISSIONS>; | ||
|
|
||
| /*! | ||
| Constructor. | ||
| */ | ||
|
|
||
| color_handle_u() { | ||
| base_t::color = true; | ||
| } | ||
|
|
||
| /*! | ||
| Destructor. | ||
| */ | ||
|
|
||
| ~color_handle_u() {} | ||
|
|
||
| /* | ||
| Copy constructor. | ||
| */ | ||
|
|
||
| template<size_t P2> | ||
| color_handle_u(const color_handle_u<T, P2> & a) | ||
| : base_t(reinterpret_cast<const base_t &>(a)), label_(a.label()), | ||
| size_(a.size()) { | ||
| static_assert(P2 == 0, "passing mapped handle to task args"); | ||
| } | ||
|
|
||
| //--------------------------------------------------------------------------// | ||
| // Member data interface. | ||
| //--------------------------------------------------------------------------// | ||
|
|
||
| /*! | ||
| \brief Return a std::string containing the label of the data variable | ||
| reference by this handle. | ||
| */ | ||
|
|
||
| const std::string & label() const { | ||
| return label_; | ||
| } // label | ||
|
|
||
| /*! | ||
| \brief Return the index space size of the data variable | ||
| referenced by this handle. | ||
| */ | ||
|
|
||
| size_t size() const { | ||
| return size_; | ||
| } // size | ||
|
|
||
| /*! | ||
| \brief Test to see if this handle is empty | ||
| \return true if registered. | ||
| */ | ||
|
|
||
| operator bool() const { | ||
| return base_t::combined_data != nullptr; | ||
| } // operator bool | ||
|
|
||
| private: | ||
| std::string label_ = ""; | ||
| size_t size_ = 1; | ||
| }; // struct color_handle_u | ||
|
|
||
| //+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=// | ||
| // Main type definition. | ||
| //+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=// | ||
|
|
||
| //----------------------------------------------------------------------------// | ||
| // Global storage type. | ||
| //----------------------------------------------------------------------------// | ||
|
|
||
| /*! | ||
| FIXME: Global storage type. | ||
| */ | ||
| template<> | ||
| struct storage_class_u<storage_label_type_t::color> { | ||
|
|
||
| /*! | ||
| Type definitions. | ||
| */ | ||
|
|
||
| template<typename T, size_t PERMISSIONS> | ||
| using handle_t = color_handle_u<T, PERMISSIONS>; | ||
|
|
||
| /*! | ||
| Data handles. | ||
| */ | ||
|
|
||
| template<typename DATA_CLIENT_TYPE, | ||
| typename DATA_TYPE, | ||
| size_t NAMESPACE, | ||
| size_t NAME, | ||
| size_t VERSION, | ||
| size_t PERMISSIONS> | ||
| static handle_t<DATA_TYPE, 0> get_handle( | ||
| const data_client_handle<DATA_CLIENT_TYPE, PERMISSIONS> & client_handle) { | ||
| handle_t<DATA_TYPE, 0> h; | ||
| auto & context = execution::context_t::instance(); | ||
|
|
||
| auto & field_info = context.get_field_info_from_name( | ||
| typeid(typename DATA_CLIENT_TYPE::type_identifier_t).hash_code(), | ||
| utils::hash::field_hash<NAMESPACE, NAME>(VERSION)); | ||
|
|
||
| auto & registered_field_data = context.registered_field_data(); | ||
| auto fieldDataIter = registered_field_data.find(field_info.fid); | ||
| if(fieldDataIter == registered_field_data.end()) { | ||
| // TODO: deal with VERSION | ||
| context.register_field_data(field_info.fid, field_info.size); | ||
| } | ||
|
|
||
| auto data = registered_field_data[field_info.fid].data(); | ||
|
|
||
| h.fid = field_info.fid; | ||
| h.index_space = field_info.index_space; | ||
| h.data_client_hash = field_info.data_client_hash; | ||
|
|
||
| h.combined_data = reinterpret_cast<DATA_TYPE *>(data); | ||
|
|
||
| h.color = true; | ||
| h.state = context.execution_state(); | ||
|
|
||
| return h; | ||
| } | ||
|
|
||
| }; // struct storage_class_u | ||
|
|
||
| } // namespace hpx | ||
| } // namespace data | ||
| } // namespace flecsi |
Oops, something went wrong.