Merge branch 'master' into 'master'

ooc: Only require page alignment when using o_direct backend

See merge request !127

runtime/starpu/control/runtime_descriptor.c

@@ -175,18 +175,22 @@ void RUNTIME_desc_create( CHAM_desc_t *desc )
 #endif
 
     if (desc->ooc) {
-        int     lastmm   = desc->lm - (desc->lmt-1) * desc->mb;
-        int     lastnn   = desc->ln - (desc->lnt-1) * desc->nb;
-        int64_t eltsze   = CHAMELEON_Element_Size(desc->dtyp);
-        int     pagesize = getpagesize();
-
-        if ( ((desc->mb * desc->nb * eltsze) % pagesize != 0) ||
-             ((lastmm   * desc->nb * eltsze) % pagesize != 0) ||
-             ((desc->mb * lastnn   * eltsze) % pagesize != 0) ||
-             ((lastmm   * lastnn   * eltsze) % pagesize != 0) )
-        {
-            chameleon_error("RUNTIME_desc_create", "Matrix and tile size not suitable for out-of-core: all tiles have to be multiples of 4096. Tip : choose 'n' and 'nb' as both multiples of 32.");
-            return;
+        char   *backend = getenv("STARPU_DISK_SWAP_BACKEND");
+
+        if (backend && strcmp(backend, "unistd_o_direct") == 0) {
+            int     lastmm   = desc->lm - (desc->lmt-1) * desc->mb;
+            int     lastnn   = desc->ln - (desc->lnt-1) * desc->nb;
+            int64_t eltsze   = CHAMELEON_Element_Size(desc->dtyp);
+            int     pagesize = getpagesize();
+
+            if ( ((desc->mb * desc->nb * eltsze) % pagesize != 0) ||
+                 ((lastmm   * desc->nb * eltsze) % pagesize != 0) ||
+                 ((desc->mb * lastnn   * eltsze) % pagesize != 0) ||
+                 ((lastmm   * lastnn   * eltsze) % pagesize != 0) )
+            {
+                chameleon_error("RUNTIME_desc_create", "Matrix and tile size not suitable for out-of-core: all tiles have to be multiples of the system page size. Tip : choose 'n' and 'nb' as both multiples of 32.");
+                return;
+            }
         }
     }