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

Fix header self-sufficiency and add compile-time check #552

Merged
merged 2 commits into from
Jun 16, 2020

Conversation

upsj
Copy link
Member

@upsj upsj commented May 28, 2020

This works by building a separate source file for each header that only includes this file. The PR also contains fixes for all found issues.

Fixes #412

@upsj upsj added is:enhancement An improvement of an existing feature. reg:build This is related to the build system. labels May 28, 2020
@upsj upsj self-assigned this May 28, 2020
@codecov
Copy link

codecov bot commented May 28, 2020

Codecov Report

Merging #552 into develop will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #552      +/-   ##
===========================================
- Coverage    84.15%   84.14%   -0.01%     
===========================================
  Files          296      296              
  Lines        19838    19838              
===========================================
- Hits         16694    16693       -1     
- Misses        3144     3145       +1     
Impacted Files Coverage Δ
omp/components/format_conversion.hpp 60.00% <ø> (ø)
reference/components/format_conversion.hpp 100.00% <ø> (ø)
include/ginkgo/core/base/range_accessors.hpp 31.57% <0.00%> (-5.27%) ⬇️

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 89f889c...4a507e8. Read the comment docs.

@upsj upsj added the 1:ST:ready-for-review This PR is ready for review label May 29, 2020
Copy link
Member

@tcojean tcojean left a comment

Choose a reason for hiding this comment

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

Although GLOBs are supposed to be evil in CMake, I think this would really be a case where they can actually be useful. I think maintaining all these header lists manually can be a bother. What do you think?
I think that would also allow to have everything part of the macro, probably even without modifying our target sources to add header files.

@upsj
Copy link
Member Author

upsj commented May 29, 2020

The reason I didn't go for a GLOB is the following: I regularly develop on the build system where the files are being copied over from my editor via scp, but if I delete/rename a file, it's not automatically deleted -- GLOB would still find these files. But of course that's not a strong argument, since I rarely to never build with CIRCULAR_DEPS on. I am not sure how likely something like this would be in practice. Git usually takes care of this when changing branches, only maybe if somebody uses Ginkgo without git might we run into issues.

So basically the question is what's more cumbersome: Updating the header list when adding a new header or deleting files on remote when they are no longer used.

Also another advantage of listing the files explicitly: Some IDEs (Qt Creator and older versions of CLion come to mind) treat files that are listed as target sources differently or even don't show them at all.

I initially found some of these points in the discussion below this poll: https://twitter.com/lefticus/status/1245008742170554368

Copy link
Member

@tcojean tcojean left a comment

Choose a reason for hiding this comment

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

I guess the main reason for including headers in the targets would be for VisualStudio if I understand this properly? Otherwise the GLOB approach can be put into the ginkgo_check_headers macro, in particular since this concerns only CIRCULAR_DEPS builds so is mostly CI related. I don't think the GLOB will have much (or any) side effect in that case.

Another issue with this approach is that this doesn't seem to take into account std headers and relies on indirect includes for some functionality. For example, omp/matrix/csr_kernels.hpp directly uses shared_ptr so it should have <memory>, and it also uses size_type so it should include #include <ginkgo/core/base/types.hpp>.

Maybe what we have with iwyu is sufficient, although it should be configured a bit if possible to remove some false positives. If so, I think we would have all we want/need for this. iwyu is able to find the previous issues I showed.

@upsj
Copy link
Member Author

upsj commented Jun 4, 2020

I don't have too much of a strong opinion on GLOB vs. explicit list. I also think that the missing header files in IDEs were mostly an issue with older versions of CMake and/or Visual Studio, so that shouldn't matter nowadays.

I would however argue that iwyu and this approach achieve different (albeit related) things:
The declared goal of iwyu is to "thin out" the include dependency DAG of a project. It should also notice when a file is missing an include, but I can't really see these warnings stand out in any way among the huge number of warnings we currently get. Also in my experience (which is somewhat dated though), iwyu tends to produce a large number of false-positives.
This compilation step on the other hand is supposed to explicitly fail when a file is not self-contained, i.e. including it without some missing dependencies causes a build to fail. This step should not produce any false-positives as far as I can tell.

