Skip to content
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

Jump to bottom

Use Channel Instead of BufferBlock #5123

Merged
merged 14 commits into from
Jul 8, 2020
Merged

Use Channel Instead of BufferBlock #5123

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f61033e
Update file to use channel
jwood803 May 13, 2020
416da19
Add channels package
jwood803 May 13, 2020
72beecb
Update for feedback
jwood803 May 14, 2020
e688d05
Update more buffer blocks to use channel
jwood803 May 14, 2020
77ec834
Add version to props file
jwood803 May 15, 2020
32f3a01
Remove build dependencies that aren't needed
jwood803 May 20, 2020
b6b39c8
Update comments
jwood803 May 21, 2020
8fc6a56
Add back data flow package
jwood803 May 21, 2020
335b724
Remove data flow package everywhere
jwood803 May 21, 2020
8a45c1d
Update from PR feedback
jwood803 May 21, 2020
9b3a5e6
Revert carriage return
jwood803 Jun 11, 2020
325f8dd
Updates from comments
jwood803 Jun 11, 2020
b853e84
Remove disposed variable
jwood803 Jun 11, 2020
158ab07
Block receiving thread
jwood803 Jul 8, 2020
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
11 changes: 6 additions & 5 deletions src/Microsoft.ML.Sweeper/AsyncSweeper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow;
jwood803 marked this conversation as resolved.
Show resolved Hide resolved
using Microsoft.ML;
Expand Down Expand Up @@ -168,7 +169,7 @@ public sealed class Options
private readonly object _lock;
private readonly CancellationTokenSource _cts;

private readonly BufferBlock<ParameterSetWithId> _paramQueue;
private readonly Channel<ParameterSetWithId> _paramQueue;
jwood803 marked this conversation as resolved.
Show resolved Hide resolved
private readonly int _relaxation;
private readonly ISweeper _baseSweeper;
private readonly IHost _host;
Expand Down Expand Up @@ -208,7 +209,7 @@ public DeterministicSweeperAsync(IHostEnvironment env, Options options)
_lock = new object();
_results = new List<IRunResult>();
_nullRuns = new HashSet<int>();
_paramQueue = new BufferBlock<ParameterSetWithId>();
_paramQueue = Channel.CreateUnbounded<ParameterSetWithId>();
jwood803 marked this conversation as resolved.
Show resolved Hide resolved

PrepareNextBatch(null);
}
Expand All @@ -220,12 +221,12 @@ private void PrepareNextBatch(IEnumerable<IRunResult> results)
if (Utils.Size(paramSets) == 0)
{
// Mark the queue as completed.
_paramQueue.Complete();
_paramQueue.Writer.Complete();
return;
}
// Assign an id to each ParameterSet and enque it.
foreach (var paramSet in paramSets)
_paramQueue.Post(new ParameterSetWithId(_numGenerated++, paramSet));
_paramQueue.Writer.TryWrite(new ParameterSetWithId(_numGenerated++, paramSet));
EnsureResultsSize();
}

Expand Down Expand Up @@ -278,7 +279,7 @@ public async Task<ParameterSetWithId> ProposeAsync()
return null;
try
{
return await _paramQueue.ReceiveAsync(_cts.Token);
return await _paramQueue.Reader.ReadAsync(_cts.Token);
}
catch (InvalidOperationException)
{
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.ML.Sweeper/Microsoft.ML.Sweeper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Threading.Channels" Version="4.7.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
<ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
Expand Down