Merge pull request #462 from dash-project/dart-feat-strides

Add support for extended data types in DART

Author: devreal

circle.yml

@@ -21,8 +21,8 @@ test:
         parallel: true
     - bash ./dash/scripts/circleci/run-docker.sh Minimal gnu:
         parallel: true
-    - bash ./dash/scripts/circleci/run-docker.sh Nasty gnu:
-        parallel: true
+#    - bash ./dash/scripts/circleci/run-docker.sh Nasty gnu:
+#       parallel: true
     - bash ./dash/scripts/circleci/run-docker.sh Release clang:
         parallel: true
     - grep "FAIL" ./dash-ci.log && (echo "Full log:" ; cat ./dash-ci.log ; exit 1) || exit 0:

dart-if/include/dash/dart/if/dart_communication.h

@@ -329,10 +329,13 @@ dart_ret_t dart_compare_and_swap(
  * is guaranteed. A later flush operation is needed to guarantee
  * local and remote completion.
  *
- * \param dest   The local destination buffer to store the data to.
- * \param gptr   A global pointer determining the source of the get operation.
- * \param nelem  The number of elements of type \c dtype to transfer.
- * \param dtype  The data type of the values in buffer \c dest.
+ * \param dest      The local destination buffer to store the data to.
+ * \param gptr      A global pointer determining the source of the get operation.
+ * \param nelem     The number of elements of type \c dtype to transfer.
+ * \param src_type  The data type of the values at the source.
+ * \param dst_type  The data type of the values in buffer \c dest.
+ *
+ * \note Base-type conversion is not performed.
  *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
@@ -343,7 +346,8 @@ dart_ret_t dart_get(
   void            * dest,
   dart_gptr_t       gptr,
   size_t            nelem,
-  dart_datatype_t   dtype) DART_NOTHROW;
+  dart_datatype_t   src_type,
+  dart_datatype_t   dst_type) DART_NOTHROW;
 
 /**
  * 'REGULAR' variant of dart_put.
@@ -352,10 +356,13 @@ dart_ret_t dart_get(
  * is guaranteed. A later flush operation is needed to guarantee
  * local and remote completion.
  *
- * \param gptr   A global pointer determining the target of the put operation.
- * \param src    The local source buffer to load the data from.
- * \param nelem  The number of elements of type \c dtype to transfer.
- * \param dtype  The data type of the values in buffer \c src.
+ * \param gptr      A global pointer determining the target of the put operation.
+ * \param src       The local source buffer to load the data from.
+ * \param nelem     The number of elements of type \c dtype to transfer.
+ * \param src_type  The data type of the values in buffer \c src.
+ * \param dst_type  The data type of the values at the target.
+ *
+ * \note Base-type conversion is not performed.
  *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
@@ -366,7 +373,8 @@ dart_ret_t dart_put(
   dart_gptr_t       gptr,
   const void      * src,
   size_t            nelem,
-  dart_datatype_t   dtype) DART_NOTHROW;
+  dart_datatype_t   src_type,
+  dart_datatype_t   dst_type) DART_NOTHROW;
 
 
 /**
@@ -453,49 +461,6 @@ dart_ret_t dart_flush_local_all(
  */
 typedef struct dart_handle_struct * dart_handle_t;
 
