From 943ebd1f74cddd22d7f72c9c9679fdc4c6b51efd Mon Sep 17 00:00:00 2001 From: boufaras Date: Tue, 24 Jan 2012 01:38:02 +0000 Subject: [PATCH] Test & Update for new version git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2683 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-gpu/tutorial/Kswap-OneMax/moGPUConfig.h | 2 +- .../tutorial/Kswap-OneMax/testKswapHCByCpy.cu | 8 ++++---- .../tutorial/Kswap-OneMax/testKswapHCByModif.cu | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/moGPUConfig.h b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/moGPUConfig.h index 8cbc8ed2a..ee91d43a5 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/moGPUConfig.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/moGPUConfig.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu index 0ddcfef79..35e7f5c29 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG @@ -139,7 +139,7 @@ void main_function(int argc, char **argv) unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); moGPUOneMaxIncrEval incr_eval; - moGPUMappingEvalByCpy > cueval(sizeMap,incr_eval); + moGPUMappingEvalByCpy > gpueval(sizeMap,incr_eval); /* ========================================================= * @@ -156,7 +156,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(sizeMap,NB_POS,cueval); + Neighborhood neighborhood(sizeMap,NB_POS,gpueval); /* ========================================================= * @@ -164,7 +164,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - moSimpleHCexplorer explorer(neighborhood, cueval, + moSimpleHCexplorer explorer(neighborhood, gpueval, comparator, solComparator); /* ========================================================= diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu index 7e4bd7f48..584b19eb2 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG @@ -149,7 +149,7 @@ void main_function(int argc, char **argv) unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); moGPUOneMaxIncrEval incr_eval; - moGPUMappingEvalByModif > cueval(sizeMap,incr_eval); + moGPUMappingEvalByModif > gpueval(sizeMap,incr_eval); /* ========================================================= * @@ -166,7 +166,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(sizeMap,NB_POS,cueval); + Neighborhood neighborhood(sizeMap,NB_POS,gpueval); /* ========================================================= * @@ -174,7 +174,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - moSimpleHCexplorer explorer(neighborhood, cueval, + moSimpleHCexplorer explorer(neighborhood, gpueval, comparator, solComparator); /* =========================================================