Skip to content

Commit 94d707b

Browse files
rantrieerhardt
authored andcommitted
Move ZBaselines => test/BaselineOutput and Samples/UCI => test/data (dotnet#263)
* Move ZBaselines to test/BaselineOutput * Fix the path in BaseTestBaseline * Move Samples\UCI to test\data
1 parent 2cd077a commit 94d707b

File tree

203 files changed

+15
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+15
-18
lines changed

Samples/UCI/readme.md

-3
This file was deleted.

test/Microsoft.ML.Predictor.Tests/TestAutoInference.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void TestLearn()
2626
{
2727
using (var env = new TlcEnvironment())
2828
{
29-
string pathData = GetDataPath(@"../../Samples/UCI/adult.train");
30-
string pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
29+
string pathData = GetDataPath("adult.train");
30+
string pathDataTest = GetDataPath("adult.test");
3131
int numOfSampleRows = 1000;
3232
int batchSize = 5;
3333
int numIterations = 10;
@@ -72,8 +72,8 @@ public void TestLearn()
7272
public void TestPipelineSweeperMacroNoTransforms()
7373
{
7474
// Set up inputs for experiment
75-
string pathData = GetDataPath(@"../../Samples/UCI/adult.train");
76-
string pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
75+
string pathData = GetDataPath("adult.train");
76+
string pathDataTest = GetDataPath("adult.test");
7777
const int numOfSampleRows = 1000;
7878
const string schema = "sep=, col=Features:R4:0,2,4,10-12 col=Label:R4:14 header=+";
7979

@@ -128,8 +128,8 @@ public void TestPipelineSweeperMacroNoTransforms()
128128
public void EntryPointPipelineSweepSerialization()
129129
{
130130
// Get datasets
131-
var pathData = GetDataPath(@"../../Samples/UCI/adult.train");
132-
var pathDataTest = GetDataPath(@"../../Samples/UCI/adult.test");
131+
var pathData = GetDataPath("adult.train");
132+
var pathDataTest = GetDataPath("adult.test");
133133
const int numOfSampleRows = 1000;
134134
int numIterations = 10;
135135
const string schema =
@@ -274,8 +274,8 @@ public void EntryPointPipelineSweep()
274274
public void TestRocketPipelineEngine()
275275
{
276276
// Get datasets
277-
var pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
278-
var pathDataTest = GetDataPath(@"../../Samples/UCI", "adult.test");
277+
var pathData = GetDataPath("adult.train");
278+
var pathDataTest = GetDataPath("adult.test");
279279
const int numOfSampleRows = 1000;
280280
int numIterations = 35;
281281
const string schema =
@@ -414,7 +414,7 @@ public void TestPipelineNodeCloning()
414414
[Fact]
415415
public void TestHyperparameterFreezing()
416416
{
417-
string pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
417+
string pathData = GetDataPath("adult.train");
418418
int numOfSampleRows = 1000;
419419
int batchSize = 1;
420420
int numIterations = 10;
@@ -489,7 +489,7 @@ public void TestRegressionPipelineWithMinimizingMetric()
489489
[Fact]
490490
public void TestLearnerConstrainingByName()
491491
{
492-
string pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
492+
string pathData = GetDataPath("adult.train");
493493
int numOfSampleRows = 1000;
494494
int batchSize = 1;
495495
int numIterations = 1;
@@ -518,8 +518,8 @@ public void TestLearnerConstrainingByName()
518518
public void TestRequestedLearners()
519519
{
520520
// Get datasets
521-
var pathData = GetDataPath(@"../../Samples/UCI", "adult.train");
522-
var pathDataTest = GetDataPath(@"../../Samples/UCI", "adult.test");
521+
var pathData = GetDataPath("adult.train");
522+
var pathDataTest = GetDataPath("adult.test");
523523
const int numOfSampleRows = 100;
524524
const string schema =
525525
"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 " +

test/Microsoft.ML.TestFramework/BaseTestBaseline.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ void IDisposable.Dispose()
4141

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

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

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

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)