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

format the header of files #447

Merged
merged 34 commits into from
Apr 2, 2020
Merged

format the header of files #447

merged 34 commits into from
Apr 2, 2020

Conversation

yhmtsai
Copy link
Member

@yhmtsai yhmtsai commented Jan 13, 2020

This PR sorts the ordering of headers, use correct "header" or <header>, and correct the definition of header.

  1. Add hip/hip_runtime.h into hip/base/config.hip.hpp as its main include to ensure it is in front of hip/device_functions.h mentioned in Some header files are not self-contained #412
  2. use IncludeBlocks: Regroup (need clang-format 6) to sort the header except the main include
  3. add config (dev_tools/scripts/config) to set the rules how to find the corresponding main include
  4. if there are something like comment of #if block before #include, the script will give alarm "sorting is maybe not correct"
  5. Also alarm if there are multiple matches the main include.

Also mention this in #389 , but remove many if-else and unclear regex (which is almost handled by config)

add target format_header and format_header_all in CMake
format_header only process the changed files of branch
format_header_all process all code files.
They ignore build, examples, third_party, ginkgo.hpp

add // force-top: on and // force-top: off to keep some headers in the top (also before the main header).
I change the warning condition. If there are comments or #if block before codes, it gives warning.
The following is warning

Warning benchmark/utils/formats.hpp: sorting maybe is not correct
Warning core/base/extended_float.hpp: sorting maybe is not correct
Warning core/device_hooks/common_kernels.inc.cpp: sorting maybe is not correct
Warning include/ginkgo/core/base/abstract_factory.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/name_demangling.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/types.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/utils.hpp: sorting maybe is not correct
Warning reference/test/stop/combined.cpp: sorting maybe is not correct
Warning reference/test/stop/time.cpp: sorting maybe is not correct

@yhmtsai yhmtsai added the reg:helper-scripts This issue/PR is related to the helper scripts mainly concerned with development of Ginkgo. label Jan 13, 2020
@yhmtsai yhmtsai self-assigned this Jan 13, 2020
@yhmtsai
Copy link
Member Author

yhmtsai commented Jan 13, 2020

6 parts for reviews

Also, the following is the alarm of script

(base) mike:ginkgo$ find core -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;
(base) mike:ginkgo$ find cuda -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;
(base) mike:ginkgo$ find hip -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;
(base) mike:ginkgo$ find include/ginkgo/core -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;
ALARM include/ginkgo/core/base/name_demangling.hpp may not be sorted correctly
(base) mike:ginkgo$ find omp -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;
(base) mike:ginkgo$ find reference -type f -not -name "*.txt" -exec  dev_tools/scripts/format_header.sh {} \;

In name_demangling.hpp, it contains #if block before other #include

However, if #if block is in the end, it will not give an alarm like reference/test/stop/combined.cpp and reference/test/stop/time.cpp

@yhmtsai yhmtsai added the 1:ST:ready-for-review This PR is ready for review label Jan 13, 2020
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.

LGTM in general, I noticed some places where the script seems to contradict our guidelines, probably due to inconsistent file naming?

dev_tools/scripts/format_header.sh Show resolved Hide resolved
cuda/components/prefix_sum.cu Outdated Show resolved Hide resolved
cuda/test/components/prefix_sum.cu Outdated Show resolved Hide resolved
hip/components/prefix_sum.hip.cpp Outdated Show resolved Hide resolved
hip/test/components/prefix_sum.hip.cpp Outdated Show resolved Hide resolved
omp/test/components/prefix_sum.cpp Outdated Show resolved Hide resolved
reference/test/components/prefix_sum.cpp Outdated Show resolved Hide resolved
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.

LGTM (modulo compilation issues)

@yhmtsai
Copy link
Member Author

yhmtsai commented Jan 13, 2020

@upsj How do you think about combining prefix_sum.hip.hpp and prefix_sum.hip.cpp into prefix_sum_kernels.hip.cpp?

  1. the interface is already defined in core/components/prefix_sum.hpp
  2. It will be the same as the others like matrix and solver (with kernels suffix and the main header in core)

@upsj
Copy link
Member

upsj commented Jan 14, 2020

@upsj How do you think about combining prefix_sum.hip.hpp and prefix_sum.hip.cpp into prefix_sum_kernels.hip.cpp?

1. the interface is already defined in core/components/prefix_sum.hpp

2. It will be the same as the others like matrix and solver (with kernels suffix and the main header in core)

My answer to that would probably be "yes and/or unsure": At the moment, prefix_sum.hip.hpp only contains things that are used in prefix_sum.hip.cpp. For ParILUT however, I need a "wide" prefix sum kernel that is quite specific to the selection implementation and uses device functions I also put into prefix_sum.hip.hpp (or more specifically, prefix_sum.hpp.inc). So what do you think makes more sense:

  • Leave header and source separated, but rename the source to _kernels?
  • Combine header and source and later on also add the wide_prefix_sum to this file, even though it is only used by ParILUT?

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.

While this header overhaul is being done, maybe it is a good idea to also make it up to date with the recommendations of include-what-you-use from the CI ?

This would definitely take more time and be annoying, so if you want to leave that to another PR in the future that is also fine.

core/device_hooks/reference_hooks.cpp Show resolved Hide resolved
core/matrix/dense_kernels.hpp Show resolved Hide resolved
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.

First part of my review.

core/test/matrix/coo_builder.cpp Outdated Show resolved Hide resolved
core/test/matrix/csr_builder.cpp Outdated Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Jan 15, 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.6% 0.6% Duplication

@yhmtsai
Copy link
Member Author

yhmtsai commented Jan 15, 2020

@upsj i go for the option 1 but change others to _kernels in the new commit. ( Maybe use _impl or something else as the keywords said the main header is in the same folder)
In components, if the filename contain _kernels, its main header is in the same folder.
If not, its main header is the header with the same name in core, which is like the behaviour of other files in matrix or solver.

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! Your script caught some interesting (minor) errors that we would have not caught otherwise.
Some minor comments, but nothing serious.

cuda/test/solver/cg_kernels.cpp Outdated Show resolved Hide resolved
cuda/test/solver/fcg_kernels.cpp Outdated Show resolved Hide resolved
omp/test/solver/cg_kernels.cpp Outdated Show resolved Hide resolved
omp/test/solver/fcg_kernels.cpp Outdated Show resolved Hide resolved
reference/test/matrix/hybrid_kernels.cpp Outdated Show resolved Hide resolved
@yhmtsai yhmtsai mentioned this pull request Jan 27, 2020
2 tasks
@yhmtsai yhmtsai force-pushed the update_header branch 2 times, most recently from 4ad2d1f to 0baa0cd Compare March 10, 2020 14:08
@codecov
Copy link

codecov bot commented Mar 10, 2020

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #447      +/-   ##
===========================================
- Coverage    88.86%   88.75%   -0.11%     
===========================================
  Files          256      256              
  Lines        16484    16491       +7     
===========================================
- Hits         14648    14637      -11     
- Misses        1836     1854      +18
Impacted Files Coverage Δ
core/test/base/range.cpp 100% <ø> (ø) ⬆️
omp/test/preconditioner/jacobi_kernels.cpp 100% <ø> (ø) ⬆️
omp/test/matrix/ell_kernels.cpp 100% <ø> (ø) ⬆️
include/ginkgo/core/base/array.hpp 96.42% <ø> (ø) ⬆️
include/ginkgo/core/solver/gmres.hpp 100% <ø> (ø) ⬆️
reference/test/solver/lower_trs_kernels.cpp 100% <ø> (ø) ⬆️
core/test/stop/time.cpp 100% <ø> (ø) ⬆️
reference/test/stop/criterion_kernels.cpp 100% <ø> (ø) ⬆️
core/stop/residual_norm_reduction.cpp 81.25% <ø> (ø) ⬆️
include/ginkgo/core/log/record.hpp 91.48% <ø> (ø) ⬆️
... and 80 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 9435b45...7b45b6a. Read the comment docs.

@yhmtsai
Copy link
Member Author

yhmtsai commented Mar 12, 2020

It is updated.

add target format_header and format_header_all in CMake
format_header only process the changed files of branch
format_header process all code files.
They ignore build, examples, third_party, ginkgo.hpp

add // force-top: on and // force-top: off to keep some headers in the top (also before the main header).
I change the warning condition. If there are comments or #if block before codes, it gives warning.
The following is warning

Warning benchmark/utils/formats.hpp: sorting maybe is not correct
Warning core/base/extended_float.hpp: sorting maybe is not correct
Warning core/device_hooks/common_kernels.inc.cpp: sorting maybe is not correct
Warning include/ginkgo/core/base/abstract_factory.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/name_demangling.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/types.hpp: sorting maybe is not correct
Warning include/ginkgo/core/base/utils.hpp: sorting maybe is not correct
Warning reference/test/stop/combined.cpp: sorting maybe is not correct
Warning reference/test/stop/time.cpp: sorting maybe is not correct

core/test/solver/gmres.cpp Outdated Show resolved Hide resolved
cuda/test/base/exception_helpers.cu Show resolved Hide resolved
@yhmtsai yhmtsai force-pushed the update_header branch 2 times, most recently from 5b75129 to 073837c Compare March 17, 2020 01:14
@pratikvn
Copy link
Member

pratikvn commented Apr 1, 2020

Just a question, is this a blocking change ? I see that if GINKGO_DEVEL_TOOLS is on, then the format_header script is called. Currently, the user needs to call make format_header_all to format the files. Do we want to do something similar as for make format ? Or is the way it is now, enough ?

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! Only minor typos. LGTM!

dev_tools/scripts/format_header.sh Outdated Show resolved Hide resolved
dev_tools/scripts/format_header.sh Outdated Show resolved Hide resolved
dev_tools/scripts/format_header.sh Outdated Show resolved Hide resolved
dev_tools/scripts/format_header.sh Outdated Show resolved Hide resolved
@pratikvn pratikvn added the reg:build This is related to the build system. label Apr 1, 2020
@yhmtsai
Copy link
Member Author

yhmtsai commented Apr 2, 2020

@pratikvn No, it is not a blocking changes now.
Currently, I would prefer to leave it as an option.
we can try it for a while. If everything is expected, we can also add it like git-cmake-format.

@sonarcloud
Copy link

sonarcloud bot commented Apr 2, 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 1 Code Smell

No Coverage information No Coverage information
0.3% 0.3% Duplication

@yhmtsai yhmtsai 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 Apr 2, 2020
@yhmtsai yhmtsai merged commit 266a216 into develop Apr 2, 2020
@yhmtsai yhmtsai deleted the update_header branch April 2, 2020 11:29
@yhmtsai yhmtsai mentioned this pull request Apr 3, 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. reg:build This is related to the build system. reg:helper-scripts This issue/PR is related to the helper scripts mainly concerned with development of Ginkgo.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants