瀏覽代碼

perfmodel: rename function starpu_get_narch_combs into starpu_perfmodel_get_narch_combs

Nathalie Furmento 10 年之前
父節點
當前提交
3e567efff7
共有 3 個文件被更改,包括 7 次插入7 次删除
  1. 2 2
      include/starpu_perfmodel.h
  2. 2 2
      src/core/perfmodel/perfmodel_history.c
  3. 3 3
      src/core/perfmodel/perfmodel_print.c

+ 2 - 2
include/starpu_perfmodel.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2014  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Télécom-SudParis
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -147,7 +147,7 @@ struct starpu_perfmodel_arch *starpu_worker_get_perf_archtype(int workerid, unsi
 
 int starpu_perfmodel_load_symbol(const char *symbol, struct starpu_perfmodel *model);
 int starpu_perfmodel_unload_model(struct starpu_perfmodel *model);
-int starpu_get_narch_combs();
+int starpu_perfmodel_get_narch_combs();
 int starpu_perfmodel_arch_comb_add(int ndevices, struct starpu_perfmodel_device* devices);
 int starpu_perfmodel_arch_comb_get(int ndevices, struct starpu_perfmodel_device *devices);
 

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

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-2015  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Télécom-SudParis
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -159,7 +159,7 @@ static 	void _free_arch_combs(void)
 	STARPU_PTHREAD_MUTEX_DESTROY(&arch_combs_mutex);
 }
 
-int starpu_get_narch_combs()
+int starpu_perfmodel_get_narch_combs()
 {
 	return current_arch_comb;
 }

+ 3 - 3
src/core/perfmodel/perfmodel_print.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011, 2013-2014  Université de Bordeaux
- * Copyright (C) 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Télécom-SudParis
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -175,7 +175,7 @@ int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char
 	if (arch == NULL)
 	{
 		int comb, impl;
-		for(comb = 0; comb < starpu_get_narch_combs(); comb++)
+		for(comb = 0; comb < starpu_perfmodel_get_narch_combs(); comb++)
 		{
 			struct starpu_perfmodel_arch *arch_comb = _starpu_arch_comb_get(comb);
 			int nimpls = model->state ? model->state->nimpls[comb] : 0;
@@ -240,7 +240,7 @@ int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char
 			perf_arch.devices[0].type = STARPU_CUDA_WORKER;
 			perf_arch.devices[0].ncores = 1;
 			int comb;
-			for(comb = 0; comb < starpu_get_narch_combs(); comb++)
+			for(comb = 0; comb < starpu_perfmodel_get_narch_combs(); comb++)
 			{
 				struct starpu_perfmodel_arch *arch_comb = _starpu_arch_comb_get(comb);
 				if(arch_comb->ndevices == 1 && arch_comb->devices[0].type == STARPU_CUDA_WORKER)