modify to rename WITH-CUDA-CONTEXT macro to WITH-CUDA macro to place it on top of the layer in which CUDA context is handled