-
Notifications
You must be signed in to change notification settings - Fork 35
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
Update to the code base from the Patatrack CMSSW release #120
Update to the code base from the Patatrack CMSSW release #120
Conversation
56003a9
to
7de7cee
Compare
7de7cee
to
5b720d5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also update the README in https://github.com/cms-patatrack/pixeltrack-standalone#cudadev to point to CMSSW_11_2_0_pre8_Patatrack (which I presume to be the version where you picked the code based on the branch name)
@@ -38,15 +42,13 @@ export CUDA_LDFLAGS := -L$(CUDA_BASE)/lib64 -lcudart -lcudadevrt | |||
export CUDA_NVCC := $(CUDA_BASE)/bin/nvcc | |||
define CUFLAGS_template | |||
$(2)NVCC_FLAGS := $$(foreach ARCH,$(1),-gencode arch=compute_$$(ARCH),code=sm_$$(ARCH)) -Wno-deprecated-gpu-targets -Xcudafe --diag_suppress=esa_on_defaulted_function_ignored --expt-relaxed-constexpr --expt-extended-lambda --generate-line-info --source-in-ptx --cudart=shared | |||
$(2)NVCC_COMMON := -std=c++14 -O3 $$($(2)NVCC_FLAGS) -ccbin $(CXX) --compiler-options '$(HOST_CXXFLAGS) $(USER_CXXFLAGS)' | |||
$(2)NVCC_COMMON := -std=c++17 -O3 $$($(2)NVCC_FLAGS) -ccbin $(CXX) --compiler-options '$(HOST_CXXFLAGS) $(USER_CXXFLAGS)' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would bump the minimum CUDA requirement to 11, right? (ok, I see you updated the README). I need to understand the impact on Kokkos.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems that Kokkos 3.1.01 works fine with the combination of CUDA 11 and -std=c++17
here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which leaves the (builds of) cuda
and cudauvm
programs to break until they have been migrated to the changes. Maybe we can live a short period of time with them broken.
@@ -135,6 +138,8 @@ void go() { | |||
} | |||
|
|||
int main() { | |||
cms::cudatest::requireDevices(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does this test require devices? It is supposed to run on CPU.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point.
It's like this in CMSSW, but I agree the requirement should be removed.
@@ -0,0 +1,56 @@ | |||
#include "CUDADataFormats/TrackingRecHit2DCUDA.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Future note: this file is from cuda
instead of CMSSW
@@ -0,0 +1,75 @@ | |||
#include "CUDADataFormats/TrajectoryStateSoA.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Future note: this file is from cuda
instead of CMSSW.
#include <iostream> | ||
#include <sstream> | ||
|
||
#include "plugin-Validation/SimpleAtomicHisto.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For future reference, this is from cuda
instead of CMSSW
@@ -0,0 +1,2 @@ | |||
#define USE_BL | |||
#include "testRiemannFit.cc" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For future reference: this file is from cuda
instead of CMSSW
5b720d5
to
ccba578
Compare
Highlights: - remove the dependency on the CUB external - reduce caching allocator memory usage - update CUDA to version 11.0 and C++17 - update the code base from CMSSW 11.2.0-pre8
ccba578
to
eda7d59
Compare
I've tried to separate the files from |
(I'm still running tests before hitting the merge button) |
The
Updating Alpaka to 0.5.0 changed the error to
which can be worked around. (FYI @ghugo83) I think this PR can move forward now, and then I/we'll address the issues to bring |
…g/running problems with CUDA11
Highlights: