Various 10.1 fixes, mostly relating to compiler compatibility.

* Fix broken Thrust smart pointer interoperability with `nullptr`. * Add `explicit operator bool` to Thrust smart pointers when using C++11 for `std::unique_ptr` interoperability. * Disable -Wnoexcept-type for Clang 6. * `thrust_nightly.pl`: remove erroneous counting of disabled tests as failures. * Remove some incorrect `return std::move(...)`s that trigger warning failures. * Various other bug fixes. Bug 2379510 Bug 2379513 Bug 2463967
NVIDIA · Dec 18, 2018 · 395f62b · 395f62b
1 parent 2f79d31
commit 395f62b
Show file tree

Hide file tree

Showing 38 changed files with 242 additions and 111 deletions.
diff --git a/internal/build/common_warnings.mk b/internal/build/common_warnings.mk
@@ -41,7 +41,7 @@ ifeq ($(OS),$(filter $(OS),Linux Darwin))
         # on older versions of Clang.
         CUDACC_FLAGS += -Xcompiler "-Wno-unneeded-internal-declaration"
 
-        ifeq ($(shell if test $(CLANG_VERSION) -ge 70; then echo true; fi),true)
+        ifeq ($(shell if test $(CLANG_VERSION) -ge 60; then echo true; fi),true)
           # Clang complains about name mangling changes due to `noexcept`
           # becoming part of the type system; we don't care.
           CUDACC_FLAGS += -Xcompiler "-Wno-noexcept-type"

diff --git a/internal/build/warningstester_create_uber_header.py b/internal/build/warningstester_create_uber_header.py
@@ -46,6 +46,7 @@ def find_headers(base_dir, rel_dir, exclude = ['\B']):
     print('#error no include files found\n')
 
 print('#define THRUST_CPP11_REQUIRED_NO_ERROR')
+print('#define THRUST_MODERN_GCC_REQUIRED_NO_ERROR')
 for h in headers:
     print('#include <' + h + '>')
 

diff --git a/internal/test/thrust_nightly.pl b/internal/test/thrust_nightly.pl
@@ -468,7 +468,6 @@ sub run_unit_tests {
                     printf("&&&& FAILED $test\n");
                     printf("#### WALLTIME $test %.2f [s]\n", $elapsed);
                 } elsif ($known_fail == 0 and $pass == 0) {
-                    $errors = $errors + 1;
                     printf("#### DISABLED $test returned 0 and had no failures, known failures, errors or passes.\n");
                     printf("&&&& PASSED $test\n");
                     printf("#### WALLTIME $test %.2f [s]\n", $elapsed);

diff --git a/testing/async_copy.cu b/testing/async_copy.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -338,5 +338,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 // TODO: H->D copy, then dependent D->H copy (round trip).
 // Can't do this today because we can't do cross-system with explicit policies.
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/async_for_each.cu b/testing/async_for_each.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 
@@ -95,5 +95,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 , test_async_for_each_policy
 );
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/async_reduce.cu b/testing/async_reduce.cu
@@ -2,7 +2,7 @@
 
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -1132,5 +1132,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(
 
 // TODO: when_all from reductions.
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/async_reduce_into.cu b/testing/async_reduce_into.cu
@@ -2,7 +2,7 @@
 
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -621,5 +621,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 , test_async_reduce_into_policy_allocator_on_init_custom_plus
 );
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/async_sort.cu b/testing/async_sort.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 
@@ -323,5 +323,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 
 // TODO: Test future return type.
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/async_transform.cu b/testing/async_transform.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -529,5 +529,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/device_ptr.cu b/testing/device_ptr.cu
@@ -91,3 +91,31 @@ void TestRawPointerCast(void)
 }
 DECLARE_VECTOR_UNITTEST(TestRawPointerCast);
 
+
+#if THRUST_CPP_DIALECT >= 2011
+template<typename T>
+void TestDevicePointerNullptrCompatibility()
+{
+    thrust::device_ptr<T> p0(nullptr);
+
+    ASSERT_EQUAL_QUIET(nullptr, p0);
+    ASSERT_EQUAL_QUIET(p0, nullptr);
+
+    p0 = nullptr;
+
+    ASSERT_EQUAL_QUIET(nullptr, p0);
+    ASSERT_EQUAL_QUIET(p0, nullptr);
+}
+DECLARE_GENERIC_UNITTEST(TestDevicePointerNullptrCompatibility);
+
+template<typename T>
+void TestDevicePointerBoolConversion()
+{
+    thrust::device_ptr<T> p0(nullptr);
+    auto const b = bool(p0);
+
+    ASSERT_EQUAL_QUIET(false, b);
+}
+DECLARE_GENERIC_UNITTEST(TestDevicePointerBoolConversion);
+#endif
+
diff --git a/testing/event.cu b/testing/event.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -178,5 +178,5 @@ DECLARE_UNITTEST(test_event_when_all);
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/testing/future.cu b/testing/future.cu
@@ -1,6 +1,6 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <unittest/unittest.h>
 #include <unittest/util_async.h>
