Skip to content

Commit 642a05f

Browse files
committed
TESTFIX: Reduce general_threshold to 1e-7 absolute for sampling and optimization tests.
- single values (e.g. accuracy, scaled_gradoent) in run time changed with tf 1.5 for unknown reasons. It might be connected to changes in reduce_sum internally but I could not find where the new "deterministic" reduce_sum actually entered. - this also is required for trajectory files for all samplers. - and also for averages for both samplers and optimizers. - also for some the threshold needed to be even larger than 1e-7, e.g. 3e-7, for MNIST Optimizer test we actually needed 1.1e-6. - integration test's accuracy reduced to 3e-7.
1 parent b96c848 commit 642a05f

15 files changed

+30
-7
lines changed

tests/integration/Equilibration/testsuite-equilibration.at

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ AT_CHECK([../../../DDSampler \
5959
AT_CHECK([grep "11," run-restore_model.csv], 0, [ignore], [ignore])
6060
# compare (exclude time_per_nth_step column)
6161
AT_CHECK([../../../NumericalDiff \
62-
--general_threshold 2e-7 relative \
62+
--general_threshold 3e-7 relative \
6363
--column_drop time_per_nth_step id -- run-save_model.csv ${abs_top_srcdir}/tests/integration/Equilibration/post/run-save_model.csv], 0, [ignore], [ignore])
6464
AT_CHECK([../../../NumericalDiff \
6565
--column_drop time_per_nth_step id -- run-restore_model.csv ${abs_top_srcdir}/tests/integration/Equilibration/post/run-restore_model.csv], 0, [ignore], [ignore])

tests/regression/DataDrivenExplorer/SingleTrajectory/testsuite-datadrivenexplorer-single_trajectory.at

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ AT_CHECK([../../../DDSExplorer \
4646
], 0, [stdout], [stderr])
4747

4848
AT_CHECK([../../../NumericalDiff \
49+
--general_threshold 1e-7 absolute \
4950
--column_drop time_per_nth_step -- \
5051
run-single.csv ${abs_top_srcdir}/tests/regression/DataDrivenExplorer/SingleTrajectory/post/run-single.csv], 0, [ignore], [ignore])
5152

tests/regression/DataDrivenSampler/Averages/testsuite-datadrivensampler-averages.at

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ AT_CHECK([../../../DDSampler \
3737
], 0, [stdout], [stderr])
3838

3939
# and compare
40-
AT_CHECK([../../../NumericalDiff -- \
41-
averages-twoclusters.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Averages/post/averages-twoclusters.csv], 0, [ignore], [ignore])
40+
AT_CHECK([../../../NumericalDiff \
41+
--general_threshold 1e-7 absolute \
42+
-- averages-twoclusters.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Averages/post/averages-twoclusters.csv], 0, [ignore], [ignore])
4243

4344
AT_CLEANUP

tests/regression/DataDrivenSampler/Samplers/testsuite-datadrivensampler-samplers-baoab.at

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ AT_CHECK([../../../DDSampler \
3939

4040
# now compare (exclude time_per_nth_step column)
4141
AT_CHECK([../../../NumericalDiff \
42+
--general_threshold 1e-7 absolute \
4243
--column_drop time_per_nth_step id -- \
4344
run-BAOAB.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-BAOAB.csv], 0, [ignore], [ignore])
4445
AT_CHECK([../../../NumericalDiff \
46+
--general_threshold 1e-7 absolute \
4547
--column_drop id -- \
4648
trajectory-BAOAB.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-BAOAB.csv], 0, [ignore], [ignore])
4749

tests/regression/DataDrivenSampler/Samplers/testsuite-datadrivensampler-samplers-gla_1st.at

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ AT_CHECK([../../../DDSampler \
3939

4040
# now compare (exclude time_per_nth_step column)
4141
AT_CHECK([../../../NumericalDiff \
42+
--general_threshold 1e-7 absolute \
4243
--column_drop time_per_nth_step id -- \
4344
run-GLA_1st.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-GLA_1st.csv], 0, [ignore], [ignore])
4445
AT_CHECK([../../../NumericalDiff \
46+
--general_threshold 1e-7 absolute \
4547
--column_drop id -- \
4648
trajectory-GLA_1st.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-GLA_1st.csv], 0, [ignore], [ignore])
4749

tests/regression/DataDrivenSampler/Samplers/testsuite-datadrivensampler-samplers-gla_2nd.at

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ AT_CHECK([../../../DDSampler \
3939

4040
# now compare (exclude time_per_nth_step column)
4141
AT_CHECK([../../../NumericalDiff \
42+
--general_threshold 1e-7 absolute \
4243
--column_drop time_per_nth_step id -- \
4344
run-GLA_2nd.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-GLA_2nd.csv], 0, [ignore], [ignore])
4445
AT_CHECK([../../../NumericalDiff \
46+
--general_threshold 1e-7 absolute \
4547
--column_drop id -- \
4648
trajectory-GLA_2nd.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-GLA_2nd.csv], 0, [ignore], [ignore])
4749

tests/regression/DataDrivenSampler/Samplers/testsuite-datadrivensampler-samplers-hmc.at

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ AT_CHECK([../../../DDSampler \
3939

4040
# now compare (exclude time_per_nth_step column)
4141
AT_CHECK([../../../NumericalDiff \
42+
--general_threshold 1e-7 absolute \
4243
--column_drop time_per_nth_step id -- \
4344
run-HMC.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-HMC.csv], 0, [ignore], [ignore])
4445
AT_CHECK([../../../NumericalDiff \
46+
--general_threshold 1e-7 absolute \
4547
--column_drop id -- \
4648
trajectory-HMC.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-HMC.csv], 0, [ignore], [ignore])
4749

@@ -75,6 +77,7 @@ AT_CHECK([../../../NumericalDiff \
7577
--column_drop time_per_nth_step id -- \
7678
run-HMC-hidden.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-HMC-hidden.csv], 0, [ignore], [ignore])
7779
AT_CHECK([../../../NumericalDiff \
80+
--general_threshold 3e-7 absolute \
7881
--column_drop id -- \
7982
trajectory-HMC-hidden.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-HMC-hidden.csv], 0, [ignore], [ignore])
8083

tests/regression/DataDrivenSampler/Samplers/testsuite-datadrivensampler-samplers-sgld.at

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ AT_CHECK([../../../DDSampler \
3939

4040
# now compare (exclude time_per_nth_step column)
4141
AT_CHECK([../../../NumericalDiff \
42+
--general_threshold 1e-7 absolute \
4243
--column_drop time_per_nth_step id -- \
4344
run-SGLD.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/run-SGLD.csv], 0, [ignore], [ignore])
4445
AT_CHECK([../../../NumericalDiff \
46+
--general_threshold 1e-7 absolute \
4547
--column_drop id -- \
4648
trajectory-SGLD.csv ${abs_top_srcdir}/tests/regression/DataDrivenSampler/Samplers/post/trajectory-SGLD.csv], 0, [ignore], [ignore])
4749

tests/regression/DataOptimizer/Averages/testsuite-dataoptimizer-averages.at

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ AT_CHECK([../../../DDSOptimizer \
3535
], 0, [stdout], [stderr])
3636

3737
# and compare
38-
AT_CHECK([../../../NumericalDiff -- \
39-
averages-twoclusters.csv ${abs_top_srcdir}/tests/regression/DataOptimizer/Averages/post/averages-twoclusters.csv], 0, [ignore], [ignore])
38+
AT_CHECK([../../../NumericalDiff \
39+
--general_threshold 1e-7 absolute \
40+
-- averages-twoclusters.csv ${abs_top_srcdir}/tests/regression/DataOptimizer/Averages/post/averages-twoclusters.csv], 0, [ignore], [ignore])
4041

4142
AT_CLEANUP

tests/regression/DataOptimizer/Datasets/testsuite-dataoptimizer-datasets-foursquares.at

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ AT_CHECK([../../../DDSOptimizer \
3636

3737
# and compare (exclude time_per_nth_step column)
3838
AT_CHECK([../../../NumericalDiff \
39+
--general_threshold 2e-7 absolute \
3940
--column_drop time_per_nth_step id -- \
4041
run-foursquares.csv ${abs_top_srcdir}/tests/regression/DataOptimizer/Datasets/post/run-foursquares.csv], 0, [ignore], [ignore])
4142

0 commit comments

Comments
 (0)