-typedef enum {
-  STRIDED_TO_STRIDED = 0,
-  STRIDED_TO_CONTIG,
-  CONTIG_TO_STRIDED
-} dart_stride_option;
-
-dart_ret_t dart_get_strided_handle(
-  void          * dest,
-  dart_gptr_t     gptr,
-  size_t          nblocks,
-  size_t          nelems_block,
-  size_t          stride,
-  dart_datatype_t dtype,
-  dart_stride_option stride_opt,
-  dart_handle_t * handle);
-
-dart_ret_t dart_get_indexed_handle(
-  void          * dest,
-  dart_gptr_t     gptr,
-  size_t          nblocks,
-  size_t          nelems_block,
-  int*            indexes,
-  dart_datatype_t dtype,
-  dart_stride_option stride_opt,
-  dart_handle_t * handle);
-
-/**
- * 'HANDLE' variant of dart_get.
- * Neither local nor remote completion is guaranteed. A later
- * dart_wait*() call or a fence/flush operation is needed to guarantee
- * completion.
- *
- * \param dest   Local target memory to store the data.
- * \param gptr   Global pointer being the source of the data transfer.
- * \param nelem  The number of elements of \c dtype in buffer \c dest.
- * \param dtype  The data type of the values in buffer \c dest.
- * \param[out] handle Pointer to DART handle to instantiate for later use with \c dart_wait, \c dart_wait_all etc.
- *
- * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
- *
- * \threadsafe
- * \ingroup DartCommunication
- */
 #define DART_HANDLE_NULL (dart_handle_t)NULL
 
 /**
@@ -504,12 +469,15 @@ dart_ret_t dart_get_indexed_handle(
  * dart_wait*() call or a fence/flush operation is needed to guarantee
  * completion.
  *
- * \param dest   Local target memory to store the data.
- * \param gptr   Global pointer being the source of the data transfer.
- * \param nelem  The number of elements of \c dtype in buffer \c dest.
- * \param dtype  The data type of the values in buffer \c dest.
+ * \param dest      Local target memory to store the data.
+ * \param gptr      Global pointer being the source of the data transfer.
+ * \param nelem     The number of elements of \c dtype in buffer \c dest.
+ * \param src_type  The data type of the values at the source.
+ * \param dst_type  The data type of the values in buffer \c dest.
  * \param[out] handle Pointer to DART handle to instantiate for later use with \c dart_wait, \c dart_wait_all etc.
  *
+ * \note Base-type conversion is not performed.
+ *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
  * \threadsafe
@@ -519,7 +487,8 @@ dart_ret_t dart_get_handle(
   void            * dest,
   dart_gptr_t       gptr,
   size_t            nelem,
-  dart_datatype_t   dtype,
+  dart_datatype_t   src_type,
+  dart_datatype_t   dst_type,
   dart_handle_t   * handle) DART_NOTHROW;
 
 /**
@@ -528,12 +497,15 @@ dart_ret_t dart_get_handle(
  * dart_wait*() call or a fence/flush operation is needed to guarantee
  * completion.
  *
- * \param gptr   Global pointer being the target of the data transfer.
- * \param src    Local source memory to transfer data from.
- * \param nelem  The number of elements of type \c dtype to transfer.
- * \param dtype  The data type of the values in buffer \c dest.
+ * \param gptr      Global pointer being the target of the data transfer.
+ * \param src       Local source memory to transfer data from.
+ * \param nelem     The number of elements of type \c dtype to transfer.
+ * \param src_type  The data type of the values in buffer \c src.
+ * \param dst_type  The data type of the values at the target.
  * \param[out] handle Pointer to DART handle to instantiate for later use with \c dart_wait, \c dart_wait_all etc.
  *
+ * \note Base-type conversion is not performed.
+ *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
  * \threadsafe
@@ -543,7 +515,8 @@ dart_ret_t dart_put_handle(
   dart_gptr_t       gptr,
   const void      * src,
   size_t            nelem,
-  dart_datatype_t   dtype,
+  dart_datatype_t   src_type,
+  dart_datatype_t   dst_type,
   dart_handle_t   * handle) DART_NOTHROW;
 
 /**
@@ -657,10 +630,13 @@ dart_ret_t dart_testall_local(
  * 'BLOCKING' variant of dart_get.
  * Both local and remote completion is guaranteed.
  *
- * \param dest   Local target memory to store the data.
- * \param gptr   Global pointer being the source of the data transfer.
- * \param nelem  The number of elements of type \c dtype to transfer.
- * \param dtype  The data type of the values in buffer \c dest.
+ * \param dest      Local target memory to store the data.
+ * \param gptr      Global pointer being the source of the data transfer.
+ * \param nelem     The number of elements of type \c dtype to transfer.
+ * \param src_type  The data type of the values at the source.
+ * \param dst_type  The data type of the values in buffer \c dest.
+ *
+ * \note Base-type conversion is not performed.
  *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
@@ -671,16 +647,20 @@ dart_ret_t dart_get_blocking(
   void         *  dest,
   dart_gptr_t     gptr,
   size_t          nelem,
-  dart_datatype_t dtype) DART_NOTHROW;
+  dart_datatype_t src_type,
+  dart_datatype_t dst_type) DART_NOTHROW;
 
 /**
  * 'BLOCKING' variant of dart_put.
  * Both local and remote completion is guaranteed.
  *
- * \param gptr   Global pointer being the target of the data transfer.
- * \param src    Local source memory to transfer data from.
- * \param nelem  The number of elements of type \c dtype to transfer.
- * \param dtype  The data type of the values in buffer \c dest.
+ * \param gptr      Global pointer being the target of the data transfer.
+ * \param src       Local source memory to transfer data from.
+ * \param nelem     The number of elements of type \c dtype to transfer.
+ * \param src_type  The data type of the values in buffer \c src.
+ * \param dst_type  The data type of the values at the target.
+ *
+ * \note Base-type conversion is not performed.
  *
  * \return \c DART_OK on success, any other of \ref dart_ret_t otherwise.
  *
@@ -691,7 +671,8 @@ dart_ret_t dart_put_blocking(
   dart_gptr_t       gptr,
   const void      * src,
   size_t            nelem,
-  dart_datatype_t   dtype) DART_NOTHROW;
+  dart_datatype_t   src_type,
+  dart_datatype_t   dst_type) DART_NOTHROW;
 
 /** \} */
 

dart-if/include/dash/dart/if/dart_globmem.h

@@ -318,7 +318,7 @@ dart_ret_t dart_memfree(dart_gptr_t gptr) DART_NOTHROW;
  */
 dart_ret_t dart_team_memalloc_aligned(
   dart_team_t       teamid,
-	size_t            nelem,
+  size_t            nelem,
   dart_datatype_t   dtype,
   dart_gptr_t     * gptr) DART_NOTHROW;
 
@@ -362,10 +362,10 @@ dart_ret_t dart_team_memfree(
  */
 dart_ret_t dart_team_memregister_aligned(
   dart_team_t       teamid,
-	size_t            nelem,
+  size_t            nelem,
   dart_datatype_t   dtype,
-	void            * addr,
-	dart_gptr_t     * gptr) DART_NOTHROW;
+  void            * addr,
+  dart_gptr_t     * gptr) DART_NOTHROW;
 
 /**
  * Collective function, attaches external memory previously allocated by
@@ -386,10 +386,10 @@ dart_ret_t dart_team_memregister_aligned(
  */
 dart_ret_t dart_team_memregister(
   dart_team_t       teamid,
-	size_t            nlelem,
+  size_t            nlelem,
   dart_datatype_t   dtype,
-	void            * addr,
-	dart_gptr_t     * gptr) DART_NOTHROW;
+  void            * addr,
+  dart_gptr_t     * gptr) DART_NOTHROW;
 
 /**
  * Collective function similar to dart_team_memfree() but on previously