Move towards being able to build for x86#1008

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

Merged
tannergooding merged 1 commit into from
Oct 10, 2018
Merged

Move towards being able to build for x86 #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
<Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
<PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
</PropertyGroup>

<PropertyGroup>
<RestoreSources>
https://api.nuget.org/v3/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
</RestoreSources>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
what processor architecture will be used.
-->
<Error Condition="'$(PlatformTarget)' != 'x64' AND
<Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
</Target>

</Project>
5 changes: 5 additions & 0 deletions pkg/common/CommonPackage.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
Condition="'$(PlatformTarget)' == 'x86'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions src/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
<WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

<NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
<ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
</ItemGroup>

<ItemGroup>
<!-- TensorFlow is 64-bit only -->
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.
<NativeAssemblyReference Include="tensorflow" />
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Native/Stdafx.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down
5 changes: 3 additions & 2 deletions test/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
<NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="LdaNative" />
</ItemGroup>

<!-- TensorFlow is 64-bit only -->
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
<NativeAssemblyReference Include="tensorflow" />
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
public void TestTensorFlowEntryPoint()
{
var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
public void EntryPointLightGbmBinary()
{
Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
public void EntryPointLightGbmMultiClass()
{
Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
public void EntryPointTensorFlowTransform()
{
Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
<NoWarn>2003;$(NoWarn)</NoWarn>
<PublicSign>false</PublicSign>
<SourceLink></SourceLink>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
{
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."

@eerhardteerhardtOct 2, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?

@danmoseleydanmoseleyOct 4, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))] (and similar for TF)

@eerhardteerhardtOct 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.

In reply to: 222758463 [](ancestors = 222758463)

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.

The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.

@eerhardteerhardtOct 10, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.

@eerhardteerhardtOct 10, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:

  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.

The only disadvantage I see is the small amount of effort it is going to take to make this change.

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?

I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)

@eerhardteerhardtOct 10, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220

void TestSimpleCase()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
catch (InvalidOperationException) { }
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
void TestOldSavingAndLoading()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
public void OnnxStatic()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
void TestCommandLine()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down
46 changes: 23 additions & 23 deletions test/Microsoft.ML.Predictor.Tests/TestPredictors.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
/// <summary>
/// Multiclass Logistic Regression test with a tree featurizer.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline

@sfilipisfilipiOct 10, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)

Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215

