nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update for new version

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2667 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-24 01:31:23 +00:00
commit aff23f2a6e
10 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhood.h
View file

@ -1,6 +1,6 @@
/*
<moGPUMappingNeighborhood.h>
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
@ -30,11 +30,11 @@
#ifndef __moGPUMappingNeighborhood_h
#define __moGPUMappingNeighborhood_h
#include <neighborhood/moMappingNeighborhood.h>
#include <neighborhood/moGPUMapping.h>
#include <eval/moGPUEval.h>
template<class N>
class moGPUMappingNeighborhood: public moMappingNeighborhood<N> {
class moGPUMappingNeighborhood: public moGPUMapping<N> {
public:
@ -45,12 +45,12 @@ public:
typedef N Neighbor;
typedef typename Neighbor::EOT EOT;
using moMappingNeighborhood<Neighbor>::neighborhoodSize;
using moMappingNeighborhood<Neighbor>::currentIndex;
using moMappingNeighborhood<Neighbor>::indices;
using moMappingNeighborhood<Neighbor>::mapping;
using moMappingNeighborhood<Neighbor>::xChange;
using moMappingNeighborhood<Neighbor>::mutex;
using moGPUMapping<Neighbor>::neighborhoodSize;
using moGPUMapping<Neighbor>::currentIndex;
using moGPUMapping<Neighbor>::indices;
using moGPUMapping<Neighbor>::mapping;
using moGPUMapping<Neighbor>::xChange;
using moGPUMapping<Neighbor>::mutex;
/**
* Constructor
@ -60,7 +60,7 @@ public:
moGPUMappingNeighborhood(unsigned int _neighborhoodSize,
unsigned int _xChange) :
moMappingNeighborhood<Neighbor> (_neighborhoodSize, _xChange) {
moGPUMapping<Neighbor> (_neighborhoodSize, _xChange) {
sendMapping = false;
cudaMalloc((void**) &device_Mapping, sizeof(unsigned int)
* neighborhoodSize * _xChange);
@ -84,7 +84,7 @@ public:
virtual void init(EOT& _solution, Neighbor& _current) {
moMappingNeighborhood<Neighbor>::init(_solution, _current);
moGPUMapping<Neighbor>::init(_solution, _current);
if (!sendMapping) {
cudaMemcpy(device_Mapping, mapping,xChange * neighborhoodSize
* sizeof(unsigned int), cudaMemcpyHostToDevice);