From 8ac06df8fe9cedff22d46f308a3b807724b42779 Mon Sep 17 00:00:00 2001 From: boufaras Date: Tue, 24 Jan 2012 01:33:54 +0000 Subject: [PATCH] Test & Update for new version git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2673 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-gpu/src/problems/data/moGPUPPPData.h | 7 +++---- .../paradiseo-gpu/src/problems/data/moGPUQAPData.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h index 87ffd4b79..fa284e6e0 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Boufaras Karima, Thé Van Luong + Karima Boufaras, Thé Van Luong This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, @@ -51,7 +51,6 @@ public: moGPUPPPData() : moGPUSpecificData() { - //(*this).load(); } /** @@ -149,7 +148,7 @@ public: H_h[s[i]-1]++; } - //Allocate and copy QAP data from CPU memory to GPU global memory + //Allocate and copy PPP data from CPU memory to GPU global memory GPUObject.memCopy(a_d, a_h, Nd * Md); GPUObject.memCopy(H_d, H_h, Nd); diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h index 7202f0159..c548fed72 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Boufaras Karima, Thé Van Luong + Karima Boufaras, Thé Van Luong This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use,