Skip to content

Commit 5509110

Browse files
fix benchmark test timeout issue (#5530)
1 parent c2f8ed5 commit 5509110

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

test/Microsoft.ML.PerformanceTests/Harness/Configs.cs

+10-5
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,19 @@ protected virtual Job GetJobDefinition()
3939
/// </summary>
4040
private IToolchain CreateToolchain()
4141
{
42+
TimeSpan timeout = TimeSpan.FromMinutes(5);
43+
4244
#if NETFRAMEWORK
4345
var tfm = "net461";
44-
var csProj = CsProjClassicNetToolchain.Net461;
46+
var csProj = CsProjClassicNetToolchain.From(tfm, timeout: timeout);
4547
#else
46-
var tfm = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null ?
47-
NetCoreAppSettings.NetCoreApp21.TargetFrameworkMoniker : NetCoreAppSettings.NetCoreApp31.TargetFrameworkMoniker;
48-
var csProj = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null ?
49-
CsProjCoreToolchain.NetCoreApp21 : CsProjCoreToolchain.NetCoreApp31;
48+
var settings = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null
49+
? NetCoreAppSettings.NetCoreApp21 : NetCoreAppSettings.NetCoreApp31;
50+
51+
settings = settings.WithTimeout(timeout);
52+
53+
var tfm = settings.TargetFrameworkMoniker;
54+
var csProj = CsProjCoreToolchain.From(settings);
5055
#endif
5156
return new Toolchain(
5257
tfm,

test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj

-16
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,4 @@
3232
<NativeAssemblyReference Include="MklImports" />
3333
<NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
3434
</ItemGroup>
35-
<ItemGroup>
36-
<MetaFile Update="@(MetaFile)">
37-
<Url>https://aka.ms/mlnet-resources/meta/%(Identity)</Url>
38-
<DestinationFile>$([System.IO.Path]::GetTempPath())/MLNET/</DestinationFile>
39-
</MetaFile>
40-
<TensorflowMetaFile Include="@(MetaFile->'$([System.IO.Path]::GetTempPath())/MLNET/%(Identity)')" />
41-
</ItemGroup>
42-
<Target Name="DownloadTensorflowMetaFiles" Inputs="@(TensorflowMetaFile)" Outputs="%(TensorflowMetaFile.DestinationFile)">
43-
<Message Importance="High" Text="Downloading tensorflow meta files... %(TensorflowMetaFile.DestinationFile)" />
44-
<DownloadFile
45-
SourceUrl="%(MetaFile.Url)"
46-
DestinationFolder="$([System.IO.Path]::GetTempPath())/MLNET/"
47-
Retries="5"
48-
SkipUnchangedFiles="true">
49-
</DownloadFile>
50-
</Target>
5135
</Project>

0 commit comments

Comments
 (0)