Skip to content

Patatrack integration - trivial changes (1/N) #29109

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.

Sign up for GitHub

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

Merged
cmsbuild merged 2 commits into from
Mar 9, 2020
Merged

Patatrack integration - trivial changes (1/N) #29109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fffffde
Update test following #28537
makortel Mar 5, 2020
759e540
Trivial changes
fwyzard Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion DataFormats/DetId/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<iftool name="cuda-gcc-support">
<bin name="test_detid" file="test_detid.cu">
<use name="DataFormats/DetId"/>
<use name="cuda"/>
<use name="DataFormats/DetId"/>
<use name="HeterogeneousCore/CUDAUtilities"/>
</bin>
</iftool>
15 changes: 7 additions & 8 deletions DataFormats/DetId/test/test_detid.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include <cuda_runtime.h>
#include <cassert>
#include <iostream>

#include <cuda.h>
#include <cuda_runtime.h>

#include <iostream>
#include <assert.h>
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "HeterogeneousCore/CUDAUtilities/interface/requireDevices.h"

__global__ void test_gen_detid(DetId* id, uint32_t const rawid) {
DetId did{rawid};
Expand All @@ -27,11 +29,8 @@ void test_detid() {
}

int main(int argc, char** argv) {
int nDevices;
cudaGetDeviceCount(&nDevices);
std::cout << "nDevices = " << nDevices << std::endl;
cms::cudatest::requireDevices();

// test det id functionality
if (nDevices > 0)
test_detid();
test_detid();
}
4 changes: 2 additions & 2 deletions HeterogeneousCore/CUDACore/interface/ESProduct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef HeterogeneousCore_CUDACore_CUDAESProduct_h
#define HeterogeneousCore_CUDACore_CUDAESProduct_h
#ifndef HeterogeneousCore_CUDACore_ESProduct_h
#define HeterogeneousCore_CUDACore_ESProduct_h

#include <atomic>
#include <cassert>
Expand Down
Empty file modified HeterogeneousCore/CUDAServices/scripts/cmsCudaRebuild.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified HeterogeneousCore/CUDAServices/scripts/cmsCudaSetup.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified HeterogeneousCore/CUDAServices/scripts/cudaPreallocate.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified HeterogeneousCore/CUDAServices/scripts/nvprof-remote
100644 → 100755
View file
Open in desktop
Empty file.