[TestCategory("Multiclass")]
[TestCategory("Logistic Regression")]
[TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("SDCA")]
public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
/// <summary>
///A test for binary classifiers
///</summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
public void BinaryClassifierLogisticRegressionTest()
{
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
public void BinaryClassifierSymSgdTest()
{
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
public void BinaryClassifierTesterThresholdingTest()
{
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
/// <summary>
///A test for binary classifiers with non-negative coefficients
///</summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
public void BinaryClassifierLogisticRegressionNonNegativeTest()
{
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
/// <summary>
///A test for binary classifiers
///</summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
public void BinaryClassifierLogisticRegressionGaussianNormTest()
{
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
/// <summary>
///A test for binary classifiers
///</summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("FastForest")]
public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("FastTree")]
public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Binary")]
[TestCategory("LightGBM")]
public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Binary"), TestCategory("LightGBM")]
public void GossLightGBMTest()
{
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Binary")]
[TestCategory("LightGBM")]
public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
/// <summary>
/// A test for multi class classifiers.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Multiclass")]
[TestCategory("LightGBM")]
public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
/// <summary>
/// A test for multi class classifiers.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Multiclass")]
[TestCategory("LightGBM")]
public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
/// <summary>
/// A test for regression.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Regression")]
[TestCategory("LightGBM")]
public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
/// <summary>
/// A test for regression.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Regression")]
[TestCategory("LightGBM")]
public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
/// <summary>
/// A test for regression.
/// </summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
[TestCategory("Regression")]
[TestCategory("LightGBM")]
public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"

@eerhardteerhardtOct 2, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.

@danmoseleydanmoseleyOct 4, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.

@eerhardteerhardtOct 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?

In reply to: 222758690 [](ancestors = 222758690)

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.

@tannergoodingtannergoodingOct 10, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216

public void TestTreeEnsembleCombiner()
{
var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
CombineAndTestTreeEnsembles(dataView, fastTrees);
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
public void TestTreeEnsembleCombinerWithCategoricalSplits()
{
var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
}
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("FastTree")]
public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("FastTree")]
public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
Done();
}

[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Binary")]
[TestCategory("FastTree")]
public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
/// <summary>
///A test for random calibrators
///</summary>
[Fact]
[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
[TestCategory("Calibrator")]
public void RandomCalibratorPerceptronTest()
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Move towards being able to build for x86#1008

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

 Merged

tannergooding
merged 1 commit into

from

Oct 10, 2018
 Merged


Move towards being able to build for x86
#1008
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,15 @@
 <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 <Configurations>Debug;Release;Debug-Intrinsics;Release-Intrinsics</Configurations>
 <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">x64</NativeTargetArchitecture>
 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
 </PropertyGroup>

 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
Comment thread
tannergooding marked this conversation as resolved.

 https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
Expand Down

4 changes: 2 additions & 2 deletions
pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,10 @@
 the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
 what processor architecture will be used.
 -->
 <Error Condition="'$(PlatformTarget)' != 'x64' AND
 <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
 ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
 !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
 Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
 Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
 </Target>

</Project>

5 changes: 5 additions & 0 deletions
pkg/common/CommonPackage.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
 Condition="'$(PlatformTarget)' == 'x86'">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 <Visible>false</Visible>
 </Content>
 </ItemGroup>

</Project>

2 changes: 0 additions & 2 deletions
src/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@
 <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>

 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

 <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

 <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>

Expand Down

3 changes: 2 additions & 1 deletion
src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@
 <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 </ItemGroup>

 <ItemGroup>
 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
Comment thread
tannergooding marked this conversation as resolved.

 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Native/Stdafx.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <intrin.h>

#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret __stdcall
#define EXPORT_API(ret) extern "C" __declspec(dllexport) ret
#else
#include "UnixSal.h"

Expand Down

5 changes: 3 additions & 2 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <PackageReference Include="xunit" Version="2.4.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-prerelease-63213-02" />
 </ItemGroup>

</Project>

4 changes: 4 additions & 0 deletions
test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,10 @@
 <NativeAssemblyReference Include="CpuMathNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="LdaNative" />
 </ItemGroup>

 <!-- TensorFlow is 64-bit only -->
 <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
 <NativeAssemblyReference Include="tensorflow" />
 <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,7 +959,7 @@ public void TestOvaMacroWithUncalibratedLearner()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void TestTensorFlowEntryPoint()
 {
 var dataPath = GetDataPath("Train-Tiny-28x28.txt");
Expand Down

6 changes: 3 additions & 3 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1787,14 +1787,14 @@ public void EntryPointEvaluateRanking()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmBinary()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.LightGbmBinaryClassifier");
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 public void EntryPointLightGbmMultiClass()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(LightGbmBinaryPredictor).Assembly);
Expand DownExpand Up@@ -3710,7 +3710,7 @@ public void EntryPointWordEmbeddings()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // TensorFlow is 64-bit only
 public void EntryPointTensorFlowTransform()
 {
 Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <NoWarn>2003;$(NoWarn)</NoWarn>
 <PublicSign>false</PublicSign>
 <SourceLink></SourceLink>
 <PlatformTarget>x64</PlatformTarget>
 <PlatformTarget>$(TargetArchitecture)</PlatformTarget>
Comment thread
tannergooding marked this conversation as resolved.

 </PropertyGroup>

 <ItemGroup>
Expand Down

8 changes: 4 additions & 4 deletions
test/Microsoft.ML.OnnxTransformTest/OnnxTransformTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public OnnxTransformTests(ITestOutputHelper output) : base(output)
 {
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume Onnx support (i.e. Microsoft.ML.Scoring) is 64-bit only. @shmoradims@jignparm - can you confirm?
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so it might be more self documenting to have something like [ConditionalFact(typeof(TestUtilities), nameof(TestUtilities.IsOnnxScoringSupported))]  (and similar for TF)
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a response to this feedback? I think this seems like a good idea. Or perhaps even deriving a few fact attributes like OnnxFact or TensorflowFact, etc.
In reply to: 222758463 [](ancestors = 222758463)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure its worth the added overhead to declare a new fact, which itself calls Environment.Is64BitProcess.
The current conditional fact requires no "new" code and clearly defines that it is only supported on 64-bit processes.
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And when we try to add Aarch64 (i.e. arm64)?
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we will need to re-review any of the currently disabled tests and possibly change this based on whether they support ARM and/or ARM64.
@eerhardteerhardtOct 10, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple advantages to taking the above approach:
  1. It is self-documenting, like @danmosemsft said.
  2. It is centralized, so if it ever needs to be updated, only need to update a single spot.
  3. We can add any rules we want into the method, where you can't do this in a single attribute.
  4. It sets a good pattern for other tests to follow.
The only disadvantage I see is the small amount of effort it is going to take to make this change.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eerhardt, do you have any problem with logging a tracking issue to improve this?
I'd like to get this merged in order to unblock people and I don't think it's going to be as trivial as just defining some new attributes, since we will need to do something different for .NET Core (where we need to instead check the S.R.InteropServices.Architecture of the process)
@eerhardteerhardtOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fine with me.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1220
 void TestSimpleCase()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -100,7 +100,7 @@ void TestSimpleCase()
 catch (InvalidOperationException) { }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 void TestOldSavingAndLoading()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -158,7 +158,7 @@ void TestOldSavingAndLoading()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "An attempt was made to load a program with an incorrect format."
 public void OnnxStatic()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand DownExpand Up@@ -205,7 +205,7 @@ public void OnnxStatic()
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 void TestCommandLine()
 {
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down

46 changes: 23 additions & 23 deletions
test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ public void MulticlassSdcaTest()
 /// <summary>
 /// Multiclass Logistic Regression test with a tree featurizer.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
@sfilipisfilipiOct 10, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline [](start = 8, length = 110)
Let's add an issue to create baselines for those x86 tests, after checking that the difference is ok.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1215
 [TestCategory("Multiclass")]
 [TestCategory("Logistic Regression")]
 [TestCategory("FastTree")]
Expand DownExpand Up@@ -239,7 +239,7 @@ public void KMeansClusteringTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("SDCA")]
 public void LinearClassifierTest()
Expand All@@ -260,7 +260,7 @@ public void LinearClassifierTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionTest()
 {
Expand All@@ -270,7 +270,7 @@ public void BinaryClassifierLogisticRegressionTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierSymSgdTest()
 {
Expand All@@ -282,7 +282,7 @@ public void BinaryClassifierSymSgdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierTesterThresholdingTest()
 {
Expand All@@ -308,7 +308,7 @@ public void BinaryClassifierLogisticRegressionNormTest()
 /// <summary>
 ///A test for binary classifiers with non-negative coefficients
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionNonNegativeTest()
 {
Expand All@@ -334,7 +334,7 @@ public void BinaryClassifierLogisticRegressionBinNormTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 public void BinaryClassifierLogisticRegressionGaussianNormTest()
 {
Expand DownExpand Up@@ -373,7 +373,7 @@ public void BinaryClassifierFastRankClassificationTest()
 /// <summary>
 ///A test for binary classifiers
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastForest")]
 public void FastForestClassificationTest()
Expand DownExpand Up@@ -440,7 +440,7 @@ public void WeightingFastForestRegressionPredictorsTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationTest()
Expand All@@ -459,7 +459,7 @@ public void FastTreeBinaryClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void LightGBMClassificationTest()
Expand All@@ -475,7 +475,7 @@ public void LightGBMClassificationTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary"), TestCategory("LightGBM")]
 public void GossLightGBMTest()
 {
Expand All@@ -485,7 +485,7 @@ public void GossLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Binary")]
 [TestCategory("LightGBM")]
 public void DartLightGBMTest()
Expand All@@ -499,7 +499,7 @@ public void DartLightGBMTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelTest()
Expand All@@ -513,7 +513,7 @@ public void MultiClassifierLightGBMKeyLabelTest()
 /// <summary>
 /// A test for multi class classifiers.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Multiclass")]
 [TestCategory("LightGBM")]
 public void MultiClassifierLightGBMKeyLabelU404Test()
Expand All@@ -527,7 +527,7 @@ public void MultiClassifierLightGBMKeyLabelU404Test()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMTest()
Expand All@@ -541,7 +541,7 @@ public void RegressorLightGBMTest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMMAETest()
Expand All@@ -555,7 +555,7 @@ public void RegressorLightGBMMAETest()
 /// <summary>
 /// A test for regression.
 /// </summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // LightGBM is 64-bit only
 [TestCategory("Regression")]
 [TestCategory("LightGBM")]
 public void RegressorLightGBMRMSETest()
Expand DownExpand Up@@ -587,7 +587,7 @@ public void RankingLightGBMTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
@eerhardteerhardtOct 2, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated and fixed.
@danmoseleydanmoseleyOct 4, 2018

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could perhaps be a follow up issue if @tannergooding isn't the right person to investigate.
@eerhardteerhardtOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a follow up issue for this?
In reply to: 222758690 [](ancestors = 222758690)
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not logged issues for anything that requires followup yet.
@tannergoodingtannergoodingOct 10, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1216
 public void TestTreeEnsembleCombiner()
 {
 var dataPath = GetDataPath("breast-cancer.txt");
Expand All@@ -611,7 +611,7 @@ public void TestTreeEnsembleCombiner()
 CombineAndTestTreeEnsembles(dataView, fastTrees);
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 fails with "Unknown command: 'train'; Format error at (83,3)-(83,4011): Illegal quoting"
 public void TestTreeEnsembleCombinerWithCategoricalSplits()
 {
 var dataPath = GetDataPath("adult.tiny.with-schema.txt");
Expand DownExpand Up@@ -705,7 +705,7 @@ private void CombineAndTestTreeEnsembles(IDataView idv, IPredictorModel[] fastTr
 }
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationCategoricalSplitTest()
Expand DownExpand Up@@ -744,7 +744,7 @@ public void FastTreeRegressionCategoricalSplitTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeBinaryClassificationNoOpGroupIdTest()
Expand All@@ -764,7 +764,7 @@ public void FastTreeBinaryClassificationNoOpGroupIdTest()
 Done();
 }

 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Binary")]
 [TestCategory("FastTree")]
 public void FastTreeHighMinDocsTest()
Expand DownExpand Up@@ -1363,7 +1363,7 @@ public void PAVCalibratorPerceptronTest()
 /// <summary>
 ///A test for random calibrators
 ///</summary>
 [Fact]
 [ConditionalFact(typeof(Environment), nameof(Environment.Is64BitProcess))] // x86 output differs from Baseline
 [TestCategory("Calibrator")]
 public void RandomCalibratorPerceptronTest()
 {
Expand Down
Loading