Skip to content

Commit ba7c582

Browse files
franzpoeschelfranzpoeschel
committed
Renaming
1 parent b5cc977 commit ba7c582

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎include/openPMD/LoadStoreChunk.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ class ConfigureLoadStore : protected internal::ConfigureLoadStoreData
9999

100100
// @todo rvalue references..?
101101
template <typename T>
102-
auto fromSharedPtr(std::shared_ptr<T>) -> shared_ptr_return_type<T>;
102+
auto withSharedPtr(std::shared_ptr<T>) -> shared_ptr_return_type<T>;
103103
template <typename T>
104-
auto fromUniquePtr(UniquePtrWithLambda<T>) -> unique_ptr_return_type<T>;
104+
auto withUniquePtr(UniquePtrWithLambda<T>) -> unique_ptr_return_type<T>;
105105
template <typename T, typename Del>
106-
auto fromUniquePtr(std::unique_ptr<T, Del>) -> unique_ptr_return_type<T>;
106+
auto withUniquePtr(std::unique_ptr<T, Del>) -> unique_ptr_return_type<T>;
107107
template <typename T>
108-
auto fromRawPtr(T *data) -> shared_ptr_return_type<T>;
108+
auto withRawPtr(T *data) -> shared_ptr_return_type<T>;
109109
template <typename T_ContiguousContainer>
110-
auto fromContiguousContainer(T_ContiguousContainer &data)
110+
auto withContiguousContainer(T_ContiguousContainer &data)
111111
-> std::enable_if_t<
112112
auxiliary::IsContiguousContainer_v<T_ContiguousContainer>,
113113
shared_ptr_return_type<typename T_ContiguousContainer::value_type>>;

‎include/openPMD/LoadStoreChunk.tpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace openPMD
66
{
77
template <typename ChildClass>
88
template <typename T>
9-
auto ConfigureLoadStore<ChildClass>::fromSharedPtr(std::shared_ptr<T> data)
9+
auto ConfigureLoadStore<ChildClass>::withSharedPtr(std::shared_ptr<T> data)
1010
-> shared_ptr_return_type<T>
1111
{
1212
if (!data)
@@ -20,7 +20,7 @@ auto ConfigureLoadStore<ChildClass>::fromSharedPtr(std::shared_ptr<T> data)
2020
}
2121
template <typename ChildClass>
2222
template <typename T>
23-
auto ConfigureLoadStore<ChildClass>::fromUniquePtr(UniquePtrWithLambda<T> data)
23+
auto ConfigureLoadStore<ChildClass>::withUniquePtr(UniquePtrWithLambda<T> data)
2424
-> unique_ptr_return_type<T>
2525

2626
{
@@ -35,7 +35,7 @@ auto ConfigureLoadStore<ChildClass>::fromUniquePtr(UniquePtrWithLambda<T> data)
3535
}
3636
template <typename ChildClass>
3737
template <typename T>
38-
auto ConfigureLoadStore<ChildClass>::fromRawPtr(T *data)
38+
auto ConfigureLoadStore<ChildClass>::withRawPtr(T *data)
3939
-> shared_ptr_return_type<T>
4040
{
4141
if (!data)
@@ -49,14 +49,14 @@ auto ConfigureLoadStore<ChildClass>::fromRawPtr(T *data)
4949

5050
template <typename ChildClass>
5151
template <typename T, typename Del>
52-
auto ConfigureLoadStore<ChildClass>::fromUniquePtr(std::unique_ptr<T, Del> data)
52+
auto ConfigureLoadStore<ChildClass>::withUniquePtr(std::unique_ptr<T, Del> data)
5353
-> unique_ptr_return_type<T>
5454
{
55-
return fromUniquePtr(UniquePtrWithLambda<T>(std::move(data)));
55+
return withUniquePtr(UniquePtrWithLambda<T>(std::move(data)));
5656
}
5757
template <typename ChildClass>
5858
template <typename T_ContiguousContainer>
59-
auto ConfigureLoadStore<ChildClass>::fromContiguousContainer(
59+
auto ConfigureLoadStore<ChildClass>::withContiguousContainer(
6060
T_ContiguousContainer &data)
6161
-> std::enable_if_t<
6262
auxiliary::IsContiguousContainer_v<T_ContiguousContainer>,
@@ -66,6 +66,6 @@ auto ConfigureLoadStore<ChildClass>::fromContiguousContainer(
6666
{
6767
m_extent = Extent{data.size()};
6868
}
69-
return fromRawPtr(data.data());
69+
return withRawPtr(data.data());
7070
}
7171
} // namespace openPMD

‎include/openPMD/RecordComponent.tpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ RecordComponent::loadChunkAllocate_impl(internal::LoadStoreConfig cfg)
9999
prepareLoadStore()
100100
.offset(std::move(o))
101101
.extent(std::move(e))
102-
.fromSharedPtr(newData)
102+
.withSharedPtr(newData)
103103
.enqueueLoad();
104104
return newData;
105105
#else
106106
auto newData = std::shared_ptr<T[]>(new T[numPoints]);
107107
prepareLoadStore()
108108
.offset(std::move(o))
109109
.extent(std::move(e))
110-
.fromSharedPtr(newData)
110+
.withSharedPtr(newData)
111111
.enqueueLoad();
112112
return std::static_pointer_cast<T>(std::move(newData));
113113
#endif
@@ -134,7 +134,7 @@ inline void RecordComponent::loadChunk(
134134
operation.extent(std::move(e));
135135
}
136136

137-
operation.fromSharedPtr(std::move(data)).enqueueLoad();
137+
operation.withSharedPtr(std::move(data)).enqueueLoad();
138138
}
139139

140140
template <typename T_with_extent>
@@ -209,7 +209,7 @@ inline void RecordComponent::loadChunkRaw(T *ptr, Offset offset, Extent extent)
209209
prepareLoadStore()
210210
.offset(std::move(offset))
211211
.extent(std::move(extent))
212-
.fromRawPtr(ptr)
212+
.withRawPtr(ptr)
213213
.enqueueLoad();
214214
}
215215

