Update for new version
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2667 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras
parent
83cdf11938
commit
aff23f2a6e
10 changed files with 34 additions and 32 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
<moGPUMappingNeighborhoodByCpy.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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
<moGPUMappingNeighborhoodByModif.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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
<moNeighborhoodSizeUtils.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
<moGPUNeighborhoodSizeUtils.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Karima Boufaras, Thé Van LUONG
|
||||
|
||||
|
|
@ -32,8 +32,8 @@
|
|||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef _moNeighborhoodSizeUtils_h
|
||||
#define _moNeighborhoodSizeUtils_h
|
||||
#ifndef _moGPUNeighborhoodSizeUtils_h
|
||||
#define _moGPUNeighborhoodSizeUtils_h
|
||||
|
||||
/**
|
||||
* @return the factorial of an integer
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
<moGPUOrderNeighborhoodByCpy.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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
<moGPUOrderNeighborhoodByModif.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Jerémie Humeau, Thé Van LUONG, Karima Boufaras
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
<moGPURndWithReplNeighborhoodByCpy.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Jerémie Humeau, Karima Boufaras, 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,
|
||||
|
|
@ -70,7 +70,7 @@ class moGPURndWithReplNeighborhoodByCpy: public moRndWithReplNeighborhood<Neighb
|
|||
virtual void init(EOT & _solution, Neighbor & _neighbor) {
|
||||
moRndWithReplNeighborhood<Neighbor>::init(_solution, _neighbor);
|
||||
//Compute all neighbors fitness at one time
|
||||
eval.neighborhoodEval(_solution,0,1);
|
||||
eval.neighborhoodEval(_solution,0,0);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
<moGPURndWithReplNeighborhoodByModif.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Jerémie Humeau, Karima Boufaras, 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,
|
||||
|
|
@ -69,7 +69,7 @@ class moGPURndWithReplNeighborhoodByModif: public moRndWithReplNeighborhood<Neig
|
|||
virtual void init(EOT & _solution, Neighbor & _neighbor) {
|
||||
moRndWithReplNeighborhood<Neighbor>::init(_solution, _neighbor);
|
||||
//Compute all neighbors fitness at one time
|
||||
eval.neighborhoodEval(_solution,0,1);
|
||||
eval.neighborhoodEval(_solution,0,0);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
<moGPURndWithoutReplNeighborhood.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Jerémie Humeau, 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,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
|
|
@ -52,11 +52,13 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood<Neigh
|
|||
using moRndWithoutReplNeighborhood<Neighbor>::neighborhoodSize;
|
||||
using moRndWithoutReplNeighborhood<Neighbor>::maxIndex;
|
||||
using moRndWithoutReplNeighborhood<Neighbor>::indexVector;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @param _neighborhoodSize the size of the neighborhood
|
||||
* @param _eval show how to evaluate neighborhood of a solution at one time
|
||||
*/
|
||||
|
||||
moGPURndWithoutReplNeighborhood(unsigned int _neighborhoodSize,moGPUEval<
|
||||
Neighbor>& _eval) :
|
||||
moRndWithoutReplNeighborhood<Neighbor> (_neighborhoodSize),eval(_eval) {
|
||||
|
|
@ -72,7 +74,7 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood<Neigh
|
|||
virtual void init(EOT & _solution, Neighbor & _neighbor) {
|
||||
moRndWithoutReplNeighborhood<Neighbor>::init(_solution, _neighbor);
|
||||
//Compute all neighbors fitness at one time
|
||||
eval.neighborhoodEval(_solution,0,1);
|
||||
eval.neighborhoodEval(_solution,0,0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
<moGPURndWithoutReplNeighborhood.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
|
||||
|
||||
Jerémie Humeau, 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,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
|
|
@ -72,7 +72,7 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood<Neigh
|
|||
virtual void init(EOT & _solution, Neighbor & _neighbor) {
|
||||
moRndWithoutReplNeighborhood<Neighbor>::init(_solution, _neighbor);
|
||||
//Compute all neighbors fitness at one time
|
||||
eval.neighborhoodEval(_solution,0,1);
|
||||
eval.neighborhoodEval(_solution,0,0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue