From 050663eef339854879a8cf4d925c4b05844ec2d1 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Mon, 26 Jul 2021 19:07:00 -0700 Subject: [PATCH] Modify pipeline test using barrier to use ABI v3 temporarily --- .upstream-tests/test/cuda/pipeline_arrive_on.pass.cpp | 3 +++ include/cuda/std/detail/__config | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.upstream-tests/test/cuda/pipeline_arrive_on.pass.cpp b/.upstream-tests/test/cuda/pipeline_arrive_on.pass.cpp index 9a9a4e257e..4fab0fdf2b 100644 --- a/.upstream-tests/test/cuda/pipeline_arrive_on.pass.cpp +++ b/.upstream-tests/test/cuda/pipeline_arrive_on.pass.cpp @@ -9,6 +9,9 @@ // UNSUPPORTED: pre-sm-70 +// Remove after bump to version 4 +#define _LIBCUDACXX_CUDA_ABI_VERSION 3 + #pragma nv_diag_suppress static_var_with_dynamic_init #pragma nv_diag_suppress declared_but_not_referenced diff --git a/include/cuda/std/detail/__config b/include/cuda/std/detail/__config index a753d3e2a9..4a2b5a1d1d 100644 --- a/include/cuda/std/detail/__config +++ b/include/cuda/std/detail/__config @@ -121,9 +121,9 @@ #endif #ifdef _LIBCUDACXX_PIPELINE_ASSUMED_ABI_VERSION -#if _LIBCUDACXX_PIPELINE_ASSUMED_ABI_VERSION != _LIBCUDACXX_CUDA_ABI_VERSION -#error cuda_pipeline.h has assumed a different libcu++ ABI version than provided by this library. To fix this, please include a libcu++ header before including cuda_pipeline.h, or upgrade to a version of the toolkit this version of libcu++ shipped in. -#endif +# if _LIBCUDACXX_PIPELINE_ASSUMED_ABI_VERSION != _LIBCUDACXX_CUDA_ABI_VERSION +# error cuda_pipeline.h has assumed a different libcu++ ABI version than provided by this library. To fix this, please include a libcu++ header before including cuda_pipeline.h, or upgrade to a version of the toolkit this version of libcu++ shipped in. +# endif #endif #ifndef _LIBCUDACXX_CUDA_ABI_NAMESPACE