[CoreML] Add Xcode 9 Beta 1 bindings #2275
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // | ||
| // MLDictionaryFeatureProvider.cs | ||
| // | ||
| // Authors: | ||
| // Alex Soto <alexsoto@microsoft.com> | ||
| // | ||
| // Copyright 2017 Xamarin Inc. All rights reserved. | ||
| // | ||
|
|
||
| #if XAMCORE_2_0 | ||
|
|
||
| using System; | ||
| using XamCore.Foundation; | ||
| using XamCore.ObjCRuntime; | ||
|
|
||
| namespace XamCore.CoreML { | ||
| public partial class MLDictionaryFeatureProvider { | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| public MLFeatureValue this [string featureName] { | ||
| get { return GetFeatureValue (featureName); } | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // MLMultiArray.cs | ||
| // | ||
| // Authors: | ||
| // Alex Soto <alexsoto@microsoft.com> | ||
| // | ||
| // Copyright 2017 Xamarin Inc. All rights reserved. | ||
| // | ||
|
|
||
| #if XAMCORE_2_0 | ||
|
|
||
| using System; | ||
| using XamCore.Foundation; | ||
| using XamCore.ObjCRuntime; | ||
|
|
||
| namespace XamCore.CoreML { | ||
| public partial class MLMultiArray { | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| public NSNumber this [nint idx] { | ||
| get { return GetObject (idx); } | ||
| set { SetObject (value, idx); } | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| public NSNumber this [NSNumber [] key] { | ||
| get { return GetObject (key); } | ||
| set { SetObject (value, key); } | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,270 @@ | ||
| // | ||
| // CoreML C# bindings | ||
| // | ||
| // Authors: | ||
| // Alex Soto <alexsoto@microsoft.com> | ||
| // | ||
| // Copyright 2017 Xamarin Inc. All rights reserved. | ||
| // | ||
|
|
||
| #if XAMCORE_2_0 | ||
|
|
||
| using System; | ||
| using XamCore.ObjCRuntime; | ||
| using XamCore.CoreFoundation; | ||
| using XamCore.Foundation; | ||
|
|
||
| #if !WATCH | ||
| using XamCore.CoreVideo; | ||
| #endif | ||
|
|
||
| namespace XamCore.CoreML { | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [Native] | ||
| public enum MLFeatureType : nint { | ||
| Invalid = 0, | ||
| Int64 = 1, | ||
| Double = 2, | ||
| String = 3, | ||
| Image = 4, | ||
| MultiArray = 5, | ||
| Dictionary = 6 | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [ErrorDomain ("MLModelErrorDomain")] | ||
| [Native] | ||
| public enum MLModelError : nint { | ||
| Generic = 0, | ||
| FeatureType = 1, | ||
| DescriptionMismatch = 2, | ||
| Io = 3 | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [Native] | ||
| public enum MLMultiArrayDataType : nint { | ||
| Double = 65536 | 64, | ||
| Float32 = 65536 | 32, | ||
| Int32 = 131072 | 32 | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLDictionaryFeatureProvider : MLFeatureProvider { | ||
|
|
||
| [Export ("dictionary")] | ||
| NSDictionary<NSString, MLFeatureValue> Dictionary { get; } | ||
|
|
||
| [Export ("initWithDictionary:error:")] | ||
| IntPtr Constructor (NSDictionary<NSString, NSObject> dictionary, out NSError error); | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLFeatureDescription : NSCopying { | ||
|
|
||
| [Export ("name")] | ||
| string Name { get; } | ||
|
|
||
| [Export ("type")] | ||
| MLFeatureType Type { get; } | ||
|
|
||
| [Export ("optional")] | ||
| bool Optional { [Bind ("isOptional")] get; } | ||
|
|
||
| [Export ("isAllowedValue:")] | ||
| bool IsAllowed (MLFeatureValue value); | ||
| } | ||
|
|
||
| interface IMLFeatureProvider { } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [Protocol] | ||
| interface MLFeatureProvider { | ||
|
|
||
| [Abstract] | ||
| [Export ("featureNames")] | ||
| NSSet<NSString> FeatureNames { get; } | ||
|
|
||
| [Abstract] | ||
| [Export ("featureValueForName:")] | ||
| [return: NullAllowed] | ||
| MLFeatureValue GetFeatureValue (string featureName); | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLFeatureValue : NSCopying { | ||
|
|
||
| [Export ("type")] | ||
| MLFeatureType Type { get; } | ||
|
|
||
| [Export ("undefined")] | ||
| bool Undefined { [Bind ("isUndefined")] get; } | ||
|
|
||
| [Export ("int64Value")] | ||
| long Int64Value { get; } | ||
|
|
||
| [Export ("doubleValue")] | ||
| double DoubleValue { get; } | ||
|
|
||
| [Export ("stringValue")] | ||
| string StringValue { get; } | ||
|
|
||
| [NullAllowed, Export ("multiArrayValue")] | ||
| MLMultiArray MultiArrayValue { get; } | ||
|
|
||
| [Export ("dictionaryValue")] | ||
| NSDictionary<NSObject, NSNumber> DictionaryValue { get; } | ||
|
|
||
| #if !WATCH | ||
| [NullAllowed, Export ("imageBufferValue")] | ||
| CVPixelBuffer ImageBufferValue { get; } | ||
|
|
||
| [Static] | ||
| [Export ("featureValueWithPixelBuffer:")] | ||
| MLFeatureValue FromPixelBuffer (CVPixelBuffer value); | ||
| #endif | ||
| [Static] | ||
| [Export ("featureValueWithInt64:")] | ||
| MLFeatureValue FromInt64 (long value); | ||
|
|
||
| [Static] | ||
| [Export ("featureValueWithDouble:")] | ||
| MLFeatureValue FromDouble (double value); | ||
|
|
||
| [Static] | ||
| [Export ("featureValueWithString:")] | ||
| MLFeatureValue FromString (string value); | ||
|
|
||
| [Static] | ||
| [Export ("featureValueWithMultiArray:")] | ||
| MLFeatureValue FromMultiArray (MLMultiArray value); | ||
|
|
||
| [Static] | ||
| [Export ("undefinedFeatureValueWithType:")] | ||
| MLFeatureValue CreateUndefined (MLFeatureType type); | ||
|
There was a problem hiding this comment. Any reason not the name it There was a problem hiding this comment. Br my reading, It's creating an undefined feature value from a feature type. Normally it'd just be "fromThpe", but needs something to indicate the "undefined" part There was a problem hiding this comment. @spouliot What @timrisi said, just extending a little The selector name is There was a problem hiding this comment. Make sense but let's double check if Apple documentation is available (and match). There was a problem hiding this comment. From docs:
From Headers:
@spouliot should I change it? I think the later makes sense with There was a problem hiding this comment. You are right :) |
||
|
|
||
| [Static] | ||
| [Export ("featureValueWithDictionary:error:")] | ||
| [return: NullAllowed] | ||
| MLFeatureValue FromDictionary (NSDictionary<NSObject, NSNumber> value, out NSError error); | ||
|
|
||
| [Export ("isEqualToFeatureValue:")] | ||
| bool IsEqual (MLFeatureValue value); | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLModel { | ||
|
|
||
| [Export ("modelDescription")] | ||
| MLModelDescription ModelDescription { get; } | ||
|
|
||
| [Static] | ||
| [Export ("modelWithContentsOfURL:error:")] | ||
| [return: NullAllowed] | ||
| MLModel FromUrl (NSUrl url, [NullAllowed] out NSError error); | ||
|
|
||
| [Export ("predictionFromFeatures:error:")] | ||
| [return: NullAllowed] | ||
| IMLFeatureProvider GetPrediction (IMLFeatureProvider input, out NSError error); | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLModelDescription { | ||
|
|
||
| [Export ("inputDescriptionsByName")] | ||
| NSDictionary<NSString, MLFeatureDescription> InputDescriptionsByName { get; } | ||
|
|
||
| [Export ("outputDescriptionsByName")] | ||
| NSDictionary<NSString, MLFeatureDescription> OutputDescriptionsByName { get; } | ||
|
|
||
| [NullAllowed, Export ("predictedFeatureName")] | ||
| string PredictedFeatureName { get; } | ||
|
|
||
| [NullAllowed, Export ("predictedProbabilitiesName")] | ||
| string PredictedProbabilitiesName { get; } | ||
|
|
||
| [Export ("metadata")] | ||
| [Internal] | ||
| NSDictionary _Metadata { get; } | ||
|
|
||
| [Wrap ("_Metadata")] | ||
| MLModelMetadata Metadata { get; } | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [Internal] | ||
| [Static] | ||
| interface MLModelMetadataKeys { | ||
|
|
||
| [Field ("MLModelDescriptionKey")] | ||
| NSString DescriptionKey { get; } | ||
|
|
||
| [Field ("MLModelVersionStringKey")] | ||
| NSString VersionStringKey { get; } | ||
|
|
||
| [Field ("MLModelAuthorKey")] | ||
| NSString AuthorKey { get; } | ||
|
|
||
| [Field ("MLModelLicenseKey")] | ||
| NSString LicenseKey { get; } | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [StrongDictionary ("MLModelMetadataKeys")] | ||
| interface MLModelMetadata { | ||
| string Description { get; } | ||
| string VersionString { get; } | ||
| string Author { get; } | ||
| string License { get; } | ||
| } | ||
|
|
||
| [Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)] | ||
| [DisableDefaultCtor] | ||
| [BaseType (typeof (NSObject))] | ||
| interface MLMultiArray { | ||
|
|
||
| [Export ("dataPointer")] | ||
| IntPtr DataPointer { get; } | ||
|
|
||
| [Export ("dataType")] | ||
| MLMultiArrayDataType DataType { get; } | ||
|
|
||
| [Export ("shape")] | ||
|
There was a problem hiding this comment. Could/should this use BindAs (does BindAs support NSNumber arrays)? There was a problem hiding this comment. Unfortunately, docs are not clear on the type we should use here nor is swift |
||
| NSNumber [] Shape { get; } | ||
|
|
||
| [Export ("strides")] | ||
|
There was a problem hiding this comment. Unfortunately, docs are not clear on the type we should use here nor is swift |
||
| NSNumber [] Strides { get; } | ||
|
|
||
| [Export ("count")] | ||
| nint Count { get; } | ||
|
|
||
| // From MLMultiArray (Creation) Category | ||
|
|
||
| [Export ("initWithShape:dataType:error:")] | ||
| IntPtr Constructor (NSNumber [] shape, MLMultiArrayDataType dataType, out NSError error); | ||
|
|
||
| [Export ("initWithDataPointer:shape:dataType:strides:deallocator:error:")] | ||
| IntPtr Constructor (IntPtr dataPointer, NSNumber [] shape, MLMultiArrayDataType dataType, NSNumber [] strides, Action<IntPtr> deallocator, out NSError error); | ||
|
|
||
| // From MLMultiArray (NSNumberDataAccess) Category | ||
|
|
||
| [Export ("objectAtIndexedSubscript:")] | ||
| NSNumber GetObject (nint idx); | ||
|
|
||
| [Export ("objectForKeyedSubscript:")] | ||
| NSNumber GetObject (NSNumber [] key); | ||
|
|
||
| [Export ("setObject:atIndexedSubscript:")] | ||
| void SetObject (NSNumber obj, nint idx); | ||
|
|
||
| [Export ("setObject:forKeyedSubscript:")] | ||
| void SetObject (NSNumber obj, NSNumber [] key); | ||
| } | ||
| } | ||
| #endif // XAMCORE_2_0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whitespace. Same applies to the rest of the new interfaces
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I always leave a Whitespace between the interface line definition and the first member definition and this is the first time I've been called out :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a single empty line is fine to delimit code and help readability
whitespace changes are specially bad when updating files since they make larger diffs and contaminate git history/blame