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

Merge remote-tracking branch 'origin/allowNoInputProducer' into allowNoInputProducer

parents e878ce91 888abcaf
No related branches found
No related tags found
3 merge requests!279v0.4.0,!253v0.4.0,!163Export refactor
Pipeline #57403 failed
...@@ -60,6 +60,16 @@ void init_Data(py::module& m){ ...@@ -60,6 +60,16 @@ void init_Data(py::module& m){
bindEnum<DataType>(m, "dtype"); bindEnum<DataType>(m, "dtype");
bindEnum<DataFormat>(m, "dformat"); 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"); py::class_<Data, std::shared_ptr<Data>>(m,"Data");
......
...@@ -128,8 +128,8 @@ Aidge::ImplSpec Aidge::OperatorImpl::getBestMatch(const ImplSpec& requiredSpecs) ...@@ -128,8 +128,8 @@ Aidge::ImplSpec Aidge::OperatorImpl::getBestMatch(const ImplSpec& requiredSpecs)
const auto qualifierPos = std::find_if(attrName.begin(), attrName.end(), const auto qualifierPos = std::find_if(attrName.begin(), attrName.end(),
[](char c) { return c == ':'; }); [](char c) { return c == ':'; });
if (qualifierPos != attrName.end()) { if (qualifierPos != attrName.end()) {
name = attrName.substr(0, qualifierPos - attrName.begin()); name = attrName.substr(0, (qualifierPos - attrName.begin()));
qualifier = attrName.substr(qualifierPos - attrName.begin() + 1); qualifier = attrName.substr((qualifierPos - attrName.begin())+1);
} }
const bool mandatory = (qualifier == "!"); const bool mandatory = (qualifier == "!");
if (mandatory) { if (mandatory) {
......
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