From 07f0011c7ef258feb3a0554bf7afc07bba638fc0 Mon Sep 17 00:00:00 2001
From: NAUD Maxence <maxence.naud@cea.fr>
Date: Mon, 21 Oct 2024 15:16:34 +0000
Subject: [PATCH] Revert "Merge remote-tracking branch
'origin/allowNoInputProducer' into allowNoInputProducer"
This reverts commit d5c01e1cea18a028624c884d07ada4b5d8692d52, reversing
changes made to e878ce910542dcab8c3328edfb0548dad9f1bc07.
---
python_binding/data/pybind_Data.cpp | 10 ----------
src/backend/OperatorImpl.cpp | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/python_binding/data/pybind_Data.cpp b/python_binding/data/pybind_Data.cpp
index 13daf2198..b1e879d83 100644
--- a/python_binding/data/pybind_Data.cpp
+++ b/python_binding/data/pybind_Data.cpp
@@ -60,16 +60,6 @@ void init_Data(py::module& m){
bindEnum<DataType>(m, "dtype");
bindEnum<DataFormat>(m, "dformat");
- py::enum_<DataFormat>(m, "dformat")
- .value("Default", DataFormat::Default)
- .value("NCHW", DataFormat::NCHW)
- .value("NHWC", DataFormat::NHWC)
- .value("CHWN", DataFormat::CHWN)
- .value("NCDHW", DataFormat::NCDHW)
- .value("NDHWC", DataFormat::NDHWC)
- .value("CDHWN", DataFormat::CDHWN)
- ;
-
py::class_<Data, std::shared_ptr<Data>>(m,"Data");
diff --git a/src/backend/OperatorImpl.cpp b/src/backend/OperatorImpl.cpp
index d2e68710b..dd5c5c110 100644
--- a/src/backend/OperatorImpl.cpp
+++ b/src/backend/OperatorImpl.cpp
@@ -128,8 +128,8 @@ Aidge::ImplSpec Aidge::OperatorImpl::getBestMatch(const ImplSpec& requiredSpecs)
const auto qualifierPos = std::find_if(attrName.begin(), attrName.end(),
[](char c) { return c == ':'; });
if (qualifierPos != attrName.end()) {
- name = attrName.substr(0, (qualifierPos - attrName.begin()));
- qualifier = attrName.substr((qualifierPos - attrName.begin())+1);
+ name = attrName.substr(0, qualifierPos - attrName.begin());
+ qualifier = attrName.substr(qualifierPos - attrName.begin() + 1);
}
const bool mandatory = (qualifier == "!");
if (mandatory) {
--
GitLab