Integrate dtaframe arithmetics changes to generic math branch#4

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
asmirnov82 wants to merge 20 commits into from
Closed

Integrate dtaframe arithmetics changes to generic math branch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4c799ab
Update build templates to handle feature branches (#6744)
JakeRadMSFT Jun 28, 2023
443ceb9
Add missing implementation for datetime relevant arrow type into data…
asmirnov82 Jul 6, 2023
53c0f26
Fix the behavior or column SetName method (#6676)
asmirnov82 Jul 6, 2023
26c2446
Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)
asmirnov82 Jul 6, 2023
36f87d1
avoid empty dataset (#6756)
LittleLittleCloud Jul 6, 2023
69eca56
Fix dataframe arithmetics for columns having several value buffers (c…
asmirnov82 Jul 6, 2023
d9e1ee1
Run tests that requires more than 2 Gb of Memory only on 64-bit env (…
asmirnov82 Jul 7, 2023
caee3c2
Reduce coupling of Data.Analysis.Tests project (#6759)
asmirnov82 Jul 7, 2023
578d7bc
Provide ability to filter dataframe column by null via ElementWise Me…
asmirnov82 Jul 7, 2023
69cc4bc
Fix incorrect DataFrame min max computation with NULL (#6734)
asmirnov82 Jul 7, 2023
321158d
Clean DataFrame meaningless code (#6761)
asmirnov82 Jul 11, 2023
9796936
Change methods signature generation
asmirnov82 Jul 13, 2023
bf29980
Change DataFrameColumn Arithmetics
asmirnov82 Jul 13, 2023
cbbf282
Change DataFrameColumn Operations
asmirnov82 Jul 13, 2023
1640b59
Fix unit tests
asmirnov82 Jul 13, 2023
9427169
Fix spaces
asmirnov82 Jul 13, 2023
03357cb
Merge branch 'main' into jakerad_generic_math
asmirnov82 Jul 13, 2023
80b4770
Fix merge issues
asmirnov82 Jul 13, 2023
3c7410d
Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math
asmirnov82 Jul 13, 2023
bd50494
Fix merge issues
asmirnov82 Jul 13, 2023
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
14 changes: 14 additions & 0 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
branches:
include:
- main
- feature/*
- release/*

trigger:
branches:
include:
- main
- feature/*
- release/*

resources:
containers:
- container: CentosContainer
Expand Down
5 changes: 2 additions & 3 deletions build/.night-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
branches:
include:
- main
- releases/1.6.0
- features/automl
- features/integrationPackage
- feature/*
- release/*
always: true

resources:
Expand Down
5 changes: 2 additions & 3 deletions build/.outer-loop-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
branches:
include:
- main
- releases/1.6.0
- features/automl
- features/integrationPackage
- feature/*
- release/*
always: true


Expand Down
14 changes: 14 additions & 0 deletions build/codecoverage-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
branches:
include:
- main
- feature/*
- release/*

trigger:
branches:
include:
- main
- feature/*
- release/*

jobs:
- template: /build/ci/job-template.yml
parameters:
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.Data.Analysis/DataFrame.IO.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

foreach (var items in vals)
{
for (var c = 0; c < items.Count; c++)
{
items[c] = items[c];
}
res.Append(items, inPlace: true);
}

Expand Down
5 changes: 4 additions & 1 deletion src/Microsoft.Data.Analysis/DataFrameBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

if (newLength > Capacity)
{
var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
//Double buffer size, but not higher than MaxByteCapacity
var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
var newCapacity = Math.Max(newLength * Size, doubledSize);

var memory = new Memory<byte>(new byte[newCapacity]);
_memory.CopyTo(memory);
_memory = memory;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
throw new NotImplementedException();
}
}
}
}
3 changes: 2 additions & 1 deletion src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

column.AddOwner(this);


_columnNameToIndexDictionary[column.Name] = columnIndex;
for (int i = columnIndex + 1; i < Count; i++)
{
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
{
throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
}

_columnNameToIndexDictionary.Remove(this[columnIndex].Name);
_columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
}

}
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
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
Integrate dtaframe arithmetics changes to generic math branch#4

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

asmirnov82
wants to merge
20
commits into

from

 Closed


Integrate dtaframe arithmetics changes to generic math branch
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
4c799ab

Update build templates to handle feature branches (#6744)


JakeRadMSFT Jun 28, 2023
443ceb9

Add missing implementation for datetime relevant arrow type into data…


asmirnov82 Jul 6, 2023
53c0f26

Fix the behavior or column SetName method (#6676)


asmirnov82 Jul 6, 2023
26c2446

Fix DataFrame to allow to store columns with size more than 2 Gb (#6710)


asmirnov82 Jul 6, 2023
36f87d1

avoid empty dataset (#6756)


LittleLittleCloud Jul 6, 2023
69eca56

Fix dataframe arithmetics for columns having several value buffers (c…


asmirnov82 Jul 6, 2023
d9e1ee1

Run tests that requires more than 2 Gb of Memory only on 64-bit env (…


asmirnov82 Jul 7, 2023
caee3c2

Reduce coupling of Data.Analysis.Tests project (#6759)


asmirnov82 Jul 7, 2023
578d7bc

Provide ability to filter dataframe column by null via ElementWise Me…


asmirnov82 Jul 7, 2023
69cc4bc

Fix incorrect DataFrame min max computation with NULL (#6734)


asmirnov82 Jul 7, 2023
321158d

Clean DataFrame meaningless code (#6761)


asmirnov82 Jul 11, 2023
9796936

Change methods signature generation


asmirnov82 Jul 13, 2023
bf29980

Change DataFrameColumn Arithmetics


asmirnov82 Jul 13, 2023
cbbf282

Change DataFrameColumn Operations


asmirnov82 Jul 13, 2023
1640b59

Fix unit tests


asmirnov82 Jul 13, 2023
9427169

Fix spaces


asmirnov82 Jul 13, 2023
03357cb

Merge branch 'main' into jakerad_generic_math


asmirnov82 Jul 13, 2023
80b4770

Fix merge issues


asmirnov82 Jul 13, 2023
3c7410d

Merge branch 'refactor_dataframe_arithmetics' into jakerad_generic_math


asmirnov82 Jul 13, 2023
bd50494

Fix merge issues


asmirnov82 Jul 13, 2023

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


14 changes: 14 additions & 0 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's PR validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

resources:
 containers:
 - container: CentosContainer
Expand Down

5 changes: 2 additions & 3 deletions
build/.night-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true

resources:
Expand Down

5 changes: 2 additions & 3 deletions
build/.outer-loop-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,8 @@ schedules:
 branches:
 include:
 - main
 - releases/1.6.0
 - features/automl
 - features/integrationPackage
 - feature/*
 - release/*
 always: true


Expand Down

14 changes: 14 additions & 0 deletions
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,20 @@
# ML.NET's Code Coverage validation build
################################################################################

pr:
 branches:
 include:
 - main
 - feature/*
 - release/*

trigger:
 branches:
 include:
 - main
 - feature/*
 - release/*

jobs:
- template: /build/ci/job-template.yml
 parameters:
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.Data.Analysis/DataFrame.IO.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,6 @@ public static DataFrame LoadFrom(IEnumerable<IList<object>> vals, IList<(string,

 foreach (var items in vals)
 {
 for (var c = 0; c < items.Count; c++)
 {
 items[c] = items[c];
 }
 res.Append(items, inPlace: true);
 }

Expand Down

5 changes: 4 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameBuffer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,10 @@ public void EnsureCapacity(int numberOfValues)

 if (newLength > Capacity)
 {
 var newCapacity = Math.Max(newLength * Size, ReadOnlyBuffer.Length * 2);
 //Double buffer size, but not higher than MaxByteCapacity
 var doubledSize = (int)Math.Min((long)ReadOnlyBuffer.Length * 2, MaxCapacityInBytes);
 var newCapacity = Math.Max(newLength * Size, doubledSize);

 var memory = new Memory<byte>(new byte[newCapacity]);
 _memory.CopyTo(memory);
 _memory = memory;
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,4 +332,4 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseIsNotNull()
 throw new NotImplementedException();
 }
 }
}
}

3 changes: 2 additions & 1 deletion
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ protected override void InsertItem(int columnIndex, DataFrameColumn column)

 column.AddOwner(this);


 _columnNameToIndexDictionary[column.Name] = columnIndex;
 for (int i = columnIndex + 1; i < Count; i++)
 {
Expand All@@ -110,6 +111,7 @@ protected override void SetItem(int columnIndex, DataFrameColumn column)
 {
 throw new ArgumentException(string.Format(Strings.DuplicateColumnName, column.Name), nameof(column));
 }

 _columnNameToIndexDictionary.Remove(this[columnIndex].Name);
 _columnNameToIndexDictionary[column.Name] = columnIndex;

Expand DownExpand Up@@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(UInt16)));
 }

 }
}
Loading