Fixed clash between identity in thrust since thrust static version removal. (#359)

Author: mattmartineau

include/cusp/detail/device/detail/coo.h

@@ -91,7 +91,7 @@ void coo_add(const Matrix1& A,
 {
     typedef typename Matrix2::value_type ValueType;
 
-    coo_elementwise_transform_simple(A, B, C, amgx::thrust::identity<ValueType>());
+    coo_elementwise_transform_simple(A, B, C, identity_function<ValueType>());
 }
 
 template <typename Matrix1,

include/cusp/detail/device/generalized_spmv/dia.h

@@ -122,7 +122,7 @@ void __spmv_dia(const cusp::dia_matrix<IndexType,ValueType,cusp::device_memory>&
              amgx::thrust::raw_pointer_cast(&dia.diagonal_offsets[0]) + base,
              amgx::thrust::raw_pointer_cast(&dia.values.values[0]) + base * stride,
              x, y,
-             amgx::thrust::identity<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
+             identity_function<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
     }
 
     if (UseCache)

include/cusp/detail/device/generalized_spmv/ell.h

@@ -93,7 +93,7 @@ void __spmv_ell(const cusp::ell_matrix<IndexType,ValueType,cusp::device_memory>&
          amgx::thrust::raw_pointer_cast(&ell.column_indices.values[0]), 
          amgx::thrust::raw_pointer_cast(&ell.values.values[0]),
          x, y,
-         amgx::thrust::identity<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
+         identity_function<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
 
     if (UseCache)
         unbind_x(x);

include/cusp/detail/functional.h

@@ -33,13 +33,3 @@ template<typename T>
 } // end namespace detail
 } // end namespace cusp
 
-// Add identity to amgx::thrust namespace for backward compatibility
-namespace amgx
-{
-namespace thrust
-{
-  template<typename T>
-  using identity = cusp::detail::identity_function<T>;
-}
-}
-

include/cusp/detail/host/multiply.h

@@ -119,7 +119,7 @@ void multiply(const Matrix&  A,
     typedef typename Vector2::value_type ValueType;
 
     cusp::detail::host::spmv_ell(A.ell, B, C);
-    cusp::detail::host::spmv_coo(A.coo, B, C, amgx::thrust::identity<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
+    cusp::detail::host::spmv_coo(A.coo, B, C, identity_function<ValueType>(), amgx::thrust::multiplies<ValueType>(), amgx::thrust::plus<ValueType>());
 }
 
 ////////////////////////////////////////

include/cusp/graph/detail/maximal_independent_set.inl

@@ -231,7 +231,7 @@ void compute_mis_states(const size_t k,
 //
 //            // map old indices into subgraph indices
 //            cusp::array1d<IndexType, MemorySpace> index_map(N);
-//            amgx::thrust::transform_exclusive_scan(retained_nodes.begin(), retained_nodes.end(), index_map.begin(), amgx::thrust::identity<IndexType>(), IndexType(0), amgx::thrust::plus<IndexType>());
+//            amgx::thrust::transform_exclusive_scan(retained_nodes.begin(), retained_nodes.end(), index_map.begin(), identity_function<IndexType>(), IndexType(0), amgx::thrust::plus<IndexType>());
 //            
 //            std::cout << "index map\n";
 //            cusp::print(index_map);