florent/triskele
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modifié : MakefileNoOTB

Browse Source 
modifié :         include/triskeleDealThreads.hpp
	modifié :         include/triskeleDealThreads.tpp
This commit is contained in:
Git Merciol 2018-03-12 15:53:41 +01:00
parent e08c9cdd91
commit 91b8815b26
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MakefileNoOTB
View File

@ -17,10 +17,10 @@ TST_SRC = $(patsubst %, $(CPP_DIR)/%.cpp, $(TST_PRG))
TST_OUT = $(patsubst %, $(OUT_DIR)/%, $(TST_PRG)) TST_OUT = $(patsubst %, $(OUT_DIR)/%, $(TST_PRG))
## FLAGS ############################### ## FLAGS ###############################
DFLAGS = -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS -DNO_OTB #-D XEON_TBB_THREAD DFLAGS = -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS -DNO_OTB -DINTEL_TBB_THREAD
#DFLAGS = -g -DENABLE_LOG -DNO_OTB -DTHREAD_DISABLE -DENABLE_SMART_LOG #DFLAGS = -g -DENABLE_LOG -DNO_OTB -DTHREAD_DISABLE -DENABLE_SMART_LOG
IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR) IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR)
LFLAGS = -L$(LIB_DIR) -ltriskele -lstdc++ -lpthread -lboost_system -lboost_chrono -lboost_thread -lboost_program_options -lboost_date_time -lboost_serialization -lboost_filesystem -lboost_unit_test_framework -lgdal LFLAGS = -L$(LIB_DIR) -ltriskele -lstdc++ -lpthread -ltbb -lboost_system -lboost_chrono -lboost_thread -lboost_program_options -lboost_date_time -lboost_serialization -lboost_filesystem -lboost_unit_test_framework -lgdal
CC = g++ CC = g++
## RULES ############################### ## RULES ###############################

2
include/triskeleDealThreads.hpp
View File

@ -1,7 +1,7 @@
#ifndef _TRISKELE_DEAL_THREADS_HPP #ifndef _TRISKELE_DEAL_THREADS_HPP
#define _TRISKELE_DEAL_THREADS_HPP #define _TRISKELE_DEAL_THREADS_HPP
#ifdef XEON_TBB_THREAD #ifdef INTEL_TBB_THREAD
#include <tbb/tbb.h> #include <tbb/tbb.h>
#endif #endif
#include <boost/thread.hpp> #include <boost/thread.hpp>

2
include/triskeleDealThreads.tpp
View File

@ -65,7 +65,7 @@ dealThread (const DimImg &maxId, unsigned int coreCount, const FunctThreadMinMax
for (unsigned int idCopyValInThread = 0; idCopyValInThread < coreCount; ++idCopyValInThread) { for (unsigned int idCopyValInThread = 0; idCopyValInThread < coreCount; ++idCopyValInThread) {
functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]); functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]);
} }
#elif XEON_TBB_THREAD #elif INTEL_TBB_THREAD
using namespace tbb; using namespace tbb;
#pragma warning(disable: 588) #pragma warning(disable: 588)
parallel_for (size_t (0), size_t (coreCount), [&maxIds, &functThreadMinMax] (size_t idCopyValInThread) { parallel_for (size_t (0), size_t (coreCount), [&maxIds, &functThreadMinMax] (size_t idCopyValInThread) {