diff --git a/Jenkinsfile b/Jenkinsfile index 140ecd827..ee6c21531 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ def tagName() { } } -def runPerformanceTests(String testsPath, String stancFlags = ""){ +def checkCompilation(String testsPath, String stancFlags = ""){ unstash 'ubuntu-exe' sh """ @@ -54,7 +54,7 @@ def runPerformanceTests(String testsPath, String stancFlags = ""){ echo 'O=0' >> make/local echo 'CXXFLAGS+=-Wall' >> make/local make -j${env.PARALLEL} build; cd .. - ./runPerformanceTests.py -j${env.PARALLEL} --runs=0 ${testsPath} + python ./checkCompilation.py -j${env.PARALLEL} --syntax-only ${testsPath} """ } @@ -284,16 +284,8 @@ pipeline { dir("${env.WORKSPACE}/compile-tests-good"){ unstash "Stanc3Setup" script { - runPerformanceTests("../test/integration/good", params.stanc_flags) + checkCompilation("../test/integration/good", params.stanc_flags) } - - xunit([GoogleTest( - deleteOutputFiles: false, - failIfNotNew: true, - pattern: 'performance-tests-cmdstan/performance.xml', - skipNoTestFiles: false, - stopProcessingIfError: false) - ]) } } post { always { runShell("rm -rf ${env.WORKSPACE}/compile-tests-good/*") }} @@ -316,16 +308,8 @@ pipeline { dir("${env.WORKSPACE}/compile-tests-example"){ script { unstash "Stanc3Setup" - runPerformanceTests("example-models", params.stanc_flags) + checkCompilation("example-models", params.stanc_flags) } - - xunit([GoogleTest( - deleteOutputFiles: false, - failIfNotNew: true, - pattern: 'performance-tests-cmdstan/performance.xml', - skipNoTestFiles: false, - stopProcessingIfError: false) - ]) } } post { always { runShell("rm -rf ${env.WORKSPACE}/compile-tests-example/*") }} @@ -353,16 +337,8 @@ pipeline { dir("${env.WORKSPACE}/compile-good-O1"){ unstash "Stanc3Setup" script { - runPerformanceTests("../test/integration/good", "--O1") + checkCompilation("../test/integration/good", "--O1") } - - xunit([GoogleTest( - deleteOutputFiles: false, - failIfNotNew: true, - pattern: 'performance-tests-cmdstan/performance.xml', - skipNoTestFiles: false, - stopProcessingIfError: false) - ]) } } post { always { runShell("rm -rf ${env.WORKSPACE}/compile-good-O1/*") }} @@ -390,16 +366,8 @@ pipeline { dir("${env.WORKSPACE}/compile-example-O1"){ script { unstash "Stanc3Setup" - runPerformanceTests("example-models", "--O1") + checkCompilation("example-models", "--O1") } - - xunit([GoogleTest( - deleteOutputFiles: false, - failIfNotNew: true, - pattern: 'performance-tests-cmdstan/performance.xml', - skipNoTestFiles: false, - stopProcessingIfError: false) - ]) } } post { always { runShell("rm -rf ${env.WORKSPACE}/compile-example-O1/*") }} diff --git a/test/integration/good/compiler-optimizations/copy-prop-profile.stan b/test/integration/good/compiler-optimizations/copy-prop-profile.stan index 6f0403b27..b0ca1261d 100644 --- a/test/integration/good/compiler-optimizations/copy-prop-profile.stan +++ b/test/integration/good/compiler-optimizations/copy-prop-profile.stan @@ -16,6 +16,7 @@ model { target += sum(vec); row_vector[N] vec3; + { row_vector[N] vec4 = columns_dot_self(X); vec3 = vec4; diff --git a/test/integration/good/compiler-optimizations/cpp.expected b/test/integration/good/compiler-optimizations/cpp.expected index e50e1b63a..96e24c2d4 100644 --- a/test/integration/good/compiler-optimizations/cpp.expected +++ b/test/integration/good/compiler-optimizations/cpp.expected @@ -4495,10 +4495,10 @@ static constexpr std::array locations_array__ = " (in 'copy-prop-profile.stan', line 11, column 2 to line 14, column 3)", " (in 'copy-prop-profile.stan', line 18, column 13 to column 14)", " (in 'copy-prop-profile.stan', line 18, column 2 to column 21)", - " (in 'copy-prop-profile.stan', line 20, column 15 to column 16)", - " (in 'copy-prop-profile.stan', line 20, column 4 to column 45)", - " (in 'copy-prop-profile.stan', line 19, column 2 to line 22, column 3)", - " (in 'copy-prop-profile.stan', line 24, column 2 to column 22)", + " (in 'copy-prop-profile.stan', line 21, column 15 to column 16)", + " (in 'copy-prop-profile.stan', line 21, column 4 to column 45)", + " (in 'copy-prop-profile.stan', line 20, column 2 to line 23, column 3)", + " (in 'copy-prop-profile.stan', line 25, column 2 to column 22)", " (in 'copy-prop-profile.stan', line 2, column 2 to column 17)", " (in 'copy-prop-profile.stan', line 5, column 9 to column 10)", " (in 'copy-prop-profile.stan', line 5, column 11 to column 12)"}; diff --git a/test/integration/good/compiler-optimizations/cppO0.expected b/test/integration/good/compiler-optimizations/cppO0.expected index 2b1ba1011..90e9d3c1e 100644 --- a/test/integration/good/compiler-optimizations/cppO0.expected +++ b/test/integration/good/compiler-optimizations/cppO0.expected @@ -1979,11 +1979,11 @@ static constexpr std::array locations_array__ = " (in 'copy-prop-profile.stan', line 16, column 2 to column 21)", " (in 'copy-prop-profile.stan', line 18, column 13 to column 14)", " (in 'copy-prop-profile.stan', line 18, column 2 to column 21)", - " (in 'copy-prop-profile.stan', line 20, column 15 to column 16)", - " (in 'copy-prop-profile.stan', line 20, column 4 to column 45)", - " (in 'copy-prop-profile.stan', line 21, column 4 to column 16)", - " (in 'copy-prop-profile.stan', line 19, column 2 to line 22, column 3)", - " (in 'copy-prop-profile.stan', line 24, column 2 to column 22)", + " (in 'copy-prop-profile.stan', line 21, column 15 to column 16)", + " (in 'copy-prop-profile.stan', line 21, column 4 to column 45)", + " (in 'copy-prop-profile.stan', line 22, column 4 to column 16)", + " (in 'copy-prop-profile.stan', line 20, column 2 to line 23, column 3)", + " (in 'copy-prop-profile.stan', line 25, column 2 to column 22)", " (in 'copy-prop-profile.stan', line 2, column 2 to column 17)", " (in 'copy-prop-profile.stan', line 5, column 9 to column 10)", " (in 'copy-prop-profile.stan', line 5, column 11 to column 12)"}; diff --git a/test/integration/good/compiler-optimizations/cppO1.expected b/test/integration/good/compiler-optimizations/cppO1.expected index 204ff01a4..63f7b9dc4 100644 --- a/test/integration/good/compiler-optimizations/cppO1.expected +++ b/test/integration/good/compiler-optimizations/cppO1.expected @@ -1953,11 +1953,11 @@ static constexpr std::array locations_array__ = " (in 'copy-prop-profile.stan', line 16, column 2 to column 21)", " (in 'copy-prop-profile.stan', line 18, column 13 to column 14)", " (in 'copy-prop-profile.stan', line 18, column 2 to column 21)", - " (in 'copy-prop-profile.stan', line 20, column 15 to column 16)", - " (in 'copy-prop-profile.stan', line 20, column 4 to column 45)", - " (in 'copy-prop-profile.stan', line 21, column 4 to column 16)", - " (in 'copy-prop-profile.stan', line 19, column 2 to line 22, column 3)", - " (in 'copy-prop-profile.stan', line 24, column 2 to column 22)", + " (in 'copy-prop-profile.stan', line 21, column 15 to column 16)", + " (in 'copy-prop-profile.stan', line 21, column 4 to column 45)", + " (in 'copy-prop-profile.stan', line 22, column 4 to column 16)", + " (in 'copy-prop-profile.stan', line 20, column 2 to line 23, column 3)", + " (in 'copy-prop-profile.stan', line 25, column 2 to column 22)", " (in 'copy-prop-profile.stan', line 2, column 2 to column 17)", " (in 'copy-prop-profile.stan', line 5, column 9 to column 10)", " (in 'copy-prop-profile.stan', line 5, column 11 to column 12)"};