瀏覽代碼

Add perfmodel backward compatibility

Samuel Thibault 12 年之前
父節點
當前提交
5b42b6f63f
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      src/core/perfmodel/perfmodel_bus.c
  2. 2 1
      src/core/perfmodel/perfmodel_history.c

+ 2 - 1
src/core/perfmodel/perfmodel_bus.c

@@ -1553,7 +1553,8 @@ static void check_bus_config_file(void)
 		STARPU_ASSERT(ret == 1);
                 _starpu_drop_comments(f);
 		ret = fscanf(f, "%d\t", &read_mic);
-		STARPU_ASSERT(ret == 1);
+		if (ret == 0)
+			read_mic = 0;
                 _starpu_drop_comments(f);
                 fclose(f);
 

+ 2 - 1
src/core/perfmodel/perfmodel_history.c

@@ -370,7 +370,8 @@ static void parse_model_file(FILE *f, struct starpu_perfmodel *model, unsigned s
 	/* Parsing MIC devs */
 	_starpu_drop_comments(f);
 	ret = fscanf(f, "%u\n", &narchs);
-	STARPU_ASSERT(ret == 1);
+	if (ret == 0)
+		narchs = 0;
 
 	archmin += STARPU_MAXOPENCLDEVS;
 	_STARPU_DEBUG("Parsing %u MIC devices\n", narchs);