Commit a49c8888 authored by maitre's avatar maitre

rc-2

parent c491a429
......@@ -33,7 +33,7 @@ extern CSymbol *pCURRENT_CLASS, *pCURRENT_TYPE, *pGENOME, *pCLASSES[128];
extern int nClasses_nb;
extern FILE *fpOutputFile, *fpTemplateFile, *fpGenomeFile, *fpExplodedGenomeFile;
extern char sRAW_PROJECT_NAME[], sPROJECT_NAME[], sEO_DIR[], sEZ_PATH[], sEZ_FILE_NAME[];
extern char sRAW_PROJECT_NAME[], sPROJECT_NAME[], sEO_DIR[], sEZ_PATH[1000], sEZ_FILE_NAME[];
extern char sLOWER_CASE_PROJECT_NAME[];
extern char sREPLACEMENT[], sSELECTOR[], sSELECT_PRM[], sRED_PAR[], sRED_PAR_PRM[], sRED_FINAL[], sRED_FINAL_PRM[], sRED_OFF[], sRED_OFF_PRM[], sDISCARD[], sDISCARD_PRM[];
extern int nMINIMISE,nELITE;
......
......@@ -1774,18 +1774,13 @@ int CEASEALexer::create(CEASEAParser* pParser, CSymbolTable* pSymTable)
TARGET = STD;
}
char* sEZ_PATH = "./tpl/";
/////////////////////////////////////////////////////////
//strcpy(sTemp,"e:\\lutton\\easea\\debug");pour tester sous windows
if ((sEZ_PATH==NULL)||(sEZ_PATH[0]==0)) {
if (getenv("EZ_PATH")==NULL){
printf("\n\nHmmm, it looks like you are running EASEA without GUIDE for the first time.\n");
printf("Please, add the path of the installation directory to the PATH variable and\n");
printf("into the \"EZ_PATH\" environment variable, so that EASEA knows where to look for\n");
printf("its template files.\n");
exit(1);
}
strcpy(sEZ_PATH,getenv("EZ_PATH"));
strcpy(sEZ_PATH,"./tpl/");
}else
strcpy(sEZ_PATH,getenv("EZ_PATH"));
}
switch (OPERATING_SYSTEM) {
......
......@@ -8,6 +8,11 @@ $(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.so
$(CPPC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
$(EXEC)_bin:EaseaSym.o EaseaParse.o EaseaLex.o
$(CPPC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lalex
EaseaParse.o: EaseaParse.cpp EaseaLex.cpp
$(CPPC) $(CPPFLAGS) $< -o $@ -c
......@@ -19,11 +24,11 @@ alexyacc/libalex.so:alexyacc/*.cpp
cd alexyacc && make libalex.so
clean:
rm -f *.o $(EXEC)
rm -f *.o $(EXEC) $(EXEC)_bin
cd alexyacc && make clean
realclean: clean
rm -f EaseaParse.cpp EaseaParse.h EaseaLex.cpp EaseaLex.h
# realclean: clean
# rm -f EaseaParse.cpp EaseaParse.h EaseaLex.cpp EaseaLex.h
EaseaParse.cpp: EaseaParse.y
......
......@@ -401,13 +401,8 @@ void EvolutionaryAlgorithm::cudaPreliminaryProcess(size_t populationSize, dim3*
dimGrid->x = (nbBlock);
dimBlock->x = nbThreadPB;
#ifdef DEBUG
cout << "Number of grid : " << dimGrid->x << endl;
cout << "Number of block : " << dimBlock->x << endl;
#endif
}
......
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