@@ -253,5 +253,5 @@ DECLARE_GENERIC_UNITTEST_WITH_TYPES(
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/thrust/async/copy.h b/thrust/async/copy.h
@@ -22,8 +22,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
@@ -141,4 +142,5 @@ THRUST_INLINE_CONSTANT copy_detail::copy_fn copy{};
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
+
diff --git a/thrust/async/for_each.h b/thrust/async/for_each.h
@@ -22,8 +22,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
@@ -114,5 +115,5 @@ THRUST_INLINE_CONSTANT for_each_detail::for_each_fn for_each{};
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/thrust/async/reduce.h b/thrust/async/reduce.h
@@ -22,8 +22,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
@@ -389,5 +390,5 @@ THRUST_INLINE_CONSTANT reduce_into_detail::reduce_into_fn reduce_into{};
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/thrust/async/sort.h b/thrust/async/sort.h
@@ -22,8 +22,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
@@ -257,5 +258,5 @@ THRUST_INLINE_CONSTANT sort_detail::sort_fn sort{};
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/thrust/async/transform.h b/thrust/async/transform.h
@@ -22,8 +22,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
@@ -129,5 +130,5 @@ THRUST_INLINE_CONSTANT transform_detail::transform_fn transform{};
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
 
diff --git a/thrust/detail/config/compiler.h b/thrust/detail/config/compiler.h
@@ -43,6 +43,11 @@
 #elif defined(__GNUC__)
 #define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_GCC
 #define THRUST_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if (THRUST_GCC_VERSION >= 50000)
+#define THRUST_MODERN_GCC
+#else
+#define THRUST_LEGACY_GCC
+#endif
 #else
 #define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_UNKNOWN
 #endif // THRUST_HOST_COMPILER
@@ -72,7 +77,7 @@
 #define THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE THRUST_FALSE
 #endif // _OPENMP
 
-// Disable specific MSVC warnings.
+
 #if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && !defined(__CUDA_ARCH__)
   #define THRUST_DISABLE_MSVC_WARNING_BEGIN(x)                                \
     __pragma(warning(push))                                                   \

diff --git a/thrust/detail/event_error.h b/thrust/detail/event_error.h
@@ -21,8 +21,9 @@
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/cpp11_required.h>
+#include <thrust/detail/modern_gcc_required.h>
 
-#if THRUST_CPP_DIALECT >= 2011
+#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/error_code.h>
@@ -157,4 +158,5 @@ inline bool operator<(event_error const& lhs, event_error const& rhs) noexcept
 
 THRUST_END_NS
 
-#endif // THRUST_CPP_DIALECT >= 2011
+#endif
+
diff --git a/thrust/detail/execute_with_dependencies.h b/thrust/detail/execute_with_dependencies.h
@@ -259,13 +259,6 @@ extract_dependencies(System &&)
 {
     return std::tuple<>{};
 }
-template<typename System>
-__host__
-std::tuple<>
-extract_dependencies(System &)
-{
-    return std::tuple<>{};
-}
 
 } // end detail
 } // end thrust

diff --git a/thrust/detail/modern_gcc_required.h b/thrust/detail/modern_gcc_required.h
@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config/cpp_dialect.h>
+
+#ifndef THRUST_MODERN_GCC_REQUIRED_NO_ERROR
+#  if defined(THRUST_GCC_VERSION) && !defined(THRUST_MODERN_GCC)
+#    error GCC 5 or later is required for this Thrust feature; please upgrade your compiler.
+#  endif
+#endif
+
diff --git a/thrust/detail/pointer.h b/thrust/detail/pointer.h
@@ -204,6 +204,13 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 
     __host__ __device__
     Element *get() const;
+
+    #if THRUST_CPP_DIALECT >= 2011
+    // NOTE: This is needed so that Thrust smart pointers can be used in
+    // `std::unique_ptr`.
+    __host__ __device__
+    explicit operator bool() const;
+    #endif
 }; // end pointer
 
 // Output stream operator

diff --git a/thrust/detail/pointer.inl b/thrust/detail/pointer.inl
@@ -93,6 +93,7 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 } // end pointer::operator=
 #endif
 
+
 template<typename Element, typename Tag, typename Reference, typename Derived>
   template<typename OtherPointer>
     __host__ __device__
@@ -127,6 +128,18 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
   return super_t::base();
 } // end pointer::get
 
+
+#if THRUST_CPP_DIALECT >= 2011
+template<typename Element, typename Tag, typename Reference, typename Derived>
+  __host__ __device__
+  pointer<Element,Tag,Reference,Derived>
+    ::operator bool() const
+{
+  return bool(get());
+} // end pointer::operator bool
+#endif
+
+
 template<typename Element, typename Tag, typename Reference, typename Derived,
          typename charT, typename traits>
 __host__