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

Jump to bottom

Try and consolidate more Github tests. #791

Merged
merged 4 commits into from
Jun 7, 2022
Merged

Try and consolidate more Github tests. #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5c01b6
Try and consolidate more Github tests.
jzmaddock Jun 5, 2022
ce370f8
Fix up test_polynomial.cpp for standalone test.
jzmaddock Jun 6, 2022
d4c71ea
Fix up multiprc_concept_check_2.cpp for standalone tests.
jzmaddock Jun 6, 2022
48f20e9
Split windows-gcc jobs into smaller chunks again.
jzmaddock Jun 6, 2022
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
58 changes: 53 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
compiler: [ g++-12, clang++-14 ]
standard: [ c++14, c++17, c++20 ]
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
suite: [ github_ci_block_1, github_ci_block_2 ]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
matrix:
toolset: [ clang ]
standard: [ 11, 14, 17, 20 ]
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
suite: [ github_ci_block_1, github_ci_block_2 ]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -193,7 +193,55 @@ jobs:
strategy:
fail-fast: false
matrix:
toolset: [ gcc, msvc-14.0, msvc-14.2 ]
toolset: [ msvc-14.0, msvc-14.2 ]
standard: [ 14, 17 ]
suite: [ github_ci_block_1, github_ci_block_2 ]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- uses: mstachniuk/ci-skip@v1
with:
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
commit-filter-separator: ';'
fail-fast: true
- name: Checkout main boost
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
- name: Update tools/boostdep
run: git submodule update --init tools/boostdep
working-directory: ../boost-root
- name: Copy files
run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math
working-directory: ../boost-root
- name: Install deps
run: python tools/boostdep/depinst/depinst.py math
working-directory: ../boost-root
- name: Bootstrap
run: bootstrap
working-directory: ../boost-root
- name: Generate headers
run: b2 headers
working-directory: ../boost-root
- name: Config info install
run: ..\..\..\b2 config_info_travis_install %ARGS%
working-directory: ../boost-root/libs/config/test
- name: Config info
run: config_info_travis
working-directory: ../boost-root/libs/config/test
- name: Test
run: ..\..\..\b2 --hash %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES ${{ matrix.suite }}
working-directory: ../boost-root/libs/math/test
windows_gcc:
runs-on: windows-2019
defaults:
run:
shell: cmd
env:
ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }}
strategy:
fail-fast: false
matrix:
toolset: [ gcc ]
standard: [ 14, 17 ]
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
steps:
Expand Down Expand Up @@ -242,7 +290,7 @@ jobs:
fail-fast: false
matrix:
standard: [ 14, 17, 20 ]
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
suite: [ github_ci_block_1, github_ci_block_2 ]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -415,7 +463,7 @@ jobs:
matrix:
compiler: [ g++-10 ]
standard: [ c++14, c++17, c++20 ]
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, interpolators, autodiff, ../example//examples, ../tools ]
suite: [ github_ci_block_1, github_ci_block_2 ]
steps:
- uses: actions/checkout@v2
with:
Expand Down
9 changes: 8 additions & 1 deletion test/Jamfile.v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,4 +1633,11 @@ alias no_eh_tests :
tools_workaround_incl_test
;

explicit no_eh_tests ;
explicit no_eh_tests ;

# Some aliases which group blocks of tests for CI testing:

alias github_ci_block_1 : special_fun float128_tests distribution_tests mp misc ;
alias github_ci_block_2 : quadrature interpolators autodiff ../example//examples ../tools ;
explicit github_ci_block_1 ;
explicit github_ci_block_2 ;
3 changes: 2 additions & 1 deletion test/multiprc_concept_check_2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ void foo()

int main()
{
BOOST_CONCEPT_ASSERT((boost::math::concepts::RealTypeConcept<test_type>));
boost::math::concepts::RealTypeConcept<test_type> checker;
checker.constraints();
}


10 changes: 7 additions & 3 deletions test/test_polynomial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
#define BOOST_TEST_MAIN
#include <boost/array.hpp>
#include <boost/math/tools/polynomial.hpp>
#ifndef BOOST_MATH_STANDALONE
#include <boost/integer/common_factor_rt.hpp>
#endif
#include <boost/mpl/list.hpp>
#include <boost/mpl/joint_view.hpp>
#include <boost/test/unit_test.hpp>
#ifndef BOOST_MATH_STANDALONE
#include <boost/multiprecision/cpp_int.hpp>
#include <boost/multiprecision/cpp_bin_float.hpp>
#include <boost/multiprecision/cpp_dec_float.hpp>
#endif
#include <utility>
#include <array>
#include <list>
Expand Down Expand Up @@ -271,7 +275,7 @@ typedef boost::mpl::list<int, long> large_integral_test_types;
typedef boost::mpl::list<> mp_integral_test_types;
#elif defined(TEST2)
typedef boost::mpl::list<
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
boost::multiprecision::cpp_int
#endif
> integral_test_types;
Expand All @@ -287,13 +291,13 @@ typedef large_integral_test_types mp_integral_test_types;
typedef boost::mpl::list<double, long double> non_integral_test_types;
#elif defined(TEST2)
typedef boost::mpl::list<
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
boost::multiprecision::cpp_rational
#endif
> non_integral_test_types;
#elif defined(TEST3)
typedef boost::mpl::list<
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
boost::multiprecision::cpp_bin_float_single, boost::multiprecision::cpp_dec_float_50
#endif
> non_integral_test_types;
Expand Down