Skip to content

Commit

Permalink
Move ZBaselines => test/BaselineOutput and Samples/UCI => test/data (d…
Browse files Browse the repository at this point in the history
…otnet#263)

* Move ZBaselines to test/BaselineOutput
* Fix the path in BaseTestBaseline
* Move Samples\UCI to test\data
  • Loading branch information
rantri authored and eerhardt committed Jul 27, 2018
1 parent 2cd077a commit 94d707b
Show file tree
Hide file tree
Showing 203 changed files with 15 additions and 18 deletions.
3 changes: 0 additions & 3 deletions Samples/UCI/readme.md

This file was deleted.

24 changes: 12 additions & 12 deletions test/Microsoft.ML.Predictor.Tests/TestAutoInference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public void TestLearn()
{
using (var env = new TlcEnvironment())
{
string pathData = GetDataPath(@"../../Samples/UCI/adult.train");
string pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
string pathData = GetDataPath("adult.train");
string pathDataTest = GetDataPath("adult.test");
int numOfSampleRows = 1000;
int batchSize = 5;
int numIterations = 10;
Expand Down Expand Up @@ -72,8 +72,8 @@ public void TestLearn()
public void TestPipelineSweeperMacroNoTransforms()
{
// Set up inputs for experiment
string pathData = GetDataPath(@"../../Samples/UCI/adult.train");
string pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
string pathData = GetDataPath("adult.train");
string pathDataTest = GetDataPath("adult.test");
const int numOfSampleRows = 1000;
const string schema = "sep=, col=Features:R4:0,2,4,10-12 col=Label:R4:14 header=+";

Expand Down Expand Up @@ -128,8 +128,8 @@ public void TestPipelineSweeperMacroNoTransforms()
public void EntryPointPipelineSweepSerialization()
{
// Get datasets
var pathData = GetDataPath(@"../../Samples/UCI/adult.train");
var pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
var pathData = GetDataPath("adult.train");
var pathDataTest = GetDataPath("adult.test");
const int numOfSampleRows = 1000;
int numIterations = 10;
const string schema =
Expand Down Expand Up @@ -274,8 +274,8 @@ public void EntryPointPipelineSweep()
public void TestRocketPipelineEngine()
{
// Get datasets
var pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
var pathDataTest = GetDataPath(@"../../Samples/UCI", "adult.test");
var pathData = GetDataPath("adult.train");
var pathDataTest = GetDataPath("adult.test");
const int numOfSampleRows = 1000;
int numIterations = 35;
const string schema =
Expand Down Expand Up @@ -414,7 +414,7 @@ public void TestPipelineNodeCloning()
[Fact]
public void TestHyperparameterFreezing()
{
string pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
string pathData = GetDataPath("adult.train");
int numOfSampleRows = 1000;
int batchSize = 1;
int numIterations = 10;
Expand Down Expand Up @@ -489,7 +489,7 @@ public void TestRegressionPipelineWithMinimizingMetric()
[Fact]
public void TestLearnerConstrainingByName()
{
string pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
string pathData = GetDataPath("adult.train");
int numOfSampleRows = 1000;
int batchSize = 1;
int numIterations = 1;
Expand Down Expand Up @@ -518,8 +518,8 @@ public void TestLearnerConstrainingByName()
public void TestRequestedLearners()
{
// Get datasets
var pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
var pathDataTest = GetDataPath(@"../../Samples/UCI", "adult.test");
var pathData = GetDataPath("adult.train");
var pathDataTest = GetDataPath("adult.test");
const int numOfSampleRows = 100;
const string schema =
"sep=, col=Features:R4:0,2,4,10-12 col=workclass:TX:1 col=education:TX:3 col=marital_status:TX:5 col=occupation:TX:6 " +
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.ML.TestFramework/BaseTestBaseline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ void IDisposable.Dispose()

internal const string RawSuffix = ".raw";
private const string LogSuffix = ".log";
private readonly string _baselineRootRelPath = Path.Combine("ZBaselines", BuildString); // Relative to Root.
private readonly string _baselineRootRelPath = Path.Combine(TestDir, "BaselineOutput", BuildString); // Relative to Root.
private readonly string _logRootRelPath = Path.Combine("Logs", BuildString); // Relative to OutDir.
private readonly string ScopeRootRelPath = Path.Combine("Samples", "scope"); // Root of files required for Scope related tests. Used primarily for local runs
private readonly string TestExtDir = Path.Combine("Tests", "Ext"); // Directory with external binaries checked in. Eg libvw.dll

private const string SamplesRootRelPath = @"Samples"; // Root location of Samples. Used primarily for local runs
private const string TestDir = @"Tests";
private const string TestDir = @"test";

private const string DataRootRegExp = @"[a-z]:\\[^/\t ]+\\test\\data" + @"\\[^/\t ]+";
private const string SamplesRootRegExp = @"[a-z]:\\[^/\t ]+\\Samples\\";
Expand Down Expand Up @@ -96,7 +96,7 @@ void IDisposable.Dispose()
public void Init()
{
// Create the output and log directories.
Contracts.Check(Directory.Exists(Path.Combine(RootDir, "ZBaselines")));
Contracts.Check(Directory.Exists(Path.Combine(RootDir, TestDir, "BaselineOutput")));
string logDir = Path.Combine(OutDir, _logRootRelPath);
Directory.CreateDirectory(logDir);

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 94d707b

Please sign in to comment.