Let me just quickly check whether we can get rid of some of the warnings...

@upsj
Copy link
Member Author

upsj commented Jun 4, 2020

So after a quick look over a few of the iwyu suggestions, it looks to me like some of them indeed have merit, especially related to standard library headers (missing that was included somewhere else, ...), but there were also a few false positives (like proposing to include internal standard library headers) and a few false negatives (like wanting to remove a header declaring kernels, probably due to the macro usage).

So to me it looks like iwyu would be able to detect some of these issues, but we can't really use it as a general-purpose tool due to the large number of false suggestions.

@tcojean
Copy link
Member

tcojean commented Jun 4, 2020

I just found out that iwyu has quite a few pragmas which we could use to control its output significantly. I believe the issues we cannot fix with these are the false negatives. I admit though that getting the output to a usable state would take quite a bit of work since there is so much to fix, on top of having to tackle the bad suggestions it proposes.
https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/IWYUPragmas.md

@upsj upsj added this to the Ginkgo 1.2.0 milestone Jun 6, 2020
@upsj upsj force-pushed the check_header_selfsufficiency branch from 29ee717 to 41d018d Compare June 10, 2020 10:55
@upsj
Copy link
Member Author

upsj commented Jun 10, 2020

I moved from explicitly listing the headers to GLOBs now ;)
Regarding IWYU, while it might be possible, I believe this is too much work for too little pay-off in terms of build time.

@upsj upsj requested a review from tcojean June 10, 2020 14:27
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.

LGTM!

Copy link
Member

@tcojean tcojean left a comment

Choose a reason for hiding this comment

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

LGTM. At some point in the future I would like to move to iwyu for this, but this is fine for now.

add_library(ginkgo_public_api INTERFACE) # dummy target
set_property(TARGET ginkgo_public_api APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}")
set_property(TARGET ginkgo_public_api APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
ginkgo_check_headers(ginkgo_public_api)
Copy link
Member

Choose a reason for hiding this comment

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

This is just a comment, but I think this target can be useful at some point since that would allow for example to use it to create the main ginkgo.hpp file, or to install our headers in a specific location. It's a good thing to have that available now.

@upsj upsj 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 Jun 15, 2020
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.

In general, it looks good to me and also works good on my system.
However, I have 3 questions / requests for it:

  1. Can we make it a cached variable in CMake (easier to change it with ccmake and also an additional documentation for users)?
  2. Can you add documentation for it?
  3. Can we add this to the CI, so we catch some errors centralized?

core/CMakeLists.txt Show resolved Hide resolved
cuda/CMakeLists.txt Show resolved Hide resolved
@upsj
Copy link
Member Author

upsj commented Jun 15, 2020

This is already part of the no-circular-deps pipeline. I will add comments to the INSTALL.md and CONTRIBUTING.md

@upsj upsj force-pushed the check_header_selfsufficiency branch from 41d018d to 1c88005 Compare June 15, 2020 12:11
@upsj upsj requested a review from thoasm June 15, 2020 12:28
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!

upsj and others added 2 commits June 16, 2020 07:48
This works by building for each header file
a separate source file that only includes this file.
Co-authored-by: Thomas Grützmacher <thomas.gruetzmacher@kit.edu>
@upsj upsj force-pushed the check_header_selfsufficiency branch from 1c88005 to 4a507e8 Compare June 16, 2020 06:03
@sonarcloud
Copy link

sonarcloud bot commented Jun 16, 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

No Coverage information No Coverage information
0.0% 0.0% Duplication

warning The version of Java (1.8.0_121) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

@upsj upsj merged commit 687bc92 into develop Jun 16, 2020
@upsj upsj deleted the check_header_selfsufficiency branch June 16, 2020 12:45
@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. reg:build This is related to the build system.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some header files are not self-contained
4 participants