Config:

* Add `THRUST_HOST_COMPILER_INTEL`, `THRUST_HOST_COMPILER_NVCXX` (currently
  not used), and `THRUST_DEVICE_COMPILER_NVCXX` (currently not used) compiler
  identification macros. See #1473.
* Change the value of `THRUST_DEVICE_COMPILER_CLANG` to be consistent with the
  value of `THRUST_HOST_COMPILER_CLANG`.

Author: brycelelbach

testing/async_copy.cu

@@ -268,7 +268,7 @@ struct test_async_copy_counting_iterator_input_to_host_vector
 
       ASSERT_EQUAL(d0, d1);
 
-      #if defined(__ICC)
+      #if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
       // ICC fails this for some unknown reason - see #1468.
       KNOWN_FAILURE;
       #endif

thrust/detail/config/compiler.h

@@ -25,20 +25,27 @@
 #define THRUST_HOST_COMPILER_MSVC    1
 #define THRUST_HOST_COMPILER_GCC     2
 #define THRUST_HOST_COMPILER_CLANG   3
+#define THRUST_HOST_COMPILER_INTEL   4
+#define THRUST_HOST_COMPILER_NVCXX   5
 
 // enumerate device compilers we know about
 #define THRUST_DEVICE_COMPILER_UNKNOWN 0
 #define THRUST_DEVICE_COMPILER_MSVC    1
 #define THRUST_DEVICE_COMPILER_GCC     2
-#define THRUST_DEVICE_COMPILER_NVCC    3
-#define THRUST_DEVICE_COMPILER_CLANG   4
+#define THRUST_DEVICE_COMPILER_CLANG   3
+#define THRUST_DEVICE_COMPILER_NVCC    4
+#define THRUST_DEVICE_COMPILER_NVCXX   5
 
 // figure out which host compiler we're using
 // XXX we should move the definition of THRUST_DEPRECATED out of this logic
 #if   defined(_MSC_VER)
 #define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_MSVC
 #define THRUST_MSVC_VERSION _MSC_VER
 #define THRUST_MSVC_VERSION_FULL _MSC_FULL_VER
+#elif defined(__ICC)
+#define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_INTEL
+#elif defined(__NVCOMPILER)
+#define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_NVCXX
 #elif defined(__clang__)
 #define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_CLANG
 #define THRUST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)