[Patch] Follow up to #1531 - Layers: Add layers in layout, and replace it in scheduler #1701
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,123 @@ | ||
| // -------------------------------------------------------// | ||
| // | ||
| // SHAMROCK code for hydrodynamics | ||
| // Copyright (c) 2021-2026 Timothée David--Cléris <tim.shamrock@proton.me> | ||
| // SPDX-License-Identifier: CeCILL Free Software License Agreement v2.1 | ||
| // Shamrock is licensed under the CeCILL 2.1 License, see LICENSE for more information | ||
| // | ||
| // -------------------------------------------------------// | ||
|
|
||
| #pragma once | ||
|
|
||
| /** | ||
| * @file PatchDataLayout.hpp | ||
| * @author Timothée David--Cléris (tim.shamrock@proton.me) | ||
| * @author Yona Lapeyre (yona.lapeyre@ens-lyon.fr) | ||
| * @brief | ||
| */ | ||
|
|
||
| #include "shambase/memory.hpp" | ||
| #include "shamrock/patch/PatchDataLayerLayout.hpp" | ||
| #include <initializer_list> | ||
| #include <memory> | ||
| #include <vector> | ||
|
|
||
| namespace shamrock::patch { | ||
|
|
||
| /** | ||
| * @brief PatchDataLayerLayout container class | ||
| * This class store the layout of the layers | ||
| */ | ||
| class PatchDataLayout { | ||
| public: | ||
| struct LayerEntry { | ||
| std::shared_ptr<shamrock::patch::PatchDataLayerLayout> layout; | ||
| std::string name; | ||
|
|
||
| inline friend bool operator==(const LayerEntry &lhs, const LayerEntry &rhs) { | ||
| return lhs.name == rhs.name | ||
| && shambase::get_check_ref(lhs.layout) | ||
| == shambase::get_check_ref(rhs.layout); | ||
| } | ||
| }; | ||
|
|
||
| std::vector<LayerEntry> layer_layouts; | ||
|
|
||
| PatchDataLayout() = default; | ||
|
|
||
| PatchDataLayout(const std::vector<std::string> &layer_names) | ||
| : layer_layouts{layer_names.size()} { | ||
| for (size_t i = 0; i < layer_layouts.size(); i++) { | ||
| layer_layouts[i].name = layer_names[i]; | ||
| layer_layouts[i].layout = std::make_shared<PatchDataLayerLayout>(); | ||
| } | ||
| } | ||
|
Comment on lines
+48
to
+54
Contributor
There was a problem hiding this comment. This constructor can be implemented more idiomatically using modern C++ features like PatchDataLayout(const std::vector<std::string> &layer_names) {
layer_layouts.reserve(layer_names.size());
for (const auto &name : layer_names) {
layer_layouts.push_back({std::make_shared<PatchDataLayerLayout>(), name});
}
} |
||
|
|
||
| PatchDataLayout(std::initializer_list<std::string> layer_names) | ||
| : PatchDataLayout(std::vector<std::string>(layer_names)) {} | ||
|
|
||
| size_t get_layer_count() const { return layer_layouts.size(); } | ||
|
|
||
| size_t get_layer_index(const std::string &name) const { | ||
| for (size_t i = 0; i < layer_layouts.size(); i++) { | ||
| if (layer_layouts[i].name == name) { | ||
| return i; | ||
| } | ||
| } | ||
| throw shambase::make_except_with_loc<std::invalid_argument>( | ||
| "the requested layer does not exists"); | ||
| } | ||
|
Comment on lines
+61
to
+69
Contributor
There was a problem hiding this comment. This loop can be replaced with size_t get_layer_index(const std::string &name) const {
auto it = std::find_if(layer_layouts.begin(), layer_layouts.end(),
[&name](const LayerEntry &entry) {
return entry.name == name;
});
if (it != layer_layouts.end()) {
return std::distance(layer_layouts.begin(), it);
}
throw shambase::make_except_with_loc<std::invalid_argument>(
"the requested layer does not exists");
} |
||
|
|
||
| inline std::shared_ptr<PatchDataLayerLayout> &get_layer_ptr(size_t idx) { | ||
| return layer_layouts.at(idx).layout; | ||
| } | ||
|
|
||
| inline const std::shared_ptr<PatchDataLayerLayout> &get_layer_ptr(size_t idx) const { | ||
| return layer_layouts.at(idx).layout; | ||
| } | ||
|
|
||
| inline PatchDataLayerLayout &get_layer_ref(size_t idx) { | ||
| return shambase::get_check_ref(get_layer_ptr(idx)); | ||
| } | ||
|
|
||
| inline std::shared_ptr<PatchDataLayerLayout> &get_layer_ptr(const std::string &name) { | ||
| return get_layer_ptr(get_layer_index(name)); | ||
| } | ||
|
|
||
| inline const std::shared_ptr<PatchDataLayerLayout> &get_layer_ptr( | ||
| const std::string &name) const { | ||
| return get_layer_ptr(get_layer_index(name)); | ||
| } | ||
|
|
||
| inline PatchDataLayerLayout &get_layer_ref(const std::string &name) { | ||
| return get_layer_ref(get_layer_index(name)); | ||
| } | ||
|
|
||
| inline friend bool operator==(const PatchDataLayout &lhs, const PatchDataLayout &rhs) { | ||
| return lhs.layer_layouts == rhs.layer_layouts; | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * @brief Serialize a PatchDataLayout object to a JSON object | ||
| * | ||
| * This function takes a PatchDataLayout object and serializes it to a JSON object. | ||
| * It is used to convert the PatchDataLayout object to a JSON string. | ||
| * | ||
| * @param j The JSON object to serialize the PatchDataLayout object to | ||
| * @param p The PatchDataLayout object to serialize | ||
| */ | ||
| void to_json(nlohmann::json &j, const PatchDataLayout &p); | ||
|
|
||
| /** | ||
| * @brief Deserialize a PatchDataLayout object from a JSON object | ||
| * | ||
| * This function takes a JSON object and deserializes it to a PatchDataLayout object. | ||
| * It is used to convert a JSON string to a PatchDataLayout object. | ||
| * | ||
| * @param j The JSON object to deserialize the PatchDataLayout object from | ||
| * @param p The PatchDataLayout object to deserialize | ||
| */ | ||
| void from_json(const nlohmann::json &j, PatchDataLayout &p); | ||
|
|
||
| } // namespace shamrock::patch | ||
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.