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.

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
wants to merge 20 commits into from
Closed
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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 Down Expand Up @@ -491,6 +493,5 @@ public PrimitiveDataFrameColumn<ushort> GetUInt16Column(string name)

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

}
}
Loading