Преглед на файлове

Fix test into really pushing data to disk even in quick check mode

Samuel Thibault преди 10 години
родител
ревизия
962c4932ef
променени са 1 файла, в които са добавени 11 реда и са изтрити 8 реда
  1. 11 8
      tests/disk/disk_copy.c

+ 11 - 8
tests/disk/disk_copy.c

@@ -34,15 +34,18 @@
 #  endif
 #endif
 
+/* RAM is not enough to hold 6 times NX
+ * DISK is just enough to hold 6 times NX */
+
 /* size of one vector */
 #ifdef STARPU_QUICK_CHECK
-#  define	NX	(32*128/sizeof(double))
+#  define	RAM	"1"
+#  define	DISK	2
+#  define	NX	(256*1024/sizeof(double))
 #else
-#  if SIZEOF_VOID_P == 4
-#    define	NX	(32*1024/sizeof(double))
-#  else
-#    define	NX	(32*1048576/sizeof(double))
-#  endif
+#  define	NX	(32*1048576/sizeof(double))
+#  define	RAM	"160"
+#  define	DISK	200
 #endif
 
 #if !defined(STARPU_HAVE_SETENV)
@@ -59,7 +62,7 @@ int dotest(struct starpu_disk_ops *ops, void *param)
 	int ret;
 
 	/* limit main ram to force to push in disk */
-	setenv("STARPU_LIMIT_CPU_MEM", "160", 1);
+	setenv("STARPU_LIMIT_CPU_MEM", RAM, 1);
 
 	/* Initialize StarPU without GPU devices to make sure the memory of the GPU devices will not be used */
 	struct starpu_conf conf;
@@ -72,7 +75,7 @@ int dotest(struct starpu_disk_ops *ops, void *param)
 	if (ret == -ENODEV) goto enodev;
 
 	/* register a disk */
-	int new_dd = starpu_disk_register(ops, param, 1024*1024*200);
+	int new_dd = starpu_disk_register(ops, param, 1024*1024*DISK);
 	/* can't write on /tmp/ */
 	if (new_dd == -ENOENT) goto enoent;