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.

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

Add core and reference multiprecision tests #448

Merged
merged 16 commits into from
Mar 4, 2020
Merged

Add core and reference multiprecision tests #448

merged 16 commits into from
Mar 4, 2020

Conversation

tcojean
Copy link
Member

@tcojean tcojean commented Jan 13, 2020

This PR adds multiprecision tests for the core and reference modules. In addition to this, all non matrix, solver and preconditioners in the OpenMP module also have multiprecision tests.

The changes are stopped here in this PR for multiple reasons:

  • There is already more than 11K lines of code changes
  • Some matrices, solvers and/or preconditioners have terrible OpenMP, CUDA and HIP timings which would impact very negatively the testing timings. So far, the added changes should not make the tests much slower.
  • HIP and CUDA have multiple kernels which do not support complex types or int64 index types, so a significant effort is required there.

There is a lot of changes, but a lot of the changes are similar. Some changes had to be done to multiple places in order to fix issues with classes not properly supporting multiple precisions, or add new testing features. I will detail these later.

Summary of changes

  • All core tests rewrote for multiple precisions
  • All reference tests rewrote for multiple precisions
  • Extra OpenMP tests rewrote for multiple precisions (non matrix, solver or preconditioner).
  • codecov is put back into Ginkgo, and our coverage significantly improved thanks to the templated tests
  • In core/test/utils.hpp, a bunch of declarations were provided for default values we want to tests, and other tools used when doing multiprecision tests.
  • In core/test/utils/assertions.hpp, get_relative_error and other commonly used functions from the assertions were extended for the complex value case (using gko::remove_complex most of the time). A new assertion was added for comparing values of complex type (GKO_ASSERT_NEAR, which extends the basic gtest one ASSERT_NEAR).
  • Papi required some fixes (counting the instances of Papi loggers globally instead of per template valuetype).
  • Ilu required some fixes (using gko::remove_complex and removing default valuetype use of <>).

How to write templated tests

core/tests/utils.hpp always needs to be included because it provides required definitions.
In general, if only one kind of precision (e.g. value_type) is required, then normal templating can be used, otherwise, due to the use of the macro for declaring the templated values to try, a tuple which contains all the elements need to be defined, see the reference/test/matrix/csr_kernels.cpp for example.

template <typename ValueIndexType>
class Csr : public ::testing::Test {
protected:
    using value_type =
        typename std::tuple_element<0, decltype(ValueIndexType())>::type;
    using index_type =
        typename std::tuple_element<1, decltype(ValueIndexType())>::type;
};

Afterwards, the class needs to be instantiated for all precisions, which is done such as in the following way:

TYPED_TEST_CASE(Csr, gko::test::ValueIndexTypes);

Note that ValueIndexTypes is provided by utils.hpp and contains tuples of all valuetype and index type combinations.

