From 06fc8f56beb7f6311e4eef54e0eb6ef57efb3d2c Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 6 Oct 2023 12:06:26 -0400 Subject: [PATCH 1/3] Upgrade CUDA to 11.2.2 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 014bad3fe2a..a551e2120a6 100644 --- a/.env +++ b/.env @@ -54,7 +54,7 @@ UBUNTU=20.04 # Default versions for various dependencies CLANG_TOOLS=14 -CUDA=11.0.3 +CUDA=11.2.2 DASK=latest DOTNET=7.0 GCC_VERSION="" From 834b29e835d62dbeae8fd1b41224347372f867e7 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 6 Oct 2023 14:38:05 -0400 Subject: [PATCH 2/3] Use cuda enum --- cpp/src/arrow/gpu/cuda_context.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cpp/src/arrow/gpu/cuda_context.cc b/cpp/src/arrow/gpu/cuda_context.cc index 81542d339bd..1f0102ebcb9 100644 --- a/cpp/src/arrow/gpu/cuda_context.cc +++ b/cpp/src/arrow/gpu/cuda_context.cc @@ -322,9 +322,8 @@ Status CudaDevice::Stream::WaitEvent(const Device::SyncEvent& event) { } ContextSaver set_temporary(reinterpret_cast(context_.get()->handle())); - // we are currently building with CUDA toolkit 11.0.3 which doesn't have enum - // values for the flags yet. The "flags" param *must* be 0 for now. - CU_RETURN_NOT_OK("cuStreamWaitEvent", cuStreamWaitEvent(value(), cu_event, 0)); + CU_RETURN_NOT_OK("cuStreamWaitEvent", + cuStreamWaitEvent(value(), cu_event, CU_EVENT_WAIT_DEFAULT)); return Status::OK(); } From 14b7cfcff89983a2c86f34a0aa7cf948c086aaa6 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 6 Oct 2023 17:50:52 -0400 Subject: [PATCH 3/3] Revert "Use cuda enum" This reverts commit 834b29e835d62dbeae8fd1b41224347372f867e7. --- cpp/src/arrow/gpu/cuda_context.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cpp/src/arrow/gpu/cuda_context.cc b/cpp/src/arrow/gpu/cuda_context.cc index 1f0102ebcb9..81542d339bd 100644 --- a/cpp/src/arrow/gpu/cuda_context.cc +++ b/cpp/src/arrow/gpu/cuda_context.cc @@ -322,8 +322,9 @@ Status CudaDevice::Stream::WaitEvent(const Device::SyncEvent& event) { } ContextSaver set_temporary(reinterpret_cast(context_.get()->handle())); - CU_RETURN_NOT_OK("cuStreamWaitEvent", - cuStreamWaitEvent(value(), cu_event, CU_EVENT_WAIT_DEFAULT)); + // we are currently building with CUDA toolkit 11.0.3 which doesn't have enum + // values for the flags yet. The "flags" param *must* be 0 for now. + CU_RETURN_NOT_OK("cuStreamWaitEvent", cuStreamWaitEvent(value(), cu_event, 0)); return Status::OK(); }