Commit 8e0c630a authored by Ogier Maitre's avatar Ogier Maitre
Browse files

Added CCuda.o to makefile.

	Cuda code generation was bugged due to this problem.
parent 5802fc10
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
CCuda::CCuda(size_t parentSize, size_t offSize, size_t individualImplSize){ CCuda::CCuda(unsigned parentSize, unsigned offSize, unsigned individualImplSize){
this->sizeOfIndividualImpl = individualImplSize; this->sizeOfIndividualImpl = individualImplSize;
this->cudaBuffer = (void*)malloc(this->sizeOfIndividualImpl*( (parentSize>offSize) ? parentSize : offSize)); this->cudaBuffer = (void*)malloc(this->sizeOfIndividualImpl*( (parentSize>offSize) ? parentSize : offSize));
} }
......
...@@ -5,7 +5,7 @@ CXXFLAGS = -g -Wall -fmessage-length=0 -I../boost/ ...@@ -5,7 +5,7 @@ CXXFLAGS = -g -Wall -fmessage-length=0 -I../boost/
OBJS = CRandomGenerator.o CSelectionOperator.o CEvolutionaryAlgorithm.o\ OBJS = CRandomGenerator.o CSelectionOperator.o CEvolutionaryAlgorithm.o\
CStoppingCriterion.o COptionParser.o CPopulation.o CIndividual.o\ CStoppingCriterion.o COptionParser.o CPopulation.o CIndividual.o\
CGnuplot.o CCmaes.o CCmaesCuda.o Parameters.o CGPNode.o\ CGnuplot.o CCmaes.o CCmaesCuda.o Parameters.o CGPNode.o\
CComUDPLayer.o CComUDPLayer.o CCuda.o
ifeq ($(EZ_CUDA),1) ifeq ($(EZ_CUDA),1)
OBJS += CCuda.o OBJS += CCuda.o
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <iostream> #include <iostream>
#include <semaphore.h> #include <semaphore.h>
#include <cuda_runtime_api.h> //#include <cuda_runtime_api.h>
...@@ -52,10 +52,10 @@ struct gpuArg{ ...@@ -52,10 +52,10 @@ struct gpuArg{
class CCuda { class CCuda {
public: public:
void* cudaBuffer; void* cudaBuffer;
size_t sizeOfIndividualImpl; unsigned sizeOfIndividualImpl;
struct gpuOptions initOpts; struct gpuOptions initOpts;
public: public:
CCuda(size_t parentSize, size_t offSize, size_t individualImplSize); CCuda(unsigned parentSize, unsigned offSize, unsigned individualImplSize);
~CCuda(); ~CCuda();
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment