Disable checksum.

Signed-off-by: George Bosilca <bosilca@icl.utk.edu>

opal/datatype/opal_convertor.c

@@ -579,8 +579,9 @@ int32_t opal_convertor_prepare_for_recv( opal_convertor_t* convertor,
     assert(! (convertor->flags & CONVERTOR_SEND));
     OPAL_CONVERTOR_PREPARE( convertor, datatype, count, pUserBuf );
 
-    if( convertor->flags & CONVERTOR_WITH_CHECKSUM ) {
-        if( !(convertor->flags & CONVERTOR_HOMOGENEOUS) ) {
+#if defined(CHECKSUM)
+    if( OPAL_UNLIKELY(convertor->flags & CONVERTOR_WITH_CHECKSUM) ) {
+        if( OPAL_UNLIKELY(!(convertor->flags & CONVERTOR_HOMOGENEOUS)) ) {
             convertor->fAdvance = opal_unpack_general_checksum;
         } else {
             if( convertor->pDesc->flags & OPAL_DATATYPE_FLAG_CONTIGUOUS ) {
@@ -589,8 +590,9 @@ int32_t opal_convertor_prepare_for_recv( opal_convertor_t* convertor,
                 convertor->fAdvance = opal_generic_simple_unpack_checksum;
             }
         }
-    } else {
-        if( !(convertor->flags & CONVERTOR_HOMOGENEOUS) ) {
+    } else
+#endif  /* defined(CHECKSUM) */
+        if( OPAL_UNLIKELY(!(convertor->flags & CONVERTOR_HOMOGENEOUS)) ) {
             convertor->fAdvance = opal_unpack_general;
         } else {
             if( convertor->pDesc->flags & OPAL_DATATYPE_FLAG_CONTIGUOUS ) {
@@ -599,7 +601,6 @@ int32_t opal_convertor_prepare_for_recv( opal_convertor_t* convertor,
                 convertor->fAdvance = opal_generic_simple_unpack;
             }
         }
-    }
     return OPAL_SUCCESS;
 }
 
@@ -618,6 +619,7 @@ int32_t opal_convertor_prepare_for_send( opal_convertor_t* convertor,
 
     OPAL_CONVERTOR_PREPARE( convertor, datatype, count, pUserBuf );
 
+#if defined(CHECKSUM)
     if( convertor->flags & CONVERTOR_WITH_CHECKSUM ) {
         if( CONVERTOR_SEND_CONVERSION == (convertor->flags & (CONVERTOR_SEND_CONVERSION|CONVERTOR_HOMOGENEOUS)) ) {
             convertor->fAdvance = opal_pack_general_checksum;
@@ -632,7 +634,8 @@ int32_t opal_convertor_prepare_for_send( opal_convertor_t* convertor,
                 convertor->fAdvance = opal_generic_simple_pack_checksum;
             }
         }
-    } else {
+    } else
+#endif  /* defined(CHECKSUM) */
         if( CONVERTOR_SEND_CONVERSION == (convertor->flags & (CONVERTOR_SEND_CONVERSION|CONVERTOR_HOMOGENEOUS)) ) {
             convertor->fAdvance = opal_pack_general;
         } else {
@@ -646,7 +649,6 @@ int32_t opal_convertor_prepare_for_send( opal_convertor_t* convertor,
                 convertor->fAdvance = opal_generic_simple_pack;
             }
         }
-    }
     return OPAL_SUCCESS;
 }
 

opal/datatype/opal_convertor.h

@@ -332,8 +332,10 @@ opal_convertor_set_position( opal_convertor_t* convertor,
     /* Remove the completed flag if it's already set */
     convertor->flags &= ~CONVERTOR_COMPLETED;
 
-    if( !(convertor->flags & CONVERTOR_WITH_CHECKSUM) &&
-        (convertor->flags & OPAL_DATATYPE_FLAG_NO_GAPS) &&
+    if( (convertor->flags & OPAL_DATATYPE_FLAG_NO_GAPS) &&
+#if defined(CHECKSUM)
+        !(convertor->flags & CONVERTOR_WITH_CHECKSUM) &&
+#endif  /* defined(CHECKSUM) */
         (convertor->flags & (CONVERTOR_SEND | CONVERTOR_HOMOGENEOUS)) ) {
         /* Contiguous and no checkpoint and no homogeneous unpack */
         convertor->bConverted = *position;