Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
codemzs wants to merge 23 commits into from
Closed

Replace DvText with .NET Standard type. #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b0a96a6
Util functions for MemoryReadyOnly.
codemzs Aug 20, 2018
327767b
Replace DvText with ReadOnlyMemory.
codemzs Aug 21, 2018
8e18252
Replace DvText with ReadOnlyMemory.
codemzs Aug 21, 2018
73fbf9d
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Aug 21, 2018
aa0edeb
merge master and delete DvText.cs
codemzs Aug 21, 2018
c0c0963
fix tests.
codemzs Aug 23, 2018
ef32b4a
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Aug 23, 2018
fcc2958
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Sep 5, 2018
13b02f1
merge.
codemzs Sep 5, 2018
712ce5a
misc.
codemzs Sep 5, 2018
1e454a6
SB
codemzs Sep 5, 2018
0e1dd2e
pr feedback.
codemzs Sep 6, 2018
f62b499
PR feedback.
codemzs Sep 6, 2018
6628d30
PR feedback.
codemzs Sep 6, 2018
1c698fd
PR feedback.
codemzs Sep 6, 2018
5023f76
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Sep 6, 2018
58cdfee
misc.
codemzs Sep 6, 2018
2e5760a
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Sep 6, 2018
3bb874d
misc.
codemzs Sep 6, 2018
af0057e
PR feedback.
codemzs Sep 7, 2018
c062996
PR feedback.
codemzs Sep 7, 2018
c578cdc
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs Sep 7, 2018
8531e70
PR feedback.
codemzs Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Api/ApiUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
// REVIEW: This should be a Dictionary<Type, OpCode> based solution.
// DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
(t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
(t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down
32 changes: 16 additions & 16 deletions src/Microsoft.ML.Api/DataViewConstructionUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
if (outputType.IsArray)
{
Ch.Assert(colType.IsVector);
// String[] -> VBuffer<DvText>
// String[] -> ReadOnlyMemory<char>
if (outputType.GetElementType() == typeof(string))
{
Ch.Assert(colType.ItemType.IsText);
return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory() );
}
else if (outputType.GetElementType() == typeof(int))
{
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
else if (colType.IsVector)
{
// VBuffer<T> -> VBuffer<T>
// REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
// REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
Ch.Assert(outputType.IsGenericType);
Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
{
if (outputType == typeof(string))
{
// String -> DvText
// String -> ReadOnlyMemory<char>
Ch.Assert(colType.IsText);
return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
}
else if (outputType == typeof(bool))
{
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
var itemType = typeT.GetElementType();
var dstItemType = typeof(TDst).GetGenericArguments()[0];

// String[] -> VBuffer<DvText>
// String[] -> VBuffer<ReadOnlyMemory<char>>
if (itemType == typeof(string))
{
Contracts.Check(dstItemType == typeof(DvText));
Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

ValueGetter<VBuffer<DvText>> method = GetStringArray;
ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
return method as ValueGetter<TDst>;
}

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
if (MetadataType.IsVector)
{
// VBuffer<T> -> VBuffer<T>
// REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
// REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

Contracts.Assert(typeT.IsGenericType);
Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
{
if (typeT == typeof(string))
{
// String -> DvText
// String -> ReadOnlyMemory<char>
Contracts.Assert(MetadataType.IsText);
ValueGetter<DvText> m = GetString;
ValueGetter<ReadOnlyMemory<char>> m = GetString;
return m as ValueGetter<TDst>;
}
// T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
{
}

private void GetStringArray(ref VBuffer<DvText> dst)
private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
{
var value = (string[])(object)Value;
var n = Utils.Size(value);
dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

for (int i = 0; i < n; i++)
dst.Values[i] = new DvText(value[i]);
dst.Values[i] = value[i].AsMemory();

}

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
}

private void GetString(ref DvText dst)
private void GetString(ref ReadOnlyMemory<char> dst)
{
dst = new DvText((string)(object)Value);
dst = ((string)(object)Value).AsMemory();
}

private void GetDirectValue<TDst>(ref TDst dst)
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.Api/Microsoft.ML.Api.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

<ItemGroup>
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.ML.Api/TypedCursor.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
if (fieldType.IsArray)
{
Ch.Assert(colType.IsVector);
// VBuffer<DvText> -> String[]
// VBuffer<ReadOnlyMemory<char>> -> String[]
if (fieldType.GetElementType() == typeof(string))
{
Ch.Assert(colType.ItemType.IsText);
return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
}
else if (fieldType.GetElementType() == typeof(bool))
{
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
else if (colType.IsVector)
{
// VBuffer<T> -> VBuffer<T>
// REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
// REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
Ch.Assert(fieldType.IsGenericType);
Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
{
if (fieldType == typeof(string))
{
// DvText -> String
// ReadOnlyMemory<char> -> String
Ch.Assert(colType.IsText);
Ch.Assert(peek == null);
return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
}
else if (fieldType == typeof(bool))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Core/Data/ColumnType.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
}

private TextType()
: base(typeof(DvText), DataKind.TX)
: base(typeof(ReadOnlyMemory<char>), DataKind.TX)
{
}

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.Core/Data/DataKind.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
case DataKind.R8:
return typeof(Double);
case DataKind.TX:
return typeof(DvText);
return typeof(ReadOnlyMemory<char>);
case DataKind.BL:
return typeof(DvBool);
case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
kind = DataKind.R4;
else if (type == typeof(Double)|| type == typeof(Double?))
kind = DataKind.R8;
else if (type == typeof(DvText))
else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
kind = DataKind.TX;
else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
kind = DataKind.BL;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Replace DvText with .NET Standard type.#705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

codemzs
wants to merge
23
commits into

from

 Closed


Replace DvText with .NET Standard type.
#705
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
b0a96a6

Util functions for MemoryReadyOnly.


codemzs Aug 20, 2018
327767b

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
8e18252

Replace DvText with ReadOnlyMemory.


codemzs Aug 21, 2018
73fbf9d

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 21, 2018
aa0edeb

merge master and delete DvText.cs


codemzs Aug 21, 2018
c0c0963

fix tests.


codemzs Aug 23, 2018
ef32b4a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Aug 23, 2018
fcc2958

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 5, 2018
13b02f1

merge.


codemzs Sep 5, 2018
712ce5a

misc.


codemzs Sep 5, 2018
1e454a6

SB


codemzs Sep 5, 2018
0e1dd2e

pr feedback.


codemzs Sep 6, 2018
f62b499

PR feedback.


codemzs Sep 6, 2018
6628d30

PR feedback.


codemzs Sep 6, 2018
1c698fd

PR feedback.


codemzs Sep 6, 2018
5023f76

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
58cdfee

misc.


codemzs Sep 6, 2018
2e5760a

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 6, 2018
3bb874d

misc.


codemzs Sep 6, 2018
af0057e

PR feedback.


codemzs Sep 7, 2018
c062996

PR feedback.


codemzs Sep 7, 2018
c578cdc

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs Sep 7, 2018
8531e70

PR feedback.


codemzs Sep 7, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Api/ApiUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ private static OpCode GetAssignmentOpCode(Type t)
 // REVIEW: This should be a Dictionary<Type, OpCode> based solution.
 // DvTypes, strings, arrays, all nullable types, VBuffers and UInt128.
 if (t == typeof(DvInt8) || t == typeof(DvInt4) || t == typeof(DvInt2) || t == typeof(DvInt1) ||
 t == typeof(DvBool) || t == typeof(DvText) || t == typeof(string) || t.IsArray ||
 t == typeof(DvBool) || t == typeof(ReadOnlyMemory<char>) || t == typeof(string) || t.IsArray ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(VBuffer<>)) ||
 (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>)) ||
 t == typeof(DvDateTime) || t == typeof(DvDateTimeZone) || t == typeof(DvTimeSpan) || t == typeof(UInt128))
Expand Down

32 changes: 16 additions & 16 deletions
src/Microsoft.ML.Api/DataViewConstructionUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,11 +125,11 @@ private Delegate CreateGetter(int index)
 if (outputType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // String[] -> VBuffer<DvText>
 // String[] -> ReadOnlyMemory<char>
 if (outputType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingArrayGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingArrayGetterDelegate<string, ReadOnlyMemory<char>>(index, x =>  x != null ? x.AsMemory() : "".AsMemory() );
 }
 else if (outputType.GetElementType() == typeof(int))
 {
Expand DownExpand Up@@ -193,7 +193,7 @@ private Delegate CreateGetter(int index)
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> ReadOnlyMemory<char>?
 Ch.Assert(outputType.IsGenericType);
 Ch.Assert(outputType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(outputType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -204,9 +204,9 @@ private Delegate CreateGetter(int index)
 {
 if (outputType == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Ch.Assert(colType.IsText);
 return CreateConvertingGetterDelegate<String, DvText>(index, x => x == null ? DvText.NA : new DvText(x));
 return CreateConvertingGetterDelegate<String, ReadOnlyMemory<char>>(index, x => x != null ? x.AsMemory() : "".AsMemory());
 }
 else if (outputType == typeof(bool))
 {
Expand DownExpand Up@@ -805,12 +805,12 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 var itemType = typeT.GetElementType();
 var dstItemType = typeof(TDst).GetGenericArguments()[0];

 // String[] -> VBuffer<DvText>
 // String[] -> VBuffer<ReadOnlyMemory<char>>
 if (itemType == typeof(string))
 {
 Contracts.Check(dstItemType == typeof(DvText));
 Contracts.Check(dstItemType == typeof(ReadOnlyMemory<char>));

 ValueGetter<VBuffer<DvText>> method = GetStringArray;
 ValueGetter<VBuffer<ReadOnlyMemory<char>>> method = GetStringArray;
 return method as ValueGetter<TDst>;
 }

Expand All@@ -825,7 +825,7 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 if (MetadataType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?

 Contracts.Assert(typeT.IsGenericType);
 Contracts.Check(typeof(TDst).IsGenericType);
Expand All@@ -845,9 +845,9 @@ public override ValueGetter<TDst> GetGetter<TDst>()
 {
 if (typeT == typeof(string))
 {
 // String -> DvText
 // String -> ReadOnlyMemory<char>
 Contracts.Assert(MetadataType.IsText);
 ValueGetter<DvText> m = GetString;
 ValueGetter<ReadOnlyMemory<char>> m = GetString;
 return m as ValueGetter<TDst>;
 }
 // T -> T
Expand All@@ -861,14 +861,14 @@ public class TElement
 {
 }

 private void GetStringArray(ref VBuffer<DvText> dst)
 private void GetStringArray(ref VBuffer<ReadOnlyMemory<char>> dst)
 {
 var value = (string[])(object)Value;
 var n = Utils.Size(value);
 dst = new VBuffer<DvText>(n, Utils.Size(dst.Values) < n ? new DvText[n] : dst.Values, dst.Indices);
 dst = new VBuffer<ReadOnlyMemory<char>>(n, Utils.Size(dst.Values) < n ? new ReadOnlyMemory<char>[n] : dst.Values, dst.Indices);

 for (int i = 0; i < n; i++)
 dst.Values[i] = new DvText(value[i]);
 dst.Values[i] = value[i].AsMemory();

 }

Expand All@@ -890,9 +890,9 @@ private ValueGetter<VBuffer<TDst>> GetVBufferGetter<TDst>()
 return (ref VBuffer<TDst> dst) => castValue.CopyTo(ref dst);
 }

 private void GetString(ref DvText dst)
 private void GetString(ref ReadOnlyMemory<char> dst)
 {
 dst = new DvText((string)(object)Value);
 dst = ((string)(object)Value).AsMemory();
 }

 private void GetDirectValue<TDst>(ref TDst dst)
Expand Down

1 change: 1 addition & 0 deletions
src/Microsoft.ML.Api/Microsoft.ML.Api.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@

 <ItemGroup>
 <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
 <PackageReference Include="System.Memory" Version="4.5.1" />
 <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
 </ItemGroup>

Expand Down

10 changes: 5 additions & 5 deletions
src/Microsoft.ML.Api/TypedCursor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,11 +276,11 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 if (fieldType.IsArray)
 {
 Ch.Assert(colType.IsVector);
 // VBuffer<DvText> -> String[]
 // VBuffer<ReadOnlyMemory<char>> -> String[]
 if (fieldType.GetElementType() == typeof(string))
 {
 Ch.Assert(colType.ItemType.IsText);
 return CreateConvertingVBufferSetter<DvText, string>(input, index, poke, peek, x => x.ToString());
 return CreateConvertingVBufferSetter<ReadOnlyMemory<char>, string>(input, index, poke, peek, x => x.ToString());
 }
 else if (fieldType.GetElementType() == typeof(bool))
 {
Expand DownExpand Up@@ -344,7 +344,7 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 else if (colType.IsVector)
 {
 // VBuffer<T> -> VBuffer<T>
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<DvText>?
 // REVIEW: Do we care about accomodating VBuffer<string> -> VBuffer<ReadOnlyMemory<char>>?
 Ch.Assert(fieldType.IsGenericType);
 Ch.Assert(fieldType.GetGenericTypeDefinition() == typeof(VBuffer<>));
 Ch.Assert(fieldType.GetGenericArguments()[0] == colType.ItemType.RawType);
Expand All@@ -355,10 +355,10 @@ private Action<TRow> GenerateSetter(IRow input, int index, InternalSchemaDefinit
 {
 if (fieldType == typeof(string))
 {
 // DvText -> String
 // ReadOnlyMemory<char> -> String
 Ch.Assert(colType.IsText);
 Ch.Assert(peek == null);
 return CreateConvertingActionSetter<DvText, string>(input, index, poke, x => x.ToString());
 return CreateConvertingActionSetter<ReadOnlyMemory<char>, string>(input, index, poke, x => x.ToString());
 }
 else if (fieldType == typeof(bool))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Core/Data/ColumnType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,7 +341,7 @@ public static TextType Instance
 }

 private TextType()
 : base(typeof(DvText), DataKind.TX)
 : base(typeof(ReadOnlyMemory<char>), DataKind.TX)
 {
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Data/DataKind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public static Type ToType(this DataKind kind)
 case DataKind.R8:
 return typeof(Double);
 case DataKind.TX:
 return typeof(DvText);
 return typeof(ReadOnlyMemory<char>);
 case DataKind.BL:
 return typeof(DvBool);
 case DataKind.TS:
Expand DownExpand Up@@ -205,7 +205,7 @@ public static bool TryGetDataKind(this Type type, out DataKind kind)
 kind = DataKind.R4;
 else if (type == typeof(Double)|| type == typeof(Double?))
 kind = DataKind.R8;
 else if (type == typeof(DvText))
 else if (type == typeof(ReadOnlyMemory<char>) || type == typeof(string))
 kind = DataKind.TX;
 else if (type == typeof(DvBool) || type == typeof(bool) || type == typeof(bool?))
 kind = DataKind.BL;
Expand Down
Loading