Skip to content

Commit d631b09

Browse files
Merge pull request #691 from UWB-Biocomputing/issue-358-improve-regression-setup
Improves our regression setup by adding good output files generated using the GPU implementation and reorganizing the output folders into folders for separate CPU and GPU outputs. A README has also been added showing the terminal commands used for generating the GPU outputs.
2 parents ea773d4 + ea711f8 commit d631b09

21 files changed

+1236
-10
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,39 @@ jobs:
3636
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-tiny.xml
3737
- name: verify test-tiny
3838
if: always() && steps.tt.conclusion == 'success'
39-
run: diff ../Testing/RegressionTesting/TestOutput/test-tiny-out.xml ../Testing/RegressionTesting/GoodOutput/test-tiny-out.xml
39+
run: diff ../Testing/RegressionTesting/TestOutput/test-tiny-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-tiny-out.xml
4040

4141
- id: ts
4242
name: run test-small
4343
if: always() && steps.build.conclusion == 'success'
4444
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-small.xml
4545
- name: verify test-small
4646
if: always() && steps.ts.conclusion == 'success'
47-
run: diff ../Testing/RegressionTesting/TestOutput/test-small-out.xml ../Testing/RegressionTesting/GoodOutput/test-small-out.xml
47+
run: diff ../Testing/RegressionTesting/TestOutput/test-small-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-small-out.xml
4848

4949
- id: tsc
5050
name: run test-small-connected
5151
if: always() && steps.build.conclusion == 'success'
5252
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-small-connected.xml
5353
- name: verify test-small-connected
5454
if: always() && steps.tsc.conclusion == 'success'
55-
run: diff ../Testing/RegressionTesting/TestOutput/test-small-connected-out.xml ../Testing/RegressionTesting/GoodOutput/test-small-connected-out.xml
55+
run: diff ../Testing/RegressionTesting/TestOutput/test-small-connected-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-small-connected-out.xml
5656

5757
- id: tsl
5858
name: run test-small-long
5959
if: always() && steps.build.conclusion == 'success'
6060
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-small-long.xml
6161
- name: verify test-small-long
6262
if: always() && steps.tsl.conclusion == 'success'
63-
run: diff ../Testing/RegressionTesting/TestOutput/test-small-long-out.xml ../Testing/RegressionTesting/GoodOutput/test-small-long-out.xml
63+
run: diff ../Testing/RegressionTesting/TestOutput/test-small-long-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-small-long-out.xml
6464

6565
- id: tscl
6666
name: run test-small-connected-long
6767
if: always() && steps.build.conclusion == 'success'
6868
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-small-connected-long.xml
6969
- name: verify test-small-connected-long
7070
if: always() && steps.tscl.conclusion == 'success'
71-
run: diff ../Testing/RegressionTesting/TestOutput/test-small-connected-long-out.xml ../Testing/RegressionTesting/GoodOutput/test-small-connected-long-out.xml
71+
run: diff ../Testing/RegressionTesting/TestOutput/test-small-connected-long-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-small-connected-long-out.xml
7272

7373
- id: ts911
7474
name: run test-small-911
@@ -84,28 +84,28 @@ jobs:
8484
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-medium.xml
8585
- name: verify test-medium
8686
if: always() && steps.tm.conclusion == 'success'
87-
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-out.xml ../Testing/RegressionTesting/GoodOutput/test-medium-out.xml
87+
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-medium-out.xml
8888

8989
- id: tmc
9090
name: run test-medium-connected
9191
if: always() && steps.build.conclusion == 'success'
9292
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-connected.xml
9393
- name: verify test-medium-connected
9494
if: always() && steps.tmc.conclusion == 'success'
95-
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-connected-out.xml ../Testing/RegressionTesting/GoodOutput/test-medium-connected-out.xml
95+
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-connected-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-medium-connected-out.xml
9696

9797
- id: tml
9898
name: run test-medium-long
9999
if: always() && steps.build.conclusion == 'success'
100100
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-long.xml
101101
- name: verify test-medium-long
102102
if: always() && steps.tml.conclusion == 'success'
103-
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-long-out.xml ../Testing/RegressionTesting/GoodOutput/test-medium-long-out.xml
103+
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-long-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-medium-long-out.xml
104104

105105
- id: tmcl
106106
name: run test-medium-connected-long
107107
if: always() && steps.build.conclusion == 'success'
108108
run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-connected-long.xml
109109
- name: verify test-medium-connected-long
110110
if: always() && steps.tmcl.conclusion == 'success'
111-
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-connected-long-out.xml ../Testing/RegressionTesting/GoodOutput/test-medium-connected-long-out.xml
111+
run: diff ../Testing/RegressionTesting/TestOutput/test-medium-connected-long-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-medium-connected-long-out.xml

Testing/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Documentation of steps for generating GPU GoodOutput files.
2+
3+
Results generated at 4pm on August 7th, 2024 using development branch
4+
5+
GPU GoodOutput generation commands
6+
test-medium-connected-long-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-connected-long.xml
7+
test-medium-connected-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-connected.xml
8+
test-medium-long-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-medium-long.xml
9+
test-medium-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-medium.xml
10+
test-small-911-out.xml: n/a No GPU model available
11+
test-small-connected-long-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-small-connected-long.xml
12+
test-small-connected-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-small-connected.xml
13+
test-small-long-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-small-long.xml
14+
test-small-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-small.xml
15+
test-tiny-out.xml: ./ggraphitti -c ../Testing/RegressionTesting/configfiles/test-tiny.xml

0 commit comments

Comments
 (0)