Skip to content
Snippets Groups Projects
Commit ed10a0f2 authored by Maxence Naud's avatar Maxence Naud
Browse files

[Rmv] Comment HorizontalTiling recipie and its test

parent c7d07439
No related branches found
No related tags found
2 merge requests!46Remove Operator reference to Tensor,!20Draft: Introduction of Tiling
...@@ -68,10 +68,10 @@ void fuseBatchNorm(std::set<std::shared_ptr<Node>> nodes); ...@@ -68,10 +68,10 @@ void fuseBatchNorm(std::set<std::shared_ptr<Node>> nodes);
*/ */
void fuseBatchNorm(std::shared_ptr<GraphView> graphView); void fuseBatchNorm(std::shared_ptr<GraphView> graphView);
std::set<std::shared_ptr<Node>> getHorizontalTiling(const std::shared_ptr<Node>& node, const DimIdx_t axis, const std::size_t nbSlices); // std::set<std::shared_ptr<Node>> getHorizontalTiling(const std::shared_ptr<Node>& node, const DimIdx_t axis, const std::size_t nbSlices);
void horizontalTiling(std::shared_ptr<Node> node, DimIdx_t dim, std::size_t nbSlices); // void horizontalTiling(std::shared_ptr<Node> node, DimIdx_t dim, std::size_t nbSlices);
std::set<std::shared_ptr<Node>> getHorizontalTiling(std::set<std::shared_ptr<Node>> setOfNodes, DimIdx_t dim, std::size_t nbSlices); // std::set<std::shared_ptr<Node>> getHorizontalTiling(std::set<std::shared_ptr<Node>> setOfNodes, DimIdx_t dim, std::size_t nbSlices);
void horizontalTiling(std::set<std::shared_ptr<Node>> setOfNodes, DimIdx_t dim, std::size_t nbSlices); // void horizontalTiling(std::set<std::shared_ptr<Node>> setOfNodes, DimIdx_t dim, std::size_t nbSlices);
} }
......
/******************************************************************************** // /********************************************************************************
* Copyright (c) 2023 CEA-List // * Copyright (c) 2023 CEA-List
* // *
* This program and the accompanying materials are made available under the // * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at // * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. // * http://www.eclipse.org/legal/epl-2.0.
* // *
* SPDX-License-Identifier: EPL-2.0 // * SPDX-License-Identifier: EPL-2.0
* // *
********************************************************************************/ // ********************************************************************************/
// #include <catch2/catch_test_macros.hpp> // #include <catch2/catch_test_macros.hpp>
// #include <set> // #include <set>
...@@ -124,31 +124,37 @@ ...@@ -124,31 +124,37 @@
// { // {
// { // {
// {{ 15226, 15577, 15928}, // {{ 15226, 15577, 15928},
// { 16981, 17332, 17683}, // { 16981, 17332, 17683},
// { 18736, 19087, 19438}}, // { 18736, 19087, 19438}},
// {{ 37818, 38898, 39978}, // {{ 37818, 38898, 39978},
// { 43218, 44298, 45378}, // { 43218, 44298, 45378},
// { 48618, 49698, 50778}}, // { 48618, 49698, 50778}},
// {{ 60426, 62235, 64044}, // {{ 60426, 62235, 64044},
// { 69471, 71280, 73089}, // { 69471, 71280, 73089},
// { 78516, 80325, 82134}}, // { 78516, 80325, 82134}},
// {{ 83016, 85554, 88092}, // {{ 83016, 85554, 88092},
// { 95706, 98244, 100782}, // { 95706, 98244, 100782},
// {108396, 110934, 113472}} // {108396, 110934, 113472}}
// }, // },
// { // {
// {{ 41551, 41902, 42253}, // {{ 41551, 41902, 42253},
// { 43306, 43657, 44008}, // { 43306, 43657, 44008},
// { 45061, 45412, 45763}}, // { 45061, 45412, 45763}},
// {{118818, 119898, 120978}, // {{118818, 119898, 120978},
// {124218, 125298, 126378}, // {124218, 125298, 126378},
// {129618, 130698, 131778}}, // {129618, 130698, 131778}},
// {{196101, 197910, 199719}, // {{196101, 197910, 199719},
// {205146, 206955, 208764}, // {205146, 206955, 208764},
// {214191, 216000, 217809}}, // {214191, 216000, 217809}},
// {{273366, 275904, 278442}, // {{273366, 275904, 278442},
// {286056, 288594, 291132}, // {286056, 288594, 291132},
// {298746, 301284, 303822}} // {298746, 301284, 303822}}
// } // }
// } // }
// }); // });
...@@ -159,9 +165,7 @@ ...@@ -159,9 +165,7 @@
// std::shared_ptr<GraphView> g; // std::shared_ptr<GraphView> g;
// g->add(myConv); // g->add(myConv);
// auto tiledConv = horizontalTile({myConv}, 3); // horizontalTiling({myConv}, 3);
// g->replace({myConv}, {tiledConv});
// SequentialScheduler s(g); // SequentialScheduler s(g);
// s->forward(); // s->forward();
...@@ -169,25 +173,28 @@ ...@@ -169,25 +173,28 @@
// // myConv->getOperator()->getOutput(0)->print(); // // myConv->getOperator()->getOutput(0)->print();
// REQUIRE(*(myConv->getOperator()->getOutput(0)) == *myOutput); // REQUIRE(*(myConv->getOperator()->getOutput(0)) == *myOutput);
// } // }
// std::shared_ptr<GraphView> g = Sequential({ // }
// Conv(3, 16, {3,3}, "conv1"), // }
// ReLU("relu1"),
// Conv(16, 32, {1,1}, "conv2"),
// Conv(32, 16, {1,1}, "conv3"),
// Conv(16, 10, {3,3}, "conv4"),
// ReLU("relu2")
// });
// for (auto& individualConv : g->match("Conv")) {
// auto tiledConv = horizontalTiling(individualConv);
// g->replace(individualConv, tiledConv);
// }
// }
// SECTION("Create the GraphView with tiled layers") {
// std::shared_ptr<GraphView> g;
// g->addChild(horizontalTiling(Conv()))
// }
// } // }
// } // namespace Aidge // // std::shared_ptr<GraphView> g = Sequential({
\ No newline at end of file // // Conv(3, 16, {3,3}, "conv1"),
// // ReLU("relu1"),
// // Conv(16, 32, {1,1}, "conv2"),
// // Conv(32, 16, {1,1}, "conv3"),
// // Conv(16, 10, {3,3}, "conv4"),
// // ReLU("relu2")
// // });
// // for (auto& individualConv : g->match("Conv")) {
// // auto tiledConv = horizontalTiling(individualConv);
// // g->replace(individualConv, tiledConv);
// // }
// // }
// // SECTION("Create the GraphView with tiled layers") {
// // std::shared_ptr<GraphView> g;
// // g->addChild(horizontalTiling(Conv()))
// // }
// // }
// // } // namespace Aidge
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment