Changeset 826 for soft/giet_vm/applications/rosenfeld/include/config.h

Timestamp:

Jul 13, 2017, 11:01:58 AM (7 years ago)

Author:

meunier

Message:

• Mise à jour NR2 et Rosenfeld

File:

• soft/giet_vm/applications/rosenfeld/include/config.h (modified) (2 diffs)

soft/giet_vm/applications/rosenfeld/include/config.h

@@ -4 +4 @@
 
 #define SLOW 0
-#define FEATURES 0
+#define FEATURES 1
 #define FAST 1
 #define PYR_BARRIERS 0
 #define PARMERGE 1
-#define ARSP 0
+#define ARSP 1
 
 #if FAST && SLOW
@@ -45 +45 @@
         #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F)  vuse3_Parallel_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
         #define SetRoot_Parallel_FNF(D, rl, rd, alpha, F) SetRoot_Parallel_Features_Rosenfeld_Dist(D, rl, rd, alpha, F)
-    #elif  FEATURES &&  PARMERGE && ARSP
-        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F)  vuse2_Parallel_Features_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha, F)
-        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F)  vuse3_Parallel_Features_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
-        #error "Configuration Not implemented"
+    #elif  FEATURES &&  PARMERGE &&  ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F)  vuse2_Parallel_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F)  vuse3_Parallel_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
     #endif
 #endif