@@ -220,7 +220,7 @@ RecordComponent::storeChunk(std::shared_ptr<T> data, Offset o, Extent e)
220220
prepareLoadStore()
221221
.offset(std::move(o))
222222
.extent(std::move(e))
223-
.fromSharedPtr(std::move(data))
223+
.withSharedPtr(std::move(data))
224224
.enqueueStore();
225225
}
226226

@@ -231,7 +231,7 @@ RecordComponent::storeChunk(UniquePtrWithLambda<T> data, Offset o, Extent e)
231231
prepareLoadStore()
232232
.offset(std::move(o))
233233
.extent(std::move(e))
234-
.fromUniquePtr(std::move(data))
234+
.withUniquePtr(std::move(data))
235235
.enqueueStore();
236236
}
237237

@@ -242,7 +242,7 @@ RecordComponent::storeChunk(std::unique_ptr<T, Del> data, Offset o, Extent e)
242242
prepareLoadStore()
243243
.offset(std::move(o))
244244
.extent(std::move(e))
245-
.fromUniquePtr(std::move(data))
245+
.withUniquePtr(std::move(data))
246246
.enqueueStore();
247247
}
248248

@@ -252,7 +252,7 @@ void RecordComponent::storeChunkRaw(T *ptr, Offset offset, Extent extent)
252252
prepareLoadStore()
253253
.offset(std::move(offset))
254254
.extent(std::move(extent))
255-
.fromRawPtr(ptr)
255+
.withRawPtr(ptr)
256256
.enqueueStore();
257257
}
258258

@@ -273,7 +273,7 @@ RecordComponent::storeChunk(T_ContiguousContainer &data, Offset o, Extent e)
273273
storeChunkConfig.extent(std::move(e));
274274
}
275275

276-
std::move(storeChunkConfig).fromContiguousContainer(data).enqueueStore();
276+
std::move(storeChunkConfig).withContiguousContainer(data).enqueueStore();
277277
}
278278

279279
template <typename T, typename F>

‎test/ParallelIOTest.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -440,22 +440,22 @@ void available_chunks_test(std::string const &file_ending)
440440
auto E_y = it0.meshes["E"]["y"];
441441
E_y.resetDataset({Datatype::INT, {5, 3ul * mpi_size}});
442442
E_y.prepareLoadStore()
443-
.fromContiguousContainer(ydata_firstandlastrow)
443+
.withContiguousContainer(ydata_firstandlastrow)
444444
.offset({0, 3ul * mpi_rank})
445445
.extent({1, 3})
446446
.enqueueStore();
447447
E_y.prepareLoadStore()
448448
.offset({1, 3ul * mpi_rank})
449449
.extent({3, 3})
450-
.fromContiguousContainer(ydata)
450+
.withContiguousContainer(ydata)
451451
.memorySelection({{1, 1}, {5, 5}})
452452
.enqueueStore();
453453
// if condition checks if this PR is available in ADIOS2:
454454
// https://github.com/ornladios/ADIOS2/pull/4169
455455
if constexpr (CanTheMemorySelectionBeReset)
456456
{
457457
E_y.prepareLoadStore()
458-
.fromContiguousContainer(ydata_firstandlastrow)
458+
.withContiguousContainer(ydata_firstandlastrow)
459459
.offset({4, 3ul * mpi_rank})
460460
.extent({1, 3})
461461
.enqueueStore();

0 commit comments

Comments
 (0)