From abc5a32c8a4bc0a46d70fb8df9751b502610938e Mon Sep 17 00:00:00 2001 From: Steve Plimpton Date: Tue, 23 Aug 2016 15:30:01 -0600 Subject: [PATCH] gpu lib sync --- lib/gpu/cudpp_mini/cudpp.h | 4 ++-- lib/gpu/cudpp_mini/cudpp_globals.h | 4 ++-- lib/gpu/cudpp_mini/cudpp_maximal_launch.h | 4 ++-- lib/gpu/cudpp_mini/cudpp_plan.h | 2 +- lib/gpu/cudpp_mini/cudpp_plan_manager.h | 2 +- lib/gpu/cudpp_mini/cudpp_radixsort.h | 4 ++-- lib/gpu/cudpp_mini/cudpp_scan.h | 4 ++-- lib/gpu/cudpp_mini/cudpp_util.h | 4 ++-- lib/gpu/cudpp_mini/sharedmem.h | 4 ++-- src/KOKKOS/Install.sh | 8 ++++++-- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lib/gpu/cudpp_mini/cudpp.h b/lib/gpu/cudpp_mini/cudpp.h index f04c0272be..088b560abc 100644 --- a/lib/gpu/cudpp_mini/cudpp.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_globals.h b/lib/gpu/cudpp_mini/cudpp_globals.h index 2c89665e9b..b0db9cf922 100644 --- a/lib/gpu/cudpp_mini/cudpp_globals.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_maximal_launch.h b/lib/gpu/cudpp_mini/cudpp_maximal_launch.h index e601c3118b..a8ffc3f978 100644 --- a/lib/gpu/cudpp_mini/cudpp_maximal_launch.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_plan.h b/lib/gpu/cudpp_mini/cudpp_plan.h index 3ec866d8d2..bf1263db13 100644 --- a/lib/gpu/cudpp_mini/cudpp_plan.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_plan_manager.h b/lib/gpu/cudpp_mini/cudpp_plan_manager.h index a55a1f0d25..1ccdca5168 100644 --- a/lib/gpu/cudpp_mini/cudpp_plan_manager.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_radixsort.h b/lib/gpu/cudpp_mini/cudpp_radixsort.h index 643da86517..b977017d30 100644 --- a/lib/gpu/cudpp_mini/cudpp_radixsort.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_scan.h b/lib/gpu/cudpp_mini/cudpp_scan.h index 4a5ef348ff..af4729b297 100644 --- a/lib/gpu/cudpp_mini/cudpp_scan.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/cudpp_util.h b/lib/gpu/cudpp_mini/cudpp_util.h index c25a384f29..5cff05e818 100644 --- a/lib/gpu/cudpp_mini/cudpp_util.h +++ b/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. diff --git a/lib/gpu/cudpp_mini/sharedmem.h b/lib/gpu/cudpp_mini/sharedmem.h index 87d4669d91..14721cfd30 100644 --- a/lib/gpu/cudpp_mini/sharedmem.h +++ b/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. diff --git a/src/KOKKOS/Install.sh b/src/KOKKOS/Install.sh index c8c14b7bf7..80a1bb8df0 100644 --- a/src/KOKKOS/Install.sh +++ b/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.