gpu lib sync

lib/gpu/cudpp_mini/cudpp.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // CUDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_globals.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_maximal_launch.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_plan.h

@@ -2,7 +2,7 @@
 // CUDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
 // $Revision: 3572$
-// $Date$
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_plan_manager.h

@@ -2,7 +2,7 @@
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
 // $Revision: 3572$
-// $Date$
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_radixsort.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_scan.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt 
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_util.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/sharedmem.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt 
 // in the root directory of this source distribution.

src/KOKKOS/Install.sh

@@ -189,8 +189,12 @@ if (test $1 = 1) then
     sed -i -e '/CXX\ =\ \$(CC)/d' ../Makefile.package.settings
     sed -i -e '/^include.*kokkos.*$/d' ../Makefile.package.settings
     # multiline form needed for BSD sed on Macs
-    sed -i -e '4 i \CXX = $(CC)' ../Makefile.package.settings
-    sed -i -e '5 i \include ..\/..\/lib\/kokkos\/Makefile.kokkos' ../Makefile.package.settings
+    sed -i -e '4 i \
+CXX = $(CC)
+' ../Makefile.package.settings
+    sed -i -e '5 i \
+include ..\/..\/lib\/kokkos\/Makefile.kokkos
+' ../Makefile.package.settings
   fi
 
   #  comb/omp triggers a persistent bug in nvcc. deleting it.