Moved omp pragmas declaration to seperate file

Definition of omp pragmas have nothing to do with Scale_vars,
for that reason pragmas.h was created with all of the definitions.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d403299a73e5007b98eb5b8706611bb9ed955adc..4bdff1c7e8693129989b963369cafc8d8f81ae81 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp scale_vars.hpp)
+set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp scale_vars.hpp pragmas.h)
 
 find_package(PkgConfig)
 

diff --git a/src/kcf.h b/src/kcf.h
index 4205921cc34b9aedf1903876dd2b61e3e224777e..afd90a5f255a11abf3671d2516d0c88b53d08982 100644 (file)
--- a/src/kcf.h
+++ b/src/kcf.h
@@ -18,6 +18,7 @@
 #include "cnfeat.hpp"
 #include "fft.h"
 #include "scale_vars.hpp"
+#include "pragmas.h"
 
 struct BBox_c
 {

diff --git a/src/piotr_fhog/fhog.hpp b/src/piotr_fhog/fhog.hpp
index db7912ad0e3fd8aa0212d40d816ecb6a5e8195d4..3b5c0cd053187080c81718c610029cc27e0c53f0 100644 (file)
--- a/src/piotr_fhog/fhog.hpp
+++ b/src/piotr_fhog/fhog.hpp
@@ -12,6 +12,7 @@
 
 #include "gradientMex.h"
 #include "scale_vars.hpp"
+#include "pragmas.h"
 
 struct Scale_vars;
 

diff --git a/src/pragmas.h b/src/pragmas.h
new file mode 100644 (file)
index 0000000..7342cfd
--- /dev/null
+++ b/src/pragmas.h
@@ -0,0 +1,21 @@
+#ifndef PRAGMAS_H
+#define PRAGMAS_H
+
+#if defined(BIG_BATCH) && defined(OPENMP)
+#define BIG_BATCH_OMP_PARALLEL_FOR _Pragma("omp parallel for ordered")
+#define BIG_BATCH_OMP_ORDERED _Pragma("omp ordered")
+#define NORMAL_OMP_PARALLEL_FOR
+#define NORMAL_OMP_CRITICAL
+#elif defined(OPENMP)
+#define BIG_BATCH_OMP_PARALLEL_FOR
+#define BIG_BATCH_OMP_ORDERED
+#define NORMAL_OMP_PARALLEL_FOR _Pragma("omp parallel for schedule(dynamic)")
+#define NORMAL_OMP_CRITICAL _Pragma("omp critical")
+#else
+#define BIG_BATCH_OMP_PARALLEL_FOR
+#define BIG_BATCH_OMP_ORDERED
+#define NORMAL_OMP_PARALLEL_FOR
+#define NORMAL_OMP_CRITICAL
+#endif
+
+#endif // PRAGMAS_H

diff --git a/src/scale_vars.hpp b/src/scale_vars.hpp
index e550bc817b4695f583e3bbbe4c89e83807d2b3c2..75d0b8c2e512fe10823dbfa48e565c298fb09799 100644 (file)
--- a/src/scale_vars.hpp
+++ b/src/scale_vars.hpp
@@ -13,23 +13,6 @@ typedef int *cudaStream_t;
 #endif
 #endif
 
-#if defined(BIG_BATCH) && defined(OPENMP)
-#define BIG_BATCH_OMP_PARALLEL_FOR _Pragma("omp parallel for ordered")
-#define BIG_BATCH_OMP_ORDERED _Pragma("omp ordered")
-#define NORMAL_OMP_PARALLEL_FOR
-#define NORMAL_OMP_CRITICAL
-#elif defined(OPENMP)
-#define BIG_BATCH_OMP_PARALLEL_FOR
-#define BIG_BATCH_OMP_ORDERED
-#define NORMAL_OMP_PARALLEL_FOR _Pragma("omp parallel for schedule(dynamic)")
-#define NORMAL_OMP_CRITICAL _Pragma("omp critical")
-#else
-#define BIG_BATCH_OMP_PARALLEL_FOR
-#define BIG_BATCH_OMP_ORDERED
-#define NORMAL_OMP_PARALLEL_FOR
-#define NORMAL_OMP_CRITICAL
-#endif
-
 struct Scale_vars {
   public:
     Scale_vars(int windows_size[2], int cell_size, int num_of_feats, int num_of_scales = 1,