-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29638 from fwyzard/branch_lintBuildFile_Heterogen…
…eousCore Clean up BuildFiles under HeterogeneousCore/
- Loading branch information
Showing
13 changed files
with
153 additions
and
152 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,14 +1,13 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <use name="FWCore/Concurrency"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="CUDADataFormats/Common"/> | ||
| <use name="DataFormats/Provenance"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="cuda"/> | ||
|
|
||
| <export> | ||
| <use name="FWCore/Concurrency"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="CUDADataFormats/Common"/> | ||
| <use name="DataFormats/Provenance"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="cuda"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| </export> | ||
| </export> | ||
| </iftool> |
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,18 +1,20 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore"> | ||
| <use name="CUDADataFormats/Common"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/ParameterSetReader"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/TestProcessor"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="catch2"/> | ||
| <use name="cuda"/> | ||
| </bin> | ||
| <bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent"> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
| </bin> | ||
| <bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore"> | ||
| <use name="CUDADataFormats/Common"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/ParameterSetReader"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/TestProcessor"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="catch2"/> | ||
| <use name="cuda"/> | ||
| </bin> | ||
|
|
||
| <bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent"> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
| </bin> | ||
|
|
||
| </iftool> |
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,12 +1,11 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
|
|
||
| <export> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| </export> | ||
| </export> | ||
| </iftool> |
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,10 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp"> | ||
| <use name="cuda"/> | ||
| </bin> | ||
| <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp"> | ||
| <use name="cuda"/> | ||
| </bin> | ||
|
|
||
| <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp"> | ||
| <use name="cuda"/> | ||
| </bin> | ||
|
|
||
| <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp"> | ||
| <use name="cuda"/> | ||
| </bin> | ||
| </iftool> |
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,17 +1,18 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <use name="cuda"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="DataFormats/Provenance"/> | ||
| <use name="DataFormats/Streamer"/> | ||
| <use name="FWCore/Concurrency"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
| <use name="cuda"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="DataFormats/Provenance"/> | ||
| <use name="DataFormats/Streamer"/> | ||
| <use name="FWCore/Concurrency"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> | ||
|
|
||
| </iftool> |
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,7 +1,8 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <bin file="testCUDAService.cpp test_main.cpp" name="testCUDAService"> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="cuda"/> | ||
| <use name="catch2"/> | ||
| </bin> | ||
| <bin file="testCUDAService.cpp test_main.cpp" name="testCUDAService"> | ||
| <use name="HeterogeneousCore/CUDAServices"/> | ||
| <use name="cuda"/> | ||
| <use name="catch2"/> | ||
| </bin> | ||
|
|
||
| </iftool> |
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,5 +1,5 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="rootcore"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="rootcore"/> | ||
| </iftool> |
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,11 +1,12 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <library file="*.cc *.cu" name="HeterogeneousCoreCUDATestPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
| </library> | ||
| <library file="*.cc *.cu" name="HeterogeneousCoreCUDATestPlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/PluginManager"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
| <use name="cuda"/> | ||
| </library> | ||
|
|
||
| </iftool> |
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,9 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <bin file="test*.cc" name="testHeterogeneousCoreCUDATest"> | ||
| <use name="FWCore/TestProcessor"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="catch2"/> | ||
| </bin> | ||
| <bin file="test*.cc" name="testHeterogeneousCoreCUDATest"> | ||
| <use name="FWCore/TestProcessor"/> | ||
| <use name="HeterogeneousCore/CUDACore"/> | ||
| <use name="catch2"/> | ||
| </bin> | ||
|
|
||
| <test name="TestCUDATest" command="runtests.sh"/> | ||
| <test name="TestCUDATest" command="runtests.sh"/> | ||
| </iftool> |
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,11 +1,10 @@ | ||
| <iftool name="cuda-gcc-support"> | ||
| <use name="cub"/> | ||
| <use name="cuda"/> | ||
| <use name="eigen"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
|
|
||
| <export> | ||
| <use name="cub"/> | ||
| <use name="cuda"/> | ||
| <use name="eigen"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="FWCore/MessageLogger"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| </export> | ||
| </export> | ||
| </iftool> |
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,85 +1,83 @@ | ||
| <use name="HeterogeneousCore/CUDAUtilities"/> | ||
|
|
||
| <iftool name="cuda-gcc-support"> | ||
| <bin file="assert_t.cu" name="cudaAssert_t"> | ||
| <bin file="assert_t.cu" name="cudaAssert_t"> | ||
| </bin> | ||
|
|
||
| <bin file="assert_t.cu" name="cudaAssert_debug"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="assert_t.cu" name="cudaAssert_debug"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="test_SimpleVector.cu" name="test_SimpleVector"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="test_SimpleVector.cu" name="test_SimpleVector"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="cudastdAlgorithm_t.cpp"> | ||
| <bin file="cudastdAlgorithm_t.cpp"> | ||
| </bin> | ||
|
|
||
| <bin file="cudastdAlgorithm_t.cu" name="gpuCudastdAlgorithm_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="cudastdAlgorithm_t.cu" name="gpuCudastdAlgorithm_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="radixSort_t.cu" name="gpuRadixSort_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="radixSort_t.cu" name="gpuRadixSort_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="radixSort_t.cu" name="gpuRadixSort_debug"> | ||
| <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/> | ||
| <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/> | ||
| </bin> | ||
|
|
||
| <bin file="HistoContainer_t.cpp"> | ||
| <flags CXXFLAGS="-g"/> | ||
| </bin> | ||
| <bin file="radixSort_t.cu" name="gpuRadixSort_debug"> | ||
| <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/> | ||
| <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/> | ||
| </bin> | ||
|
|
||
| <bin file="HistoContainer_t.cu" name="gpuHistoContainer_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="HistoContainer_t.cpp"> | ||
| <flags CXXFLAGS="-g"/> | ||
| </bin> | ||
|
|
||
| <bin file="HistoContainer_t.cu" name="gpuHistoContainer_debug"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/> | ||
| <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/> | ||
| </bin> | ||
| <bin file="HistoContainer_t.cu" name="gpuHistoContainer_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="OneHistoContainer_t.cu" name="gpuOneHistoContainer_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="HistoContainer_t.cu" name="gpuHistoContainer_debug"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/> | ||
| <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/> | ||
| </bin> | ||
|
|
||
| <bin file="AtomicPairCounter_t.cu" name="gpuAtomicPairCounter_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="OneHistoContainer_t.cu" name="gpuOneHistoContainer_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="OneToManyAssoc_t.cu" name="gpuOneToManyAssoc_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="AtomicPairCounter_t.cu" name="gpuAtomicPairCounter_t"> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="OneToManyAssoc_t.cpp" name="cpuOneToManyAssoc_t"> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="OneToManyAssoc_t.cu" name="gpuOneToManyAssoc_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="prefixScan_t.cu" name="gpuPrefixScan_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="OneToManyAssoc_t.cpp" name="cpuOneToManyAssoc_t"> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="testCatch2Main.cpp,device_unique_ptr_t.cpp,host_unique_ptr_t.cpp,host_noncached_unique_ptr_t.cpp,copyAsync_t.cpp,memsetAsync_t.cpp" name="cudaMemUtils_t"> | ||
| <use name="catch2"/> | ||
| </bin> | ||
| <bin file="prefixScan_t.cu" name="gpuPrefixScan_t"> | ||
| <use name="cub"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="testCatch2Main.cpp,device_unique_ptr_t.cpp,host_unique_ptr_t.cpp,host_noncached_unique_ptr_t.cpp,copyAsync_t.cpp,memsetAsync_t.cpp" name="cudaMemUtils_t"> | ||
| <use name="catch2"/> | ||
| </bin> | ||
|
|
||
| <bin file="eigenSoA_t.cpp" name="cpuEigenSoA_t"> | ||
| <use name="eigen"/> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="eigenSoA_t.cpp" name="cpuEigenSoA_t"> | ||
| <use name="eigen"/> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| <bin file="eigenSoA_t.cu" name="gpuEigenSoA_t"> | ||
| <use name="eigen"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
| <bin file="eigenSoA_t.cu" name="gpuEigenSoA_t"> | ||
| <use name="eigen"/> | ||
| <flags CUDA_FLAGS="-g -DGPU_DEBUG"/> | ||
| <flags CXXFLAGS="-g -DGPU_DEBUG"/> | ||
| </bin> | ||
|
|
||
| </iftool> |
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
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 |
|---|---|---|
|
|
@@ -5,4 +5,5 @@ | |
| <use name="HeterogeneousCore/SonicCore"/> | ||
| <use name="DataFormats/TestObjects"/> | ||
| </library> | ||
|
|
||
| </environment> | ||