diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index cd05b1802e..2d2c930a09 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -18,41 +18,41 @@ trigger: resources: containers: - - container: CentosContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet + # - container: CentosContainer + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet - - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet + # - container: UbuntuContainer + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet - - container: UbuntuCrossArmContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm + # - container: UbuntuCrossArmContainer + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm - container: UbuntuCrossArm64Container image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm64 jobs: -- template: /build/ci/job-template.yml - parameters: - architecture: arm - name: Ubuntu_x64_cross_arm_Net60 - buildScript: ./build.sh - container: UbuntuCrossArmContainer - customMatrixes: - Debug_Build: - _configuration: Debug - _config_short: DI - _includeBenchmarkData: false - _targetFramework: net6.0 - Release_Build: - _configuration: Release - _config_short: RI - _includeBenchmarkData: true - _targetFramework: net6.0 - innerLoop: true - pool: - name: NetCore-Public - demands: ImageOverride -equals build.ubuntu.1804.amd64.open - helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 +# - template: /build/ci/job-template.yml +# parameters: +# architecture: arm +# name: Ubuntu_x64_cross_arm_Net60 +# buildScript: ./build.sh +# container: UbuntuCrossArmContainer +# customMatrixes: +# Debug_Build: +# _configuration: Debug +# _config_short: DI +# _includeBenchmarkData: false +# _targetFramework: net6.0 +# Release_Build: +# _configuration: Release +# _config_short: RI +# _includeBenchmarkData: true +# _targetFramework: net6.0 +# innerLoop: true +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals build.ubuntu.1804.amd64.open +# helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 - template: /build/ci/job-template.yml parameters: @@ -66,68 +66,68 @@ jobs: _config_short: DI _includeBenchmarkData: false _targetFramework: net6.0 - Release_Build: - _configuration: Release - _config_short: RI - _includeBenchmarkData: true - _targetFramework: net6.0 + # Release_Build: + # _configuration: Release + # _config_short: RI + # _includeBenchmarkData: true + # _targetFramework: net6.0 innerLoop: true pool: name: NetCore-Public demands: ImageOverride -equals build.ubuntu.1804.amd64.open helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 -- template: /build/ci/job-template.yml - parameters: - name: Centos_x64_Net60 - buildScript: ./build.sh - container: CentosContainer - innerLoop: true - pool: - name: NetCore-Public - demands: ImageOverride -equals build.ubuntu.1804.amd64.open - helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - -- template: /build/ci/job-template.yml - parameters: - name: Ubuntu_x64_Net60 - buildScript: ./build.sh - container: UbuntuContainer - innerLoop: true - pool: - name: NetCore-Public - demands: ImageOverride -equals build.ubuntu.1804.amd64.open - helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-helix - -- template: /build/ci/job-template.yml - parameters: - name: MacOS_x64_Net60 - buildScript: ./build.sh - innerLoop: true - pool: - vmImage: macOS-12 - helixQueue: OSX.1200.Amd64.Open - -- template: /build/ci/job-template.yml - parameters: - architecture: arm64 - name: MacOS_cross_arm64_Net6 - buildScript: ./build.sh - customMatrixes: - Debug_Build: - _configuration: Debug - _config_short: DI - _includeBenchmarkData: false - _targetFramework: net6.0 - Release_Build: - _configuration: Release - _config_short: RI - _includeBenchmarkData: true - _targetFramework: net6.0 - innerLoop: true - pool: - vmImage: macOS-12 - helixQueue: OSX.1100.Arm64.Open +# - template: /build/ci/job-template.yml +# parameters: +# name: Centos_x64_Net60 +# buildScript: ./build.sh +# container: CentosContainer +# innerLoop: true +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals build.ubuntu.1804.amd64.open +# helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix + +# - template: /build/ci/job-template.yml +# parameters: +# name: Ubuntu_x64_Net60 +# buildScript: ./build.sh +# container: UbuntuContainer +# innerLoop: true +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals build.ubuntu.1804.amd64.open +# helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-helix + +# - template: /build/ci/job-template.yml +# parameters: +# name: MacOS_x64_Net60 +# buildScript: ./build.sh +# innerLoop: true +# pool: +# vmImage: macOS-12 +# helixQueue: OSX.1200.Amd64.Open + +# - template: /build/ci/job-template.yml +# parameters: +# architecture: arm64 +# name: MacOS_cross_arm64_Net6 +# buildScript: ./build.sh +# customMatrixes: +# Debug_Build: +# _configuration: Debug +# _config_short: DI +# _includeBenchmarkData: false +# _targetFramework: net6.0 +# Release_Build: +# _configuration: Release +# _config_short: RI +# _includeBenchmarkData: true +# _targetFramework: net6.0 +# innerLoop: true +# pool: +# vmImage: macOS-12 +# helixQueue: OSX.1100.Arm64.Open - template: /build/ci/job-template.yml parameters: @@ -140,11 +140,11 @@ jobs: _config_short: DI _includeBenchmarkData: false _targetFramework: net6.0 - Release_Build: - _configuration: Release - _config_short: RI - _includeBenchmarkData: false - _targetFramework: net6.0 + # Release_Build: + # _configuration: Release + # _config_short: RI + # _includeBenchmarkData: false + # _targetFramework: net6.0 innerLoop: true vsTestConfiguration: "/Framework:.NETCoreApp,Version=v6.0" pool: @@ -152,47 +152,47 @@ jobs: demands: ImageOverride -equals 1es-windows-2019-open helixQueue: windows.11.arm64.open -- template: /build/ci/job-template.yml - parameters: - name: Windows_x64_Net6 - buildScript: build.cmd - innerLoop: true - vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1" - pool: - name: NetCore-Public - demands: ImageOverride -equals 1es-windows-2019-open - helixQueue: Windows.10.Amd64.Open - -- template: /build/ci/job-template.yml - parameters: - name: Windows_x64_NetFx461 - buildScript: build.cmd - customMatrixes: - Debug_Build: - _configuration: Debug - _config_short: DFX - _includeBenchmarkData: false - _targetFramework: net462 - Release_Build: - _configuration: Release - _config_short: RFX - _includeBenchmarkData: false - _targetFramework: net462 - innerLoop: true - vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0" - pool: - name: NetCore-Public - demands: ImageOverride -equals 1es-windows-2019-open - helixQueue: Windows.10.Amd64.Open - -- template: /build/ci/job-template.yml - parameters: - name: Windows_x86_Net6 - architecture: x86 - buildScript: build.cmd - innerLoop: true - vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1" - pool: - name: NetCore-Public - demands: ImageOverride -equals 1es-windows-2019-open - helixQueue: Windows.10.Amd64.Open +# - template: /build/ci/job-template.yml +# parameters: +# name: Windows_x64_Net6 +# buildScript: build.cmd +# innerLoop: true +# vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1" +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals 1es-windows-2019-open +# helixQueue: Windows.10.Amd64.Open + +# - template: /build/ci/job-template.yml +# parameters: +# name: Windows_x64_NetFx461 +# buildScript: build.cmd +# customMatrixes: +# Debug_Build: +# _configuration: Debug +# _config_short: DFX +# _includeBenchmarkData: false +# _targetFramework: net462 +# Release_Build: +# _configuration: Release +# _config_short: RFX +# _includeBenchmarkData: false +# _targetFramework: net462 +# innerLoop: true +# vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0" +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals 1es-windows-2019-open +# helixQueue: Windows.10.Amd64.Open + +# - template: /build/ci/job-template.yml +# parameters: +# name: Windows_x86_Net6 +# architecture: x86 +# buildScript: build.cmd +# innerLoop: true +# vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1" +# pool: +# name: NetCore-Public +# demands: ImageOverride -equals 1es-windows-2019-open +# helixQueue: Windows.10.Amd64.Open diff --git a/src/Microsoft.ML.Data/DataView/CacheDataView.cs b/src/Microsoft.ML.Data/DataView/CacheDataView.cs index 4c2491e09a..e6c8755edf 100644 --- a/src/Microsoft.ML.Data/DataView/CacheDataView.cs +++ b/src/Microsoft.ML.Data/DataView/CacheDataView.cs @@ -1320,7 +1320,7 @@ public virtual void Freeze() private sealed class ImplVec : ColumnCache> { - // The number of rows cached. + // The number of rows cached. Only to be accesssed by the Caching thread. private int _rowCount; // For a given row [r], elements at [r] and [r+1] specify the inclusive // and exclusive range of values for the two big arrays. In the case @@ -1384,10 +1384,10 @@ public override void CacheCurrent() public override void Fetch(int idx, ref VBuffer value) { - Ctx.Assert(0 <= idx && idx < _rowCount); - Ctx.Assert(_rowCount < Utils.Size(_indexBoundaries)); - Ctx.Assert(_rowCount < Utils.Size(_valueBoundaries)); - Ctx.Assert(_uniformLength > 0 || _rowCount <= Utils.Size(_lengths)); + Ctx.Assert(0 <= idx); + Ctx.Assert((idx + 1) < Utils.Size(_indexBoundaries)); + Ctx.Assert((idx + 1) < Utils.Size(_valueBoundaries)); + Ctx.Assert(_uniformLength > 0 || idx < Utils.Size(_lengths)); Ctx.Assert(_indexBoundaries[idx + 1] - _indexBoundaries[idx] <= int.MaxValue); int indexCount = (int)(_indexBoundaries[idx + 1] - _indexBoundaries[idx]);