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@2669 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-24 01:32:16 +00:00
commit 5bd4d73ad9
6 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXBitFlippingNeighbor.h
View file

@ -1,8 +1,8 @@
/* /*
<moGPUXBitFlippingNeighbor.h> <moGPUXBitFlippingNeighbor.h>
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 This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,

4
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighbor.h
View file

@ -1,8 +1,8 @@
/* /*
<moGPUXChangeNeighbor.h> <moGPUXChangeNeighbor.h>
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 This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,

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

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

4
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByCpy.h
View file

@ -1,8 +1,8 @@
/* /*
<moGPUXChangeNeighborhoodByCpy.h> <moGPUXChangeNeighborhoodByCpy.h>
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 This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,

2
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByModif.h
View file

@ -1,6 +1,6 @@
/* /*
<moGPUXChangeNeighborhoodByModif.h> <moGPUXChangeNeighborhoodByModif.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 Karima Boufaras, Thé Van Luong

4
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h
View file

@ -1,8 +1,8 @@
/* /*
<moGPUXSwapNeighbor.h.h> <moGPUXSwapNeighbor.h.h>
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 This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,