As a requirement, the tests now need to use the macro TYPED_TEST instead of TEST_F. This has multiple implications:

  • All member objects/functions have to be accessed with this->.
  • All member definitions such as using need to be accessed through TestFixture::Mtx for example. The approach I used is to add to every test the required using shortcut to make the tests look nicer.
  • A variable TypeParam is provided which is the template type of the test.
  • Due to complexes being able to be built with {real, img} notation, our initializations of the form {{1.0, 2.0}, {3.0, 4.0}} are ambiguous (the second {). I provided a shortcut I<type> for stating that this is actually an initializer list of type T, and not a complex construction. So the following example would be replaced with:
using T = typename TestFixture::value_type;
auto mtx = gko::initialize({I<T>{1.0, 2.0}, I<T>{3.0, 4.0}}, this->exec);

Finally, I implemented a shortcut r<value_type>::value for providing depending on the type of the value a proper precision (1e-7 for float and std::complex<float>, and 1e-14 for double variants).

Sort of closes #32

@tcojean tcojean added the 1:ST:WIP This PR is a work in progress. Not ready for review. label Jan 13, 2020
@tcojean tcojean self-assigned this Jan 13, 2020
@tcojean tcojean changed the title Try to put back coverage tools to check the current status. Check codecov status Jan 13, 2020
@codecov
Copy link

codecov bot commented Jan 13, 2020

Codecov Report

❗ No coverage uploaded for pull request base (develop@c1ac9f4). Click here to learn what that means.
The diff coverage is 98.43%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop     #448   +/-   ##
==========================================
  Coverage           ?   91.59%           
==========================================
  Files              ?      294           
  Lines              ?    19585           
  Branches           ?        0           
==========================================
  Hits               ?    17938           
  Misses             ?     1647           
  Partials           ?        0
Impacted Files Coverage Δ
include/ginkgo/core/preconditioner/ilu.hpp 60.56% <0%> (ø)
reference/test/log/convergence.cpp 91.66% <100%> (ø)
reference/test/solver/bicgstab_kernels.cpp 100% <100%> (ø)
reference/test/solver/lower_trs_kernels.cpp 100% <100%> (ø)
core/test/matrix/identity.cpp 100% <100%> (ø)
core/test/solver/lower_trs.cpp 100% <100%> (ø)
omp/test/components/prefix_sum.cpp 100% <100%> (ø)
reference/test/solver/upper_trs.cpp 95.65% <100%> (ø)
core/test/base/array.cpp 100% <100%> (ø)
reference/test/matrix/sparsity_csr_kernels.cpp 97.88% <100%> (ø)
... and 56 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1ac9f4...5b13903. Read the comment docs.

@tcojean tcojean force-pushed the fix_coverage branch 9 times, most recently from a0dce45 to 1b652c3 Compare January 21, 2020 08:04
@tcojean tcojean added reg:ci-cd This is related to the continuous integration system. mod:core This is related to the core module. is:enhancement An improvement of an existing feature. 1:ST:ready-for-review This PR is ready for review mod:reference This is related to the reference module. reg:testing This is related to testing. and removed 1:ST:WIP This PR is a work in progress. Not ready for review. labels Jan 23, 2020
@tcojean tcojean changed the title Check codecov status Add core and reference multiprecision tests Jan 23, 2020
@yhmtsai
Copy link
Member

yhmtsai commented Feb 13, 2020

I also compiled it on Windows. There are some problems with I<T>, std::initializer_list<T>
reference/test/base/{combination,composition,perturbation} and reference/test/matrix/dense_kernels use I<T>. Their value is not correctly set by I<T>{a, b}.
the workaround method uses I<T>({a, b}).

Also, need () for gko::Array initialization in class initialization.
In reference/core/test/utils/assertions_test, mtx13_row_ptrs{0, 3, 4} should be mtx13_row_ptrs({0, 3, 4}). Otherwise, MSVC gives the error c2059 and c2344 ( Related:
https://docs.microsoft.com/en-us/cpp/error-messages/compiler-errors-1/compiler-error-c2059?view=vs-2019)

@tcojean
Copy link
Member Author

tcojean commented Feb 13, 2020

@yhmtsai Thanks for testing this. You mean that all I<T>{...} needs to change to I<T>({...}) ?

Copy link
Member

@thoasm thoasm left a comment

Choose a reason for hiding this comment

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

LGTM!

reference/test/matrix/identity.cpp Outdated Show resolved Hide resolved
@tcojean
Copy link
Member Author

tcojean commented Mar 4, 2020

Everything should be fixed to the limits of what I think is doable. Please check the last commit.

Copy link
Member

@upsj upsj left a comment

Choose a reason for hiding this comment

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

Great work, LGTM! Regarding the 0 tolerance assertion: Using values that can be represented exactly in IEEE float might help here.

reference/test/matrix/identity.cpp Outdated Show resolved Hide resolved
reference/test/matrix/identity.cpp Outdated Show resolved Hide resolved
+ Use `T{}` and similar instead of `T()`.
+ Use " include notation for non test utils.hpp header.
+ Only use one newline before `TYPED_TEST_CASE` declaration.
+ Use 0.0 for tests where possible.
+ Properly compare complex numbers in our test assertions.
+ Fix header notation to previous style.
+ Properly make GKO assertions work between complex and real types.
@sonarcloud
Copy link

sonarcloud bot commented Mar 4, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

Copy link
Member

@pratikvn pratikvn left a comment

Choose a reason for hiding this comment

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

Great work on this! LGTM!

@tcojean tcojean merged commit 000a364 into develop Mar 4, 2020
@tcojean tcojean deleted the fix_coverage branch March 4, 2020 21:27
@tcojean tcojean added 1:ST:ready-to-merge This PR is ready to merge. and removed 1:ST:ready-for-review This PR is ready for review labels Mar 5, 2020
@tcojean tcojean mentioned this pull request Jun 23, 2020
tcojean added a commit that referenced this pull request Jul 7, 2020
The Ginkgo team is proud to announce the new minor release of Ginkgo version
1.2.0. This release brings full HIP support to Ginkgo, new preconditioners
(ParILUT, ISAI), conversion between double and float for all LinOps, and many
more features and fixes.

Supported systems and requirements:
+ For all platforms, cmake 3.9+
+ Linux and MacOS
  + gcc: 5.3+, 6.3+, 7.3+, all versions after 8.1+
  + clang: 3.9+
  + Intel compiler: 2017+
  + Apple LLVM: 8.0+
  + CUDA module: CUDA 9.0+
  + HIP module: ROCm 2.8+
+ Windows
  + MinGW and CygWin: gcc 5.3+, 6.3+, 7.3+, all versions after 8.1+
  + Microsoft Visual Studio: VS 2017 15.7+
  + CUDA module: CUDA 9.0+, Microsoft Visual Studio
  + OpenMP module: MinGW or CygWin.


The current known issues can be found in the [known issues page](https://github.com/ginkgo-project/ginkgo/wiki/Known-Issues).


# Additions
Here are the main additions to the Ginkgo library. Other thematic additions are listed below.
+ Add full HIP support to Ginkgo [#344](#344), [#357](#357), [#384](#384), [#373](#373), [#391](#391), [#396](#396), [#395](#395), [#393](#393), [#404](#404), [#439](#439), [#443](#443), [#567](#567)
+ Add a new ISAI preconditioner [#489](#489), [#502](#502), [#512](#512), [#508](#508), [#520](#520)
+ Add support for ParILUT and ParICT factorization with ILU preconditioners [#400](#400)
+ Add a new BiCG solver [#438](#438)
+ Add a new permutation matrix format [#352](#352), [#469](#469)
+ Add CSR SpGEMM support [#386](#386), [#398](#398), [#418](#418), [#457](#457)
+ Add CSR SpGEAM support [#556](#556)
+ Make all solvers and preconditioners transposable [#535](#535)
+ Add CsrBuilder and CooBuilder for intrusive access to matrix arrays [#437](#437)
+ Add a standard-compliant allocator based on the Executors [#504](#504)
+ Support conversions for all LinOp between double and float [#521](#521)
+ Add a new boolean to the CUDA and HIP executors to control DeviceReset (default off) [#557](#557)
+ Add a relaxation factor to IR to represent Richardson Relaxation [#574](#574)
+ Add two new stopping criteria, for relative (to `norm(b)`) and absolute residual norm [#577](#577)

### Example additions
+ Templatize all examples to simplify changing the precision [#513](#513)
+ Add a new adaptive precision block-Jacobi example [#507](#507)
+ Add a new IR example [#522](#522)
+ Add a new Mixed Precision Iterative Refinement example [#525](#525)
+ Add a new example on iterative trisolves in ILU preconditioning [#526](#526), [#536](#536), [#550](#550)

### Compilation and library changes
+ Auto-detect compilation settings based on environment [#435](#435), [#537](#537)
+ Add SONAME to shared libraries [#524](#524)
+ Add clang-cuda support [#543](#543)

### Other additions
+ Add sorting, searching and merging kernels for GPUs [#403](#403), [#428](#428), [#417](#417), [#455](#455)
+ Add `gko::as` support for smart pointers [#493](#493)
+ Add setters and getters for criterion factories [#527](#527)
+ Add a new method to check whether a solver uses `x` as an initial guess [#531](#531)
+ Add contribution guidelines [#549](#549)

# Fixes
### Algorithms
+ Improve the classical CSR strategy's performance [#401](#401)
+ Improve the CSR automatical strategy [#407](#407), [#559](#559)
+ Memory, speed improvements to the ELL kernel [#411](#411)
+ Multiple improvements and fixes to ParILU [#419](#419), [#427](#427), [#429](#429), [#456](#456), [#544](#544)
+ Fix multiple issues with GMRES [#481](#481), [#523](#523), [#575](#575)
+ Optimize OpenMP matrix conversions [#505](#505)
+ Ensure the linearity of the ILU preconditioner [#506](#506)
+ Fix IR's use of the advanced apply [#522](#522)
+ Fix empty matrices conversions and add tests [#560](#560)

### Other core functionalities
+ Fix complex number support in our math header [#410](#410)
+ Fix CUDA compatibility of the main ginkgo header [#450](#450)
+ Fix isfinite issues [#465](#465)
+ Fix the Array::view memory leak and the array/view copy/move [#485](#485)
+ Fix typos preventing use of some interface functions [#496](#496)
+ Fix the `gko::dim` to abide to the C++ standard [#498](#498)
+ Simplify the executor copy interface [#516](#516)
+ Optimize intermediate storage for Composition [#540](#540)
+ Provide an initial guess for relevant Compositions [#561](#561)
+ Better management of nullptr as criterion [#562](#562)
+ Fix the norm calculations for complex support [#564](#564)

### CUDA and HIP specific
+ Use the return value of the atomic operations in our wrappers [#405](#405)
+ Improve the portability of warp lane masks [#422](#422)
+ Extract thread ID computation into a separate function [#464](#464)
+ Reorder kernel parameters for consistency [#474](#474)
+ Fix the use of `pragma unroll` in HIP [#492](#492)

### Other
+ Fix the Ginkgo CMake installation files [#414](#414), [#553](#553)
+ Fix the Windows compilation [#415](#415)
+ Always use demangled types in error messages [#434](#434), [#486](#486)
+ Add CUDA header dependency to appropriate tests [#452](#452)
+ Fix several sonarqube or compilation warnings [#453](#453), [#463](#463), [#532](#532), [#569](#569)
+ Add shuffle tests [#460](#460)
+ Fix MSVC C2398 error [#490](#490)
+ Fix missing interface tests in test install [#558](#558)

# Tools and ecosystem
### Benchmarks
+ Add better norm support in the benchmarks [#377](#377)
+ Add CUDA 10.1 generic SpMV support in benchmarks [#468](#468), [#473](#473)
+ Add sparse library ILU in benchmarks [#487](#487)
+ Add overhead benchmarking capacities [#501](#501)
+ Allow benchmarking from a matrix list file [#503](#503)
+ Fix benchmarking issue with JSON and non-finite numbers [#514](#514)
+ Fix benchmark logger crashers with OpenMP [#565](#565)

### CI related
+ Improvements to the CI setup with HIP compilation [#421](#421), [#466](#466)
+ Add MacOSX CI support [#470](#470), [#488](#488)
+ Add Windows CI support [#471](#471), [#488](#488), [#510](#510), [#566](#566)
+ Use sanitizers instead of valgrind [#476](#476)
+ Add automatic container generation and update facilities [#499](#499)
+ Fix the CI parallelism settings [#517](#517), [#538](#538), [#539](#539)
+ Make the codecov patch check informational [#519](#519)
+ Add support for LLVM sanitizers with improved thread sanitizer support [#578](#578)

### Test suite
+ Add an assertion for sparsity pattern equality [#416](#416)
+ Add core and reference multiprecision tests support [#448](#448)
+ Speed up GPU tests by avoiding device reset [#467](#467)
+ Change test matrix location string [#494](#494)

### Other
+ Add Ginkgo badges from our tools [#413](#413)
+ Update the `create_new_algorithm.sh` script [#420](#420)
+ Bump copyright and improve license management [#436](#436), [#433](#433)
+ Set clang-format minimum requirement [#441](#441), [#484](#484)
+ Update git-cmake-format [#446](#446), [#484](#484)
+ Disable the development tools by default [#442](#442)
+ Add a script for automatic header formatting [#447](#447)
+ Add GDB pretty printer for `gko::Array` [#509](#509)
+ Improve compilation speed [#533](#533)
+ Add editorconfig support [#546](#546)
+ Add a compile-time check for header self-sufficiency [#552](#552)


# Related PR: #583
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1:ST:ready-to-merge This PR is ready to merge. is:enhancement An improvement of an existing feature. mod:core This is related to the core module. mod:reference This is related to the reference module. reg:ci-cd This is related to the continuous integration system. reg:testing This is related to testing.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tests with variable ValueType and IndexType
5 participants