saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-03 23:49:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WinML RT API: Add PixelRange Metadata to Bind() call PropertySet (#9827)

Browse source 
* Enable Normalization Binding Metadata

* copy paste error

* Small fix.

Co-authored-by: Sheil Kumar <sheilk@microsoft.com>
This commit is contained in:
Sheil Kumar 2021-11-24 13:44:25 -08:00 committed by GitHub
parent 18fd2cf457
commit 53c43e9949
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
winml/lib/Api/ImageFeatureValue.cpp
View file

@ -123,6 +123,25 @@ static std::optional<wgi::BitmapBounds> GetBoundsFromMetadata(const wfc::IProper
return {};
}
static std::optional<winml::LearningModelPixelRange> GetBitmapPixelRangeFromMetadata(const wfc::IPropertySet& properties) {
if (properties != nullptr && properties.HasKey(L"PixelRange")) {
if (auto pixelRangeInspectable = properties.Lookup(L"PixelRange")) {
auto pixelRangeValue = pixelRangeInspectable.as<wf::IPropertyValue>();
auto pixelRange = static_cast<winml::LearningModelPixelRange>(pixelRangeValue.GetInt32());
WINML_THROW_HR_IF_FALSE_MSG(
WINML_ERR_INVALID_BINDING,
pixelRange == winml::LearningModelPixelRange::ZeroTo255 ||
pixelRange == winml::LearningModelPixelRange::ZeroToOne ||
pixelRange == winml::LearningModelPixelRange::MinusOneToOne,
"LearningModelPixelRange must be either ZeroTo255, ZeroToOne, or MinusOneToOne");
return pixelRange;
}
}
return {};
}
wgi::BitmapBounds ImageFeatureValue::CenterAndCropBounds(
uint32_t idx,
uint32_t desiredWidth,
@ -366,7 +385,6 @@ std::optional<ImageFeatureValue::ImageResourceMetadata> ImageFeatureValue::GetIn
// TODO: Validate Bounds
// Set up BitmapPixelFormat
auto pixelFormat = std::optional<wgi::BitmapPixelFormat>{};
pixelFormat = GetBitmapPixelFormatFromMetadata(context.properties);
if (!pixelFormat.has_value() && spImageDescriptor) {
@ -387,13 +405,21 @@ std::optional<ImageFeatureValue::ImageResourceMetadata> ImageFeatureValue::GetIn
}
// Set up LearningModelPixelRange
winml::LearningModelPixelRange pixelRange = winml::LearningModelPixelRange::ZeroTo255; //default;
if (spImageDescriptor) {
auto pixelRange = std::optional<winml::LearningModelPixelRange>{};
pixelRange = GetBitmapPixelRangeFromMetadata(context.properties);
if (pixelRange.has_value()) {
// The pixel range was set by the bind properties, skip all checks and honor
// the user provided normalization property. Do nothing.
} else if (!pixelRange.has_value() && spImageDescriptor) {
pixelRange = spImageDescriptor->PixelRange();
} else if (!pixelRange.has_value() && spTensorDescriptor) {
pixelRange = winml::LearningModelPixelRange::ZeroTo255; //default;
} else {
THROW_HR(WINML_ERR_INVALID_BINDING);
}
//NCHW layout
auto imageTensorDescriptor = CreateImageTensorDescriptor(tensorKind, pixelFormat.value(), pixelRange, m_batchSize, descriptorWidth, descriptorHeight);
auto imageTensorDescriptor = CreateImageTensorDescriptor(tensorKind, pixelFormat.value(), pixelRange.value(), m_batchSize, descriptorWidth, descriptorHeight);
return ImageResourceMetadata{bounds, imageTensorDescriptor};
}

8
winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp
View file

@ -260,6 +260,14 @@ static void Scenario6BindWithProperties() {
// insert it in the property set
propertySet.Insert(L"BitmapPixelFormat", bitmapPixelFormatProperty);
// make a LearningModelPixelRange
LearningModelPixelRange pixelRange = LearningModelPixelRange::ZeroTo255;
// translate it to an int so it can be used as a PropertyValue;
int intFromLearningModelPixelRange = static_cast<int>(pixelRange);
auto pixelRangeProperty = wf::PropertyValue::CreateInt32(intFromLearningModelPixelRange);
// insert it in the property set
propertySet.Insert(L"PixelRange", pixelRangeProperty);
// bind with properties
WINML_EXPECT_NO_THROW(binding.Bind(input.Name(), imageValue, propertySet));
}