Skip to content

Commit b48e9b7

Browse files
JakeRadMSFTasmirnov82michaelgsharpLittleLittleCloudzewditu
authored
Merge Main into Feature/4.0 (#6747)
* Update build templates to handle feature branches (#6744) * Update build templates * Update build templates to include all releases/* and feature/* * Update releases to release * Update triggers for PR Validation Build * Add triggers for Code Coverage * Update version to 4.0 for feature branch (#6743) * Add missing implementation for datetime relevant arrow type into dataframe (#6675) * Add missing implementation for datetime relevant arrow type * Return required usage * Fix the behavior or column SetName method (#6676) * Fix the behavior or column SetName method * Fix stack overflow exception * Fix merge issues --------- Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> * Fix DataFrame to allow to store columns with size more than 2 Gb (#6710) * Fix error with allocating more than MaxCapacity of Byte Memory Buffer * Remove Unit test as it consumes too much memory * Fix issue with increasing buffer capacity over limit when double it size * avoid empty dataset (#6756) * Fix dataframe arithmetics for columns having several value buffers (column size is more than 2 Gb) (#6724) * Fix dataframe arithmetics * Fix * Run tests that requires more than 2 Gb of Memory only on 64-bit env (#6758) * Reduce coupling of Data.Analysis.Tests project (#6759) * Provide ability to filter dataframe column by null via ElementWise Methods (#6723) * Provide ability to filter by null value * Add comments * Fix code review findings * Fix incorrect DataFrame min max computation with NULL (#6734) * Step 1 * Step 2 * Fixed code review findings * Clean DataFrame meaningless code (#6761) * Add NameEntityRecognition and Q&A deep learning tasks. (#6760) * NER * QA almost done, runtime error * QA finished * fixes from PR comments * fixed build * build fixes * perf changes * made disposable * fixed not disposing model * added some disposables to TensorFlow for memory * build testing * fixing build * added missing dispose * build fixes * build fixes * testing macos fix * fix issue (#6768) * fixed mac build and minor torch sharp changes (#6776) * Improve DataFrame Arithmetics implementation (#6763) * Change methods signature generation * Change DataFrameColumn Arithmetics * Change DataFrameColumn Operations * Fix unit tests * Fix spaces * Fix code review findings * Add QA sweepable estimator in AutoML (#6781) * Add QA sweepable * clean * Modernized some argument checks that still used string literals for parameter names (#6766) Co-authored-by: John Doe <john@doe> * removed deprecated yosemite brew (#6805) * Add TargetType to Type_convert (#6785) * Add target Type in convert type * Add custom type "DataKind" * clean * Add DataKind name space * clean test * File-scoped namespaces in files under `Environment` (`Microsoft.ML.Core`) (#6791) Co-authored-by: Lehonti Ramos <john@doe> * File-scoped namespaces in files under `EntryPoints` (`Microsoft.ML.Core`) (#6790) Co-authored-by: Lehonti Ramos <john@doe> * Fix issue with addIndexColumn in DataFrame.LoadCsv (#6769) * Fix issue with addIndexColumn in DataFrame.LoadCsv * Fix tests * Fix DataFrame.LoadCsv can not load CSV with duplicate column names (#6772) * File-scoped namespaces in files under `ComponentModel` (`Microsoft.ML.Core`) (#6788) Co-authored-by: Lehonti Ramos <john@doe> * File-scoped namespaces in files under `Data` (`Microsoft.ML.Core`) (#6789) Co-authored-by: Lehonti Ramos <john@doe> * Fix inconsistent null handling in DataFrame Arithmetics (#6770) * Fix inconsistent null handling in DataFrame Arithmetics * Fix Null Count and division by zero issues * Minor changes to restart build and rerun flaky tests * File-scoped namespaces in files under `Prediction` (`Microsoft.ML.Core`) (#6792) Co-authored-by: Lehonti Ramos <john@doe> * Allow to define CultureInfo for parsing values on reading DataFrame from csv (#6782) * Use CultureInfo for parsing values in csv file * Fix merge issues * Append dataframe rows based on column names (#6808) * Append dataframe rows based on column names * Update DataFrame.cs --------- Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> * removed codecov token (#6811) * Fix wrong type conversion on PrimitiveDataFrameColumn (#6834) * Fix wrong type conversion on PrimitiveDataFrameColumn * Added tests for #6829 * Fix test * Add file generated from tt template and fix unit tests --------- Co-authored-by: Aleksei Smirnov <tlalok@inbox.ru> * update interactive kernel version (#6836) * update interactive kernel version * update * Update Microsoft.Data.Analysis.Interactive.Tests.csproj * Add performance benchmarks for dataframe arithmetic operations (#6827) * Add performance tests * Add extra tests * Fix * Fix typo * Fix Divide_Int16 and Divide_Int32_Int16 benchmarks * Fix * Change csproj file * Update BenchmarkDotNetVersion to 0.13.5 * Fix * Change to 0.13.1 because that is what is latest version in our nuget feeds. --------- Co-authored-by: Jake Radzikowski <JakeRad@Microsoft.com> * Improve performance of column cloning inside DataFrame arithmetics (#6814) * Optimize PrimitiveColumnContainer.Clone method * Avoid unnecessary type conversion during binary operations * Remove using * Fix DataFrameBuffer constructor * remove uncorrectly added using * Make DataFrameBuffer Length field protected * Fix typo * Use RawSpan * Simplify tt files for PrimitiveDataFrameColumnAritmetics (#6830) * First step of tt refactoring * Step 2 * Step 3 * Addresses #6533 (#6838) * Initial structure and started fleshing out some sections * Some corrections and paragraph on DL usages * Starting fleshing out DL on ML.NET section * Addresses #6533 * Update dependencies (#6837) * Update dependencies * Add reference to NuGet.Packaging.Core * PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument (#6822) * Split Test for AppendMany into 4 different tests * Block init of null validity buffer instead of setting individual bits * Add unit tests for PrimitiveDataFrameColumn.Clone * Fixes #6821 * Fix * Fix bug with AppendMany values to not empty column * Restart unit tests * Add more unit tests * Fix failing unit test * Fix code review findings * 6847 incorrectly sets column value (#6849) * Fix DataFrame incorrectly sets column value for index higher than Buffer.MaxCapacity * Revert renaming * Increase performance of arithmetic operations by enhancing calculations on nullable values (#6846) * Optimize PrimitiveColumnContainer.Clone method * Avoid unnecessary type conversion during binary operations * Remove using * Fix DataFrameBuffer constructor * remove uncorrectly added using * Make DataFrameBuffer Length field protected * Add performance tests * Split Test for AppendMany into 4 different tests * Block init of null validity buffer instead of setting individual bits * Add unit tests for PrimitiveDataFrameColumn.Clone * Fixes #6821 * Fix * Add extra tests * Fix * Fix typo * Fix Divide_Int16 and Divide_Int32_Int16 benchmarks * Fix * Avoid using constructor, that copies memory * First step of tt refactoring * Step 2 * Step 3 * Move iteration over buffers outside of the PrimitiveDataFrameColumnArithmetic * Change PrimitiveDataFrameColumnArithmetic * Fix typo * Use RawSpan * Fix bug with AppendMany values to not empty column * Restart unit tests * Add more unit tests * Add GetBitCount method * Fix failing unit test * Implementation * Change unit tests * Update unit tests * Refactoring BinaryOperation * Intermediate changes * Intermediate results * Implement Binary Scalar Reverse Operarions * Add implementation for BinaryIntOperations * Implement Comparison Operations * Implement actual calculations for Comparison operations * Uncomment performance tests * Remove unintentional code changes * Add reference to Apache Arrow project license in THIRD-PARTY-NOTICES * Fix license issues * Fixes incorrect work of DataFrame with VBufferColumn when number of e… (#6851) * Fixes incorrect work of DataFrame with VBufferColumn when number of elements is greater than Int.MaxValue * Fix calculation of max capacity and amount of required buffers * Fix unit test * Run test allocating more than 2 Gb of memory on 64bit env only * Fix StringDataFrameColumn same way as VBufferDataFrameColumn * Fix wrong amount of buffers created in constructor of StringDataFrameColumn * Fix code review findings --------- Co-authored-by: Aleksei Smirnov <tlalok@inbox.ru> Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Co-authored-by: Xiaoyun Zhang <xiaoyuz@microsoft.com> Co-authored-by: zewditu Hailemariam <36615490+zewditu@users.noreply.github.com> Co-authored-by: Lehonti Ramos <17771375+Lehonti@users.noreply.github.com> Co-authored-by: John Doe <john@doe> Co-authored-by: Raffaello Fraboni <10281615+novelhawk@users.noreply.github.com> Co-authored-by: R. G. Esteves <rodolfo.g.esteves@intel.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com>
1 parent e7099bf commit b48e9b7

File tree

191 files changed

+109874
-25339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+109874
-25339
lines changed

.vsts-dotnet-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# ML.NET's PR validation build
33
################################################################################
44

5+
pr:
6+
branches:
7+
include:
8+
- main
9+
- feature/*
10+
- release/*
11+
12+
trigger:
13+
branches:
14+
include:
15+
- main
16+
- feature/*
17+
- release/*
18+
519
resources:
620
containers:
721
- container: CentosContainer

Microsoft.ML.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tokenizers.Tes
168168
EndProject
169169
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests", "test\Microsoft.ML.FSharp.Tests\Microsoft.ML.FSharp.Tests.fsproj", "{041CB5CD-5832-413E-A894-D9DBED210B16}"
170170
EndProject
171+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Analysis.PerformanceTests", "test\Microsoft.Data.Analysis.PerformanceTests\Microsoft.Data.Analysis.PerformanceTests.csproj", "{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}"
172+
EndProject
171173
Global
172174
GlobalSection(SolutionConfigurationPlatforms) = preSolution
173175
Debug|Any CPU = Debug|Any CPU
@@ -788,6 +790,14 @@ Global
788790
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|Any CPU.Build.0 = Release|Any CPU
789791
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|x64.ActiveCfg = Release|Any CPU
790792
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|x64.Build.0 = Release|Any CPU
793+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
794+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
795+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|x64.ActiveCfg = Debug|Any CPU
796+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|x64.Build.0 = Debug|Any CPU
797+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
798+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|Any CPU.Build.0 = Release|Any CPU
799+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|x64.ActiveCfg = Release|Any CPU
800+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|x64.Build.0 = Release|Any CPU
791801
EndGlobalSection
792802
GlobalSection(SolutionProperties) = preSolution
793803
HideSolutionNode = FALSE
@@ -870,6 +880,7 @@ Global
870880
{BBC3A950-BD68-45AC-9DBD-A8F4D8847745} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
871881
{C3D82402-F207-4F19-8C57-5AF0FBAF9682} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
872882
{041CB5CD-5832-413E-A894-D9DBED210B16} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
883+
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
873884
EndGlobalSection
874885
GlobalSection(ExtensibilityGlobals) = postSolution
875886
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}

THIRD-PARTY-NOTICES.TXT

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,24 @@ distributed under the License is distributed on an "AS IS" BASIS,
8585
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
8686
See the License for the specific language governing permissions and
8787
limitations under the License.
88+
89+
90+
License notice for BitUtility
91+
------------------------------------------
92+
93+
https://github.com/apache/arrow/blob/main/csharp/src/Apache.Arrow/BitUtility.cs
94+
95+
Licensed to the Apache Software Foundation (ASF) under one or more
96+
contributor license agreements. See the NOTICE file distributed with
97+
this work for additional information regarding copyright ownership.
98+
The ASF licenses this file to You under the Apache License, Version 2.0
99+
(the "License"); you may not use this file except in compliance with
100+
the License. You may obtain a copy of the License at
101+
102+
http://www.apache.org/licenses/LICENSE-2.0
103+
104+
Unless required by applicable law or agreed to in writing, software
105+
distributed under the License is distributed on an "AS IS" BASIS,
106+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
107+
See the License for the specific language governing permissions and
108+
limitations under the License.

build/.night-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.6.0
19-
- features/automl
20-
- features/integrationPackage
18+
- feature/*
19+
- release/*
2120
always: true
2221

2322
resources:

build/.outer-loop-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.6.0
19-
- features/automl
20-
- features/integrationPackage
18+
- feature/*
19+
- release/*
2120
always: true
2221

2322

build/ci/job-template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
${{ if eq(parameters.codeCoverage, 'false') }}:
4545
hardLink: '/p:CreateHardLinksForCopyLocalIfPossible=True'
4646
testTargetFramework: '/p:TestTargetFramework=$(_targetFramework)'
47-
CODECOV_TOKEN: 03031e35-fe75-4e4c-87ee-e919ae601748
4847
strategy:
4948
matrix:
5049
${{ if eq(parameters.customMatrixes, '') }}:
@@ -68,7 +67,7 @@ jobs:
6867
steps:
6968
# Extra MacOS step required to install OS-specific dependencies
7069
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}:
71-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew update && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
70+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
7271
displayName: Install MacOS build dependencies
7372
# Extra Apple MacOS step required to install OS-specific dependencies
7473
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:

build/codecoverage-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# ML.NET's Code Coverage validation build
33
################################################################################
44

5+
pr:
6+
branches:
7+
include:
8+
- main
9+
- feature/*
10+
- release/*
11+
12+
trigger:
13+
branches:
14+
include:
15+
- main
16+
- feature/*
17+
- release/*
18+
519
jobs:
620
- template: /build/ci/job-template.yml
721
parameters:

build/libomp.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class Libomp < Formula
1515
end
1616

1717
depends_on "cmake" => :build
18-
depends_on macos: :yosemite
1918

2019
def install
2120
system "cmake", ".", *std_cmake_args

build/vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
pool:
101101
vmImage: macOS-12
102102
steps:
103-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && brew update && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
103+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
104104
displayName: Install build dependencies
105105
# Only build native assets to avoid conflicts.
106106
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true

eng/Versions.props

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
1717
<MicrosoftExtensionsVersion>2.1.0</MicrosoftExtensionsVersion>
1818
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>
19-
<SkiaSharpVersion>2.88.3</SkiaSharpVersion>
19+
<NuGetVersion>6.7.0</NuGetVersion>
20+
<SkiaSharpVersion>2.88.6</SkiaSharpVersion>
2021
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
2122
<SystemCodeDomVersion>4.5.0</SystemCodeDomVersion>
2223
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
24+
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
2325
<SystemIOFileSystemAccessControl>4.5.0</SystemIOFileSystemAccessControl>
2426
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
2527
<SystemReflectionEmitLightweightVersion>4.3.0</SystemReflectionEmitLightweightVersion>
@@ -30,13 +32,13 @@
3032
<SystemTextJsonVersion>6.0.1</SystemTextJsonVersion>
3133
<SystemThreadingChannelsVersion>4.7.1</SystemThreadingChannelsVersion>
3234
<!-- Other product dependencies -->
33-
<ApacheArrowVersion>2.0.0</ApacheArrowVersion>
35+
<ApacheArrowVersion>11.0.0</ApacheArrowVersion>
3436
<GoogleProtobufVersion>3.19.6</GoogleProtobufVersion>
3537
<LightGBMVersion>2.3.1</LightGBMVersion>
3638
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisAnalyzersVersion>
3739
<MicrosoftCodeAnalysisCSharpVersion>3.9.0</MicrosoftCodeAnalysisCSharpVersion>
38-
<MicrosoftDotNetInteractiveFormattingVersion>1.0.0-beta.22504.6</MicrosoftDotNetInteractiveFormattingVersion>
39-
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.22504.6</MicrosoftDotNetInteractiveVersion>
40+
<MicrosoftDotNetInteractiveFormattingVersion>1.0.0-beta.23461.4</MicrosoftDotNetInteractiveFormattingVersion>
41+
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.23461.4</MicrosoftDotNetInteractiveVersion>
4042
<MicrosoftMLOnnxRuntimeVersion>1.14.0</MicrosoftMLOnnxRuntimeVersion>
4143
<MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
4244
<!--
@@ -74,11 +76,11 @@
7476
<SystemCompositionVersion>1.2.0</SystemCompositionVersion>
7577
<!-- Test-only Dependencies -->
7678
<ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
77-
<BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
79+
<BenchmarkDotNetVersion>0.13.1</BenchmarkDotNetVersion>
7880
<DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
7981
<DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
8082
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
81-
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
83+
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
8284
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23265.1</MicrosoftDotNetXUnitExtensionsVersion>
8385
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8486
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
@@ -87,7 +89,7 @@
8789
<MicrosoftMLTestDatabasesVersion>0.0.6-test</MicrosoftMLTestDatabasesVersion>
8890
<MicrosoftMLTestModelsVersion>0.0.7-test</MicrosoftMLTestModelsVersion>
8991
<SystemDataSqlClientVersion>4.6.1</SystemDataSqlClientVersion>
90-
<SystemDataSQLiteCoreVersion>1.0.113</SystemDataSQLiteCoreVersion>
92+
<SystemDataSQLiteCoreVersion>1.0.118</SystemDataSQLiteCoreVersion>
9193
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
9294
<XUnitVersion>2.4.2</XUnitVersion>
9395
<!-- Opt-out repo features -->

0 commit comments

Comments
 (0)