Merge pull request #23 from thrust/integrate-various-fixes

Integrate various fixes

Author: jaredhoberock

SConstruct

@@ -343,6 +343,7 @@ elif master_env['PLATFORM'] == 'darwin':
   master_env['ENV'].setdefault('DYLD_LIBRARY_PATH', []).append(cuda_installation()[1])
 elif master_env['PLATFORM'] == 'win32':
   master_env['ENV']['TBBROOT'] = os.environ['TBBROOT']
+  master_env['ENV']['PATH'] += ';' + tbb_installation(master_env)[0]
 
 # get the list of requested backends
 host_backends = master_env.subst('$host_backend').split()

testing/backend/cuda/testframework.cpp

@@ -160,3 +160,9 @@ bool CUDATestDriver::run_tests(const ArgumentSet &args, const ArgumentMap &kwarg
   return result;
 }
 
+UnitTestDriver &driver_instance(thrust::system::cuda::tag)
+{
+  static CUDATestDriver s_instance;
+  return s_instance;
+}
+

testing/backend/cuda/testframework.h

@@ -16,3 +16,5 @@ class CUDATestDriver
   virtual bool run_tests(const ArgumentSet &args, const ArgumentMap &kwargs);
 };
 
+UnitTestDriver &driver_instance(thrust::system::cuda::tag);
+

testing/testframework.cpp

@@ -423,14 +423,8 @@ UnitTestDriver &driver_instance(DeviceSystem tag)
   return s_instance;
 }
 
-// overload driver_instance, if we need a special kind of
-// UnitTestDriver
-
-UnitTestDriver &driver_instance(thrust::system::cuda::tag)
-{
-  static CUDATestDriver s_instance;
-  return s_instance;
-}
+// if we need a special kind of UnitTestDriver, overload
+// driver_instance in that function
 
 UnitTestDriver &
 UnitTestDriver::s_driver()

testing/unittest/testframework.h

@@ -135,9 +135,9 @@ class UnitTestDriver
   // \return true if all is well; false if the tests must be immediately aborted
   virtual bool post_test_sanity_check(const UnitTest &test, bool concise);
 
+public:
   inline virtual ~UnitTestDriver() {};
 
-public:
   void register_test(UnitTest * test);
   virtual bool run_tests(const ArgumentSet& args, const ArgumentMap& kwargs);
   void list_tests(void); 

thrust/system/cuda/detail/tag.h

@@ -57,20 +57,34 @@ inline Tag select_system(thrust::any_system_tag, Tag)
   return Tag();
 }
 
+// this version catches a user's tag derived from cuda::tag in the first slot
 template<typename Tag>
 __host__ __device__
 inline cuda_to_cpp select_system(Tag, thrust::system::cpp::tag)
 {
   return cuda_to_cpp();
 }
 
+__host__ __device__
+inline cuda_to_cpp select_system(tag, thrust::system::cpp::tag)
+{
+  return cuda_to_cpp();
+}
+
+// this version catches a user's tag derived from cuda::tag in the second slot
 template<typename Tag>
 __host__ __device__
 inline cpp_to_cuda select_system(thrust::system::cpp::tag, Tag)
 {
   return cpp_to_cuda();
 }
 
+__host__ __device__
+inline cpp_to_cuda select_system(thrust::system::cpp::tag, tag)
+{
+  return cpp_to_cuda();
+}
+
 } // end detail
 
 // alias the tag here