Skip to content

Commit ba5edf3

Browse files
committed
Merge branch 'STEllAR-GROUP:master' into dev-link
2 parents ed71f41 + 1cb157b commit ba5edf3

403 files changed

Lines changed: 1232 additions & 1061 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cmake/HPX_SetupDatapar.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE")
5252
ADVANCED
5353
)
5454
hpx_option(
55-
HPX_WITH_EVE_TAG STRING "Eve repository tag or branch" "v2023.02.15"
55+
HPX_WITH_Eve_TAG STRING "Eve repository tag or branch" "v2023.02.15"
5656
CATEGORY "Build Targets"
5757
ADVANCED
5858
)

cmake/HPX_SetupEve.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if(("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE") AND NOT TARGET eve::eve)
2929
fetchcontent_declare(
3030
eve
3131
GIT_REPOSITORY https://github.com/jfalcou/eve.git
32-
GIT_TAG ${HPX_WITH_EVE_TAG}
32+
GIT_TAG ${HPX_WITH_Eve_TAG}
3333
)
3434

3535
fetchcontent_getproperties(eve)

components/component_storage/src/component_module.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
#include <hpx/components/component_storage/server/migrate_to_storage.hpp>
1515

16+
#include <hpx/config/warnings_prefix.hpp>
17+
1618
///////////////////////////////////////////////////////////////////////////////
1719
// Add factory registration functionality.
1820
HPX_REGISTER_COMPONENT_MODULE()

components/component_storage/src/component_storage.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <utility>
1717
#include <vector>
1818

19+
#include <hpx/config/warnings_prefix.hpp>
20+
1921
namespace hpx { namespace components {
2022
component_storage::component_storage(hpx::id_type target_locality)
2123
: base_type(hpx::new_<server::component_storage>(target_locality))

components/component_storage/src/server/component_storage_server.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include <vector>
1313

14+
#include <hpx/config/warnings_prefix.hpp>
15+
1416
namespace hpx { namespace components { namespace server {
1517
component_storage::component_storage()
1618
: data_(container_layout(find_all_localities()))

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/detail/view_element.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp>
1414
#include <hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp>
1515
#include <hpx/modules/async_base.hpp>
16+
#include <hpx/modules/runtime_local.hpp>
1617
#include <hpx/naming_base/id_type.hpp>
17-
#include <hpx/runtime_local/get_locality_id.hpp>
1818

1919
#include <cstddef>
2020
#include <cstdint>

components/containers/partitioned_vector/src/partitioned_vector_component_double.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include <vector>
1818

19+
#include <hpx/config/warnings_prefix.hpp>
20+
1921
HPX_REGISTER_PARTITIONED_VECTOR(double)
2022

2123
// an out-of-line definition of a member of a class template cannot have default

components/containers/partitioned_vector/src/partitioned_vector_component_int.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include <vector>
1818

19+
#include <hpx/config/warnings_prefix.hpp>
20+
1921
HPX_REGISTER_PARTITIONED_VECTOR(int)
2022
using long_long = long long;
2123
HPX_REGISTER_PARTITIONED_VECTOR(long_long)

components/containers/partitioned_vector/src/partitioned_vector_component_std_string.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
using std_string = std::string;
2121

22+
#include <hpx/config/warnings_prefix.hpp>
23+
2224
HPX_REGISTER_PARTITIONED_VECTOR(std_string)
2325

2426
// an out-of-line definition of a member of a class template cannot have default

components/containers/partitioned_vector/tests/unit/partitioned_vector_view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <hpx/collectives/spmd_block.hpp>
1010
#include <hpx/components/containers/partitioned_vector/partitioned_vector_local_view.hpp>
1111
#include <hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp>
12-
#include <hpx/executors/execution_policy.hpp>
12+
#include <hpx/modules/executors.hpp>
1313
#include <hpx/hpx_main.hpp>
1414
#include <hpx/include/partitioned_vector_predef.hpp>
1515
#include <hpx/include/partitioned_vector_view.hpp>

0 commit comments

Comments
 (0)