forked from cms-sw/cmssw
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
After cms-sw/cmsdist#3786 the default CUDA flags are set to `-O3 -std=c++14 --expt-relaxed-constexpr --expt-extended-lambda` . Since `nvcc` does not support multiple `-On` options on the command line, remove them from the `CUDA_FLAGS` set in the BuildFile.xml .
- Loading branch information
Showing
5 changed files
with
64 additions
and
72 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,29 @@ | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="cppunit"/> | ||
| <use name="boost"/> | ||
| <bin file="FrameTransformTest.cpp"> | ||
| <use name="boost"/> | ||
| <use name="cppunit"/> | ||
| <use name="DataFormats/GeometrySurface"/> | ||
|
|
||
| <bin file="FrameTransformTest.cpp"> | ||
| </bin> | ||
| <bin file="OldFrameTransformTest.cpp"> | ||
| <bin file="OldFrameTransformTest.cpp"> | ||
| </bin> | ||
|
|
||
| <bin file="PrecisionMixSurface.cpp"> | ||
| <bin file="PrecisionMixSurface.cpp"> | ||
| </bin> | ||
| <bin file="referencecounted_t.cpp"> | ||
| <bin file="referencecounted_t.cpp"> | ||
| </bin> | ||
| <bin file="testGeometricSort.cpp" name="testGeometricSort"> | ||
| <bin file="testGeometricSort.cpp" name="testGeometricSort"> | ||
| </bin> | ||
| <bin file="Bounds_t.cpp"> | ||
| <bin file="Bounds_t.cpp"> | ||
| </bin> | ||
|
|
||
|
|
||
| <use name="cuda"/> | ||
| <use name="cuda-api-wrappers"/> | ||
| <bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTest"> | ||
| <use name="cuda"/> | ||
| <use name="cuda-api-wrappers"/> | ||
| <flags CXXFLAGS="-g"/> | ||
| <flags CUDA_FLAGS="-O3 --expt-relaxed-constexpr"/> | ||
| </bin> | ||
|
|
||
|
|
||
| <bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTestRep"> | ||
| <flags CUDA_FLAGS="-O3 --expt-relaxed-constexpr -fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/> | ||
| <use name="cuda"/> | ||
| <use name="cuda-api-wrappers"/> | ||
| <flags CXXFLAGS="-ffp-contract=off"/> | ||
| <flags CUDA_FLAGS="-fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/> | ||
| </bin> | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| <use name="EventFilter/SiPixelRawToDigi"/> | ||
| <library file="SiPixelDigiToRaw.cc SiPixelRawToDigi.cc SealModule.cc" name="EventFilterSiPixelRawToDigiPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="EventFilter/SiPixelRawToDigi"/> | ||
| <library file="SiPixelDigiToRaw.cc SiPixelRawToDigi.cc SealModule.cc" name="EventFilterSiPixelRawToDigiPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
| <library file="SiPixelRawToDigiGPU.cc SiPixelFedCablingMapGPU.cc RawToDigiGPU.cu" name="EventFilterSiPixelRawToDigiGPUPlugins"> | ||
| <use name="cuda"/> | ||
| <use name="CalibTracker/SiPixelESProducers"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <flags CUDA_FLAGS="-O2 --expt-relaxed-constexpr"/> | ||
| <library file="SiPixelRawToDigiGPU.cc SiPixelFedCablingMapGPU.cc RawToDigiGPU.cu" name="EventFilterSiPixelRawToDigiGPUPlugins"> | ||
| <use name="cuda"/> | ||
| <use name="CalibTracker/SiPixelESProducers"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| <bin file="test_GPUSimpleVector.cu" name="test_GPUSimpleVector"> | ||
| <flags CUDA_FLAGS="-std=c++14"/> | ||
| <bin file="test_GPUSimpleVector.cu" name="test_GPUSimpleVector"> | ||
| </bin> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,39 @@ | ||
| <use name="cuda"/> | ||
| <use name="cuda-api-wrappers"/> | ||
| <bin file="gpuClustering.cu" name="gpuClustering_t"> | ||
| <flags CXXFLAGS="-g"/> | ||
| <flags CUDA_FLAGS="-O3"/> | ||
| </bin> | ||
| <use name="boost"/> | ||
| <use name="clhep"/> | ||
| <use name="root"/> | ||
| <use name="CommonTools/UtilAlgos"/> | ||
| <use name="CondFormats/L1TObjects"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="DataFormats/DetId"/> | ||
| <use name="DataFormats/L1GlobalTrigger"/> | ||
| <use name="DataFormats/Luminosity"/> | ||
| <use name="DataFormats/VertexReco"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="Geometry/Records"/> | ||
| <use name="Geometry/TrackerGeometryBuilder"/> | ||
| <use name="L1Trigger/GlobalTriggerAnalyzer"/> | ||
| <use name="RecoLuminosity/LumiProducer"/> | ||
| <use name="TrackingTools/TrackFitters"/> | ||
| <use name="TrackingTools/TrajectoryState"/> | ||
| <use name="TrackingTools/TransientTrack"/> | ||
|
|
||
| <use name="Geometry/TrackerGeometryBuilder"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="clhep"/> | ||
| <use name="boost"/> | ||
| <use name="root"/> | ||
| <use name="DataFormats/L1GlobalTrigger"/> | ||
| <use name="CondFormats/L1TObjects"/> | ||
| <use name="L1Trigger/GlobalTriggerAnalyzer"/> | ||
| <use name="CommonTools/UtilAlgos"/> | ||
| <use name="Geometry/Records"/> | ||
| <use name="DataFormats/DetId"/> | ||
| # for tracks | ||
| <use name="TrackingTools/TrajectoryState"/> | ||
| <use name="TrackingTools/TrackFitters"/> | ||
| <use name="TrackingTools/TransientTrack"/> | ||
| <use name="DataFormats/VertexReco"/> | ||
| # for lumi | ||
| <use name="DataFormats/Luminosity"/> | ||
| <use name="RecoLuminosity/LumiProducer"/> | ||
| # | ||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="ReadPixClusters.cc" name="ReadPixClusters"> | ||
| <library file="ReadPixClusters.cc" name="ReadPixClusters"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="TestClusters.cc" name="TestClusters"> | ||
| <library file="TestClusters.cc" name="TestClusters"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="TestWithTracks.cc" name="TestWithTracks"> | ||
| <library file="TestWithTracks.cc" name="TestWithTracks"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="Triplet.cc" name="Triplet"> | ||
| <library file="Triplet.cc" name="Triplet"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
|
|
||
| <bin file="gpuClustering.cu" name="gpuClustering_t"> | ||
| <use name="cuda"/> | ||
| <use name="cuda-api-wrappers"/> | ||
| <flags CXXFLAGS="-g"/> | ||
| </bin> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| <use name="RecoLocalTracker/ClusterParameterEstimator"/> | ||
| <use name="RecoLocalTracker/Records"/> | ||
| <use name="RecoLocalTracker/SiPixelRecHits"/> | ||
| <use name="DataFormats/TrackerCommon"/> | ||
| <library file="*.cc *.cu" name="RecoLocalTrackerSiPixelRecHitsPlugins"> | ||
| <use name="cuda"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <flags CUDA_FLAGS="-O2 --expt-relaxed-constexpr"/> | ||
| <use name="DataFormats/TrackerCommon"/> | ||
| <use name="RecoLocalTracker/ClusterParameterEstimator"/> | ||
| <use name="RecoLocalTracker/Records"/> | ||
| <use name="RecoLocalTracker/SiPixelRecHits"/> | ||
| <library file="*.cc *.cu" name="RecoLocalTrackerSiPixelRecHitsPlugins"> | ||
| <use name="cuda"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |