diff --git a/python_binding/data/pybind_DataFormat.cpp b/python_binding/data/pybind_DataFormat.cpp index a63df321c3298284df7de8fd2c3eb0fc0cecae24..5308fb3023e15a74f0dc5f674917d7ae65cbb52f 100644 --- a/python_binding/data/pybind_DataFormat.cpp +++ b/python_binding/data/pybind_DataFormat.cpp @@ -66,7 +66,7 @@ void bindEnum(py::module& m, const std::string& name) { void init_DataFormat(py::module& m) { bindEnum<DataFormat>(m, "dformat"); m.def("format_as", (const char* (*)(DataFormat)) &format_as, py::arg("df")); - m.def("get_data_format_transpose", &getDataFormatTranspose, py::arg("src"), py::arg("dst")); + m.def("get_permutation_mapping", &getPermutationMapping, py::arg("src"), py::arg("dst")); } } // namespace Aidge diff --git a/src/backend/OperatorImpl.cpp b/src/backend/OperatorImpl.cpp index 08f5fe671c7502a6c5fe01dbdfb7ae4c9b95ac81..480e751807d85c4f74039e35c284f13f03013650 100644 --- a/src/backend/OperatorImpl.cpp +++ b/src/backend/OperatorImpl.cpp @@ -196,7 +196,7 @@ bool Aidge::OperatorImpl::checkIOSpec(const ImplSpec::IOSpec& required, const Im && spec.format != DataFormat::Any && required.format != spec.format) { - const auto transpose = getDataFormatTranspose(required.format, spec.format); + const auto transpose = getPermutationMapping(required.format, spec.format); std::vector<size_t> identity(transpose.size()); std::iota(std::begin(identity), std::end(identity), 0); @@ -261,7 +261,7 @@ std::shared_ptr<Aidge::Node> Aidge::OperatorImpl::getAdaptation(const ImplSpec& && IOSpec.format != DataFormat::Any && requiredIOSpec.format != IOSpec.format) { - const auto transpose = getDataFormatTranspose(requiredIOSpec.format, IOSpec.format); + const auto transpose = getPermutationMapping(requiredIOSpec.format, IOSpec.format); auto transposeOp = Transpose(std::vector<DimSize_t>(transpose.begin(), transpose.end())); transposeOp->getOperator()->setDataFormat(IOSpec.format); transposeOp->getOperator()->setDataType(requiredIOSpec.type); @@ -315,7 +315,7 @@ std::shared_ptr<Aidge::Node> Aidge::OperatorImpl::getAdaptation(const ImplSpec& && IOSpec.format != DataFormat::Any && requiredIOSpec.format != IOSpec.format) { - const auto transpose = getDataFormatTranspose(IOSpec.format, requiredIOSpec.format); + const auto transpose = getPermutationMapping(IOSpec.format, requiredIOSpec.format); auto transposeOp = Transpose(std::vector<DimSize_t>(transpose.begin(), transpose.end())); transposeOp->getOperator()->setDataFormat(requiredIOSpec.format); transposeOp->getOperator()->setDataType(requiredIOSpec.type); diff --git a/src/recipes/ExplicitTranspose.cpp b/src/recipes/ExplicitTranspose.cpp index 7ff971b7e436219d5dfbb7cbadbaf780d3f1aeda..c4e2c425c93f6306373a49c29b1d117a03af04ae 100644 --- a/src/recipes/ExplicitTranspose.cpp +++ b/src/recipes/ExplicitTranspose.cpp @@ -94,14 +94,14 @@ void Aidge::explicitTranspose(std::shared_ptr<GraphView> graph) { else { // Case 2: change of format // => compute the new permutation array - const auto transpose = getDataFormatTranspose(parentInput->dataFormat(), output->dataFormat()); + const auto transpose = getPermutationMapping(parentInput->dataFormat(), output->dataFormat()); auto transposeOp = std::static_pointer_cast<Transpose_Op>(parent.first->getOperator()); transposeOp->setDataFormat(output->dataFormat()); transposeOp->outputDimsOrder() = std::vector<DimSize_t>(transpose.begin(), transpose.end()); } } else { - const auto transpose = getDataFormatTranspose(input->dataFormat(), output->dataFormat()); + const auto transpose = getPermutationMapping(input->dataFormat(), output->dataFormat()); auto transposeOp = Transpose(std::vector<DimSize_t>(transpose.begin(), transpose.end())); transposeOp->getOperator()->setDataFormat(output->dataFormat()); transposeOp->getOperator()->setDataType(output->dataType());