Modify pipeline test using barrier to use ABI v3 temporarily

NVIDIA · Jul 27, 2021 · 050663e · 050663e
1 parent 3f9d37c
commit 050663e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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