Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Performance Test Suite graphs to Manual Runtype #9604

Merged
merged 28 commits into from
Mar 28, 2019
Merged

Set Performance Test Suite graphs to Manual Runtype #9604

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
13a71a7
update
scottmitchell Nov 26, 2018
83563aa
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Nov 28, 2018
0e6bac9
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Dec 10, 2018
f5cd9b8
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Dec 19, 2018
3d2a126
Brought truncated search results and full query search out from behin…
scottmitchell Dec 19, 2018
2434a2a
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Jan 8, 2019
552a678
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Feb 26, 2019
8607bed
Pull upstream master
scottmitchell Mar 8, 2019
134b28b
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Mar 8, 2019
8af7951
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Mar 11, 2019
aa321ac
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Mar 12, 2019
8763331
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Mar 14, 2019
609b2fd
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
scottmitchell Mar 14, 2019
79acb4a
Added test graphs. Added readme with test graph info
scottmitchell Mar 19, 2019
a05cc1a
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
scottmitchell Mar 19, 2019
6ece6b4
Moved Heterogenous Input test graphs
scottmitchell Mar 19, 2019
61a277e
Update readme
scottmitchell Mar 19, 2019
4e04e46
xml -> json
scottmitchell Mar 19, 2019
6c188de
Added TspinesToMesh graph
scottmitchell Mar 20, 2019
e7ab2c3
Added FFITarget.dll. Added Element Binding graph.
scottmitchell Mar 20, 2019
81f3503
Removed SinuousTower and LotsOfStuff
scottmitchell Mar 21, 2019
cd37d8d
Changed graph Dynamo versions to earliest possible. Renamed graphs
scottmitchell Mar 21, 2019
456a520
rename ElementBinding image
scottmitchell Mar 21, 2019
6cf0467
Update readme
scottmitchell Mar 21, 2019
8a5a994
Set performance test suite graphs to manual mode
scottmitchell Mar 27, 2019
bf36538
Merge upstream master
scottmitchell Mar 27, 2019
a05d975
Force Manual Execution
scottmitchell Mar 28, 2019
f98d108
Revert "Force Manual Execution"
scottmitchell Mar 28, 2019
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: 2 additions & 2 deletions test/DynamoCoreTests/DynamoModelTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ protected void EmptyScheduler()
}
}

protected void OpenModel(string relativeFilePath)
protected void OpenModel(string relativeFilePath, bool forceManualExecutionMode = false)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@mjkkirschner @QilongTang Can we do this? Or do we need to add a new method?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@QilongTang I can remove this if you would rather just handle it as part of your task.

Copy link
Member

Choose a reason for hiding this comment

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

I think this is the way to do it.

Copy link
Member

Choose a reason for hiding this comment

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

I guess we need to consider that this might effect others who have written tests against the test base classes.....

I guess it's safest to add a new method unless you want to test this or do some research on the API compatibility of adding default arguments to protected methods?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's good, can you run self CI just to make sure?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For the record, this did pass the self CI, but I'm going to remove this change for now and just merge the RunType changes.

{
string openPath = Path.Combine(TestDirectory, relativeFilePath);
CurrentDynamoModel.ExecuteCommand(new DynamoModel.OpenFileCommand(openPath));
CurrentDynamoModel.ExecuteCommand(new DynamoModel.OpenFileCommand(openPath, forceManualExecutionMode));
}

protected void OpenSampleModel(string relativeFilePath)
Expand Down
4 changes: 2 additions & 2 deletions tools/Performance/DynamoPerformanceTests/PerformanceTestFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void IterationSetupRunModel()
Setup();

//open the dyn file
OpenModel(DynamoFilePath);
OpenModel(DynamoFilePath, true);
}

/// <summary>
Expand All @@ -119,7 +119,7 @@ public void IterationCleanup()
public void OpenModelBenchmark()
{
//open the dyn file
OpenModel(DynamoFilePath);
OpenModel(DynamoFilePath, true);
}

[Benchmark]
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/CodeBlocks.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3031,7 +3031,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "100"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/HeterogeneousInputsFirst.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "1000"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/HeterogeneousInputsLast.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "1000"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/HomogeneousInputs.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "1000"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/LotsOfColoredStuff.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "1000"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/Math.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7706,7 +7706,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "100"
},
"Camera": {
Expand Down
2 changes: 1 addition & 1 deletion tools/Performance/DynamoPerformanceTests/graphs/Points_40x40x40.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"HasRunWithoutCrash": true,
"IsVisibleInDynamoLibrary": true,
"Version": "2.0.2.8095",
"RunType": "Automatic",
"RunType": "Manual",
"RunPeriod": "1000"
},
"Camera": {
Expand Down