Cleanup defines, includes, file names, and debug messages #122
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Other cleanup (change __inline__ to inline, fix include guards, whitespaces, etc.).
Move header files referenced from outside their directory to the interface/ directory. Update the #include guards accordingly.
Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Remove a debug printf message.
makortel
reviewed
Aug 9, 2018
| @@ -1,25 +1,19 @@ | |||
| #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h" | |||
There was a problem hiding this comment.
Did you intend to reformat also the irrelevant (for us) files?
There was a problem hiding this comment.
I needed to update them to reflect the new include paths, so I took a stab at that as well.
There was a problem hiding this comment.
Ok. Would be worth of the effort to propagate those back to CMSSW master?
There was a problem hiding this comment.
Yes, I usually try to make a PR for the CMSSW master whenever I rebase our branch on a new release (and 10.2.2 just came out...)
| @@ -1,17 +1,13 @@ | |||
| #ifndef RECOPIXELVERTEXING_PIXELTRACKFITTING_RIEMANNFIT_H | |||
| #define RECOPIXELVERTEXING_PIXELTRACKFITTING_RIEMANNFIT_H | |||
|
|
|||
There was a problem hiding this comment.
Should this include guard be renamed as well? (Doesn't really matter to me, but I saw other similar guards renamed)
fwyzard
commented
Aug 9, 2018
| #include "RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromCircle.h" | ||
| #include "RecoPixelVertexing/PixelTriplets/src/CellularAutomaton.h" |
There was a problem hiding this comment.
@makortel , the internal CA headers were already being included outside of the library itself, so they should live in interface.
There was a problem hiding this comment.
In patatrack, yes, but not in CMSSW master.
Validation summaryReference release CMSSW_10_2_1 at d00b7b4
|
|
It looks like the HEAD of the CMSSW_10_2_X_Patatrack branch works (it did not before), while this PR breaks it (it did not in my local tests). I am now rather puzzled... |
|
...I am tempted to ascribe it to the partial irreproducibility of the link process (because of the current build rules), that sometimes triggers the |
Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Remove a debug printf message.
fwyzard
added a commit
to fwyzard/cmssw
that referenced
this pull request
Aug 14, 2018
Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
fwyzard
added a commit
to fwyzard/cmssw
that referenced
this pull request
Aug 14, 2018
Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
fwyzard
added a commit
to fwyzard/cmssw
that referenced
this pull request
Aug 14, 2018
Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
fwyzard
added a commit
to fwyzard/cmssw
that referenced
this pull request
Aug 15, 2018
Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
fwyzard
added a commit
to fwyzard/cmssw
that referenced
this pull request
Aug 15, 2018
Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
bkilian15
pushed a commit
to bkilian15/cmssw
that referenced
this pull request
May 15, 2019
…TauRecoMiniAOD_ResolveConflicts Tau RECO on MiniAOD: A fix and addressed review comments
fwyzard
added a commit
that referenced
this pull request
Oct 8, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Oct 20, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Oct 20, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Oct 23, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Nov 6, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Nov 6, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Nov 16, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Nov 27, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
pushed a commit
that referenced
this pull request
Dec 26, 2020
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Jan 15, 2021
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
fwyzard
added a commit
that referenced
this pull request
Apr 1, 2021
Do not #ifdef on __NVCC__: to protect CUDA-aware code sections, check if the __CUDACC__ symbol is defined. The symbol __NVCC__ is defined when building with nvcc, but not when building CUDA code with clang. Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly. Include <cuda_runtime.h> instead of <cuda.h> to handle the CUDA attributes in non-CUDA compilations. Rename PixelTrackReconstructionGPU_impl.cu to PixelTrackReconstructionGPU.cu. Other cleanup: #defines, debug messages, change __inline__ to inline, fix include guards, whitespaces, etc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not #ifdef on
__NVCC__: to protect CUDA-aware code sections, check if the__CUDACC__symbol is defined. The symbol__NVCC__is defined when building with nvcc, but not when building CUDA code with clang.Move header files referenced from outside their directory to the interface/ directory, and update the include guards accordingly.
Include
<cuda_runtime.h>instead of<cuda.h>to handle the CUDA attributes in non-CUDA compilations.Rename
PixelTrackReconstructionGPU_impl.cutoPixelTrackReconstructionGPU.cu.Other cleanup: #defines, debug messages, change
__inline__toinline, fix include guards, whitespaces, etc.