Skip to content

Commit 42610fe

Browse files
committed
GH-47677: [C++][GPU] Allow building with CUDA 13
1 parent 39c865e commit 42610fe

3 files changed

Lines changed: 26 additions & 14 deletions

File tree

compose.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -581,12 +581,16 @@ services:
581581
environment:
582582
<<: [*common, *ccache, *sccache, *cpp]
583583
ARROW_BUILD_UTILITIES: "OFF"
584+
ARROW_ACERO: "OFF"
585+
ARROW_AZURE: "OFF"
584586
ARROW_COMPUTE: "OFF"
585587
ARROW_CSV: "OFF"
586588
ARROW_CUDA: "ON"
587589
ARROW_DATASET: "OFF"
588590
ARROW_ENABLE_TIMING_TESTS: "OFF"
589591
ARROW_FILESYSTEM: "OFF"
592+
ARROW_FLIGHT: "OFF"
593+
ARROW_FLIGHT_SQL: "OFF"
590594
ARROW_GANDIVA: "OFF"
591595
ARROW_GCS: "OFF"
592596
ARROW_HDFS: "OFF"
@@ -999,19 +1003,20 @@ services:
9991003
environment:
10001004
<<: [*common, *ccache, *sccache]
10011005
ARROW_BUILD_UTILITIES: "OFF"
1002-
ARROW_COMPUTE: "ON"
1003-
ARROW_CSV: "ON"
1006+
ARROW_ACERO: "OFF"
1007+
ARROW_AZURE: "OFF"
10041008
ARROW_CUDA: "ON"
1005-
ARROW_DATASET: "ON"
1009+
ARROW_DATASET: "OFF"
10061010
ARROW_ENABLE_TIMING_TESTS: "OFF"
1007-
ARROW_FILESYSTEM: "ON"
1011+
ARROW_FILESYSTEM: "OFF"
1012+
ARROW_FLIGHT: "OFF"
1013+
ARROW_FLIGHT_SQL: "OFF"
10081014
ARROW_GANDIVA: "OFF"
10091015
ARROW_GCS: "OFF"
1010-
ARROW_HDFS: "ON"
1011-
ARROW_JEMALLOC: "ON"
1012-
ARROW_JSON: "ON"
1016+
ARROW_HDFS: "OFF"
1017+
ARROW_JEMALLOC: "OFF"
10131018
ARROW_ORC: "OFF"
1014-
ARROW_PARQUET: "ON"
1019+
ARROW_PARQUET: "OFF"
10151020
ARROW_S3: "OFF"
10161021
ARROW_SUBSTRAIT: "OFF"
10171022
ARROW_WITH_OPENTELEMETRY: "OFF"

cpp/src/arrow/gpu/cuda_test.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ class TestCudaBase : public ::testing::Test {
9191

9292
Result<CUcontext> NonPrimaryRawContext() {
9393
CUcontext ctx;
94+
#if CUDA_VERSION >= 13000
95+
RETURN_NOT_OK(StatusFromCuda(cuCtxCreate_v4(&ctx, /*ctxCreateParams=*/nullptr,
96+
/*flags=*/0, device_->handle())));
97+
#else
9498
RETURN_NOT_OK(StatusFromCuda(cuCtxCreate(&ctx, /*flags=*/0, device_->handle())));
99+
#endif
95100
non_primary_contexts_.push_back(ctx);
96101
return ctx;
97102
}

dev/tasks/tasks.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -833,23 +833,25 @@ tasks:
833833

834834
############################## CUDA tests #################################
835835

836-
test-cuda-cpp-ubuntu-22.04-cuda-11.7.1:
836+
{% for ubuntu, cuda in [("22.04", "11.7.1"), ("24.04", "13.0.2")] %}
837+
test-cuda-cpp-ubuntu-{{ ubuntu }}-cuda-{{ cuda }}:
837838
ci: github
838839
template: docker-tests/github.cuda.yml
839840
params:
840841
env:
841-
CUDA: 11.7.1
842-
UBUNTU: 22.04
842+
CUDA: {{ cuda }}
843+
UBUNTU: {{ ubuntu }}
843844
image: ubuntu-cuda-cpp
844845

845-
test-cuda-python-ubuntu-22.04-cuda-11.7.1:
846+
test-cuda-python-ubuntu-{{ ubuntu }}-cuda-{{ cuda }}:
846847
ci: github
847848
template: docker-tests/github.cuda.yml
848849
params:
849850
env:
850-
CUDA: 11.7.1
851-
UBUNTU: 22.04
851+
CUDA: {{ cuda }}
852+
UBUNTU: {{ ubuntu }}
852853
image: ubuntu-cuda-python
854+
{% endfor %}
853855

854856
############################## Fuzz tests #################################
855857

0 commit comments

Comments
 (0)