Added ICET_MAX_IMAGE_SPLIT state and environment variable.

Does not do anything yet.

Author: Kenneth Moreland

CMakeLists.txt

@@ -40,7 +40,7 @@ OPTION(ICET_USE_MPI "Build MPI communication layer for IceT." ON)
 # Option to set the preferred K value to use in the radix-k algorithm
 SET(initial_magic_k 8)
 IF ("${CMAKE_SYSTEM_NAME}" MATCHES "^BlueGene")
-  SET(initial_magic_k 32)
+  SET(initial_magic_k 16)
 ENDIF ("${CMAKE_SYSTEM_NAME}" MATCHES "^BlueGene")
 IF ("$ENV{ICET_MAGIC_K}" GREATER 1)
   SET(initial_magic_k $ENV{ICET_MAGIC_K})
@@ -52,6 +52,15 @@ IF (NOT ${ICET_MAGIC_K} GREATER 1)
   MESSAGE(SEND_ERROR "ICET_MAGIC_K must be set to a number greater than 1.")
 ENDIF (NOT ${ICET_MAGIC_K} GREATER 1)
 
+# Option to set the preferred number of ways to break up an image.
+SET(initial_max_image_split 2048)
+IF ("$ENV{ICET_MAX_IMAGE_SPLIT}" GREATER 0)
+  SET(initial_max_image_split $ENV{ICET_MAX_IMAGE_SPLIT})
+ENDIF ("$ENV{ICET_MAX_IMAGE_SPLIT}" GREATER 0)
+SET(ICET_MAX_IMAGE_SPLIT ${initial_max_image_split} CACHE STRING
+  "Sets the preferred number of times an image may be split.  Some image compositing algorithms prefer to partition the images such that each process gets a piece.  Too many partitions, though, and you end up spending more time collecting them than you save balancing the compositing."
+  )
+
 # Configure MPE support
 IF (ICET_USE_MPI)
   OPTION(ICET_USE_MPE "Use MPE to trace MPI communications.  This is helpful for developers trying to measure the performance of parallel compositing algorithms." OFF)

Changes.txt

@@ -58,7 +58,7 @@ ICET_INTERLACE_IMAGES
 
 icetSparseImageInterlace
 
-ICET_MAGIC_K environment variable
+ICET_MAGIC_K environment variable, cmake variable, state variable
 
 ICET_COLLECT_TIME: The fraction of ICET_COMPOSITE_TIME spent in collecting
 image fragments to display process.
@@ -94,3 +94,5 @@ processes contain all pixels in the image (ICET_VALID_PIXELS_OFFSET is 0
 and ICET_VALID_PIXELS_NUM is the number of pixels in the image), and all
 other processes have no pixel data.  Strategies taking advantage of turning
 off ICET_COLLECT_IMAGES should set this.
+
+ICET_MAX_IMAGE_SPLIT environment variable, cmake variable, state variable

src/ice-t/state.c

@@ -170,6 +170,21 @@ void icetStateSetDefaults(void)
         icetStateSetInteger(ICET_MAGIC_K, ICET_MAGIC_K_DEFAULT);
     }
 
+    if (getenv("ICET_MAX_IMAGE_SPLIT") != NULL) {
+        IceTInt max_image_split = atoi(getenv("ICET_MAX_IMAGE_SPLIT"));
+        if (max_image_split > 0) {
+            icetStateSetInteger(ICET_MAX_IMAGE_SPLIT, max_image_split);
+        } else {
+            icetRaiseError("Environment variable ICET_MAX_IMAGE_SPLIT must be"
+                           " set to an integer greater than 0.",
+                           ICET_INVALID_VALUE);
+            icetStateSetInteger(ICET_MAX_IMAGE_SPLIT,
+                                ICET_MAX_IMAGE_SPLIT_DEFAULT);
+        }
+    } else {
+        icetStateSetInteger(ICET_MAX_IMAGE_SPLIT, ICET_MAX_IMAGE_SPLIT_DEFAULT);
+    }
+
     icetStateSetPointer(ICET_DRAW_FUNCTION, NULL);
     icetStateSetPointer(ICET_RENDER_LAYER_DESTRUCTOR, NULL);
 

src/include/IceT.h

@@ -281,6 +281,7 @@ ICET_EXPORT void icetDiagnostics(IceTBitField mask);
 #define ICET_FRAME_COUNT        (ICET_STATE_ENGINE_START | (IceTEnum)0x002E)
 
 #define ICET_MAGIC_K            (ICET_STATE_ENGINE_START | (IceTEnum)0x0040)
+#define ICET_MAX_IMAGE_SPLIT    (ICET_STATE_ENGINE_START | (IceTEnum)0x0041)
 
 #define ICET_DRAW_FUNCTION      (ICET_STATE_ENGINE_START | (IceTEnum)0x0060)
 #define ICET_RENDER_LAYER_DESTRUCTOR (ICET_STATE_ENGINE_START|(IceTEnum)0x0061)

src/include/IceTConfig.h.in

@@ -123,7 +123,8 @@ typedef IceTInt64 IceTPointerArithmetic;
 #error "Unexpected pointer size."
 #endif
 
-#define ICET_MAGIC_K_DEFAULT    @ICET_MAGIC_K@
+#define ICET_MAGIC_K_DEFAULT            @ICET_MAGIC_K@
+#define ICET_MAX_IMAGE_SPLIT_DEFAULT    @ICET_MAX_IMAGE_SPLIT@
 
 #cmakedefine ICET_USE_MPE