Просмотр исходного кода

StarPU: Use character _ instead of - in filenames

Nathalie Furmento лет назад: 15
Родитель
Сommit
b5042f1ecb

+ 2 - 2
doc/Gantt

@@ -18,8 +18,8 @@ Step 3 - Execute applications as usual
 - If the application was properly terminated (ie. starpu_shutdown was called),
   there should be a file named "/tmp/prof_file_user_".
 
-- Call tools/fxt-tool on that file
-	./tools/fxt-tool -i /tmp/prof_file_user_yourlogin
+- Call tools/fxt_tool on that file
+	./tools/fxt_tool -i /tmp/prof_file_user_yourlogin
 
 - Some files should have been created in the current directory
 	- paje.trace : A Gantt diagram of the execution

+ 5 - 5
tools/Makefile.am

@@ -28,15 +28,15 @@ bin_PROGRAMS += calibrate_bus
 calibrate_bus_SOURCES = calibrate_bus.c
 
 if STARPU_USE_FXT
-bin_PROGRAMS += fxt-tool fxt-stats
+bin_PROGRAMS += fxt_tool fxt_stats
 
-fxt_tool_SOURCES = fxt-tool.c fxt-tool-common.c fxt-tool-mpi.c dag-dot.c histo-paje.c
+fxt_tool_SOURCES = fxt_tool.c fxt_tool_common.c fxt_tool_mpi.c dag_dot.c histo_paje.c
 fxt_tool_CFLAGS = -I$(top_srcdir)/src/
 fxt_tool_LDADD = 
 
-fxt_stats_SOURCES = fxt-stats.c
+fxt_stats_SOURCES = fxt_stats.c
 fxt_stats_CFLAGS = -I$(top_srcdir)/src/
 endif
 
-bin_PROGRAMS +=	perfmodel-display
-perfmodel_display_SOURCES = perfmodel-display.c
+bin_PROGRAMS +=	perfmodel_display
+perfmodel_display_SOURCES = perfmodel_display.c

+ 1 - 1
tools/dag-dot.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "fxt-tool.h"
+#include "fxt_tool.h"
 
 static char *out_path = "dag.dot";
 static FILE *out_file;

+ 1 - 1
tools/fxt-stats.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "fxt-tool.h"
+#include "fxt_tool.h"
 
 static fxt_t fut;
 struct fxt_ev_64 ev;

+ 2 - 2
tools/fxt-tool.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "fxt-tool.h"
+#include "fxt_tool.h"
 
 /*
  *	Default user options
@@ -534,7 +534,7 @@ static void handle_mpi_irecv_end(void)
 
 static void parse_args(int argc, char **argv)
 {
-	/* We want to support arguments such as "fxt-tool -i trace_*" */
+	/* We want to support arguments such as "fxt_tool -i trace_*" */
 	unsigned reading_input_filenames = 0;
 
 	int i;

+ 1 - 1
tools/fxt-tool.h

@@ -30,7 +30,7 @@
 #include <common/list.h>
 #include <starpu_mpi_fxt.h>
 
-#include "histo-paje.h"
+#include "histo_paje.h"
 
 #define MAXWORKERS      32
 #define FACTOR  100

+ 1 - 1
tools/fxt-tool-common.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "fxt-tool.h"
+#include "fxt_tool.h"
 
 static char *cpus_worker_colors[MAXWORKERS] = {"/greens9/7", "/greens9/6", "/greens9/5", "/greens9/4",  "/greens9/9", "/greens9/3",  "/greens9/2",  "/greens9/1"  };
 static char *cuda_worker_colors[MAXWORKERS] = {"/ylorrd9/9", "/ylorrd9/6", "/ylorrd9/3", "/ylorrd9/1", "/ylorrd9/8", "/ylorrd9/7", "/ylorrd9/4", "/ylorrd9/2",  "/ylorrd9/1"};

+ 1 - 1
tools/fxt-tool-mpi.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "fxt-tool.h"
+#include "fxt_tool.h"
 
 /* Returns 0 if a barrier is found, -1 otherwise. In case of success, offset is
  * filled with the timestamp of the barrier */

+ 1 - 1
tools/histo.sh

@@ -18,7 +18,7 @@
 
 
 # generate the input data
-./fxt-tool $1
+./fxt_tool $1
 
 # generate the gnuplot script 
 echo "#!/usr/bin/gnuplot -persist" 			> histo.gp

+ 1 - 1
tools/histo-paje.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "histo-paje.h"
+#include "histo_paje.h"
 
 void write_paje_header(FILE *file)
 {

tools/histo-paje.h → tools/histo_paje.h


tools/perfmodel-display.c → tools/perfmodel_display.c


+ 2 - 2
tools/perfmodel-display-gnuplot.sh

@@ -68,7 +68,7 @@ EOF
 
 }
 
-PERFMODELDISPLAY=./perfmodel-display
+PERFMODELDISPLAY=./perfmodel_display
 
 function gnuplot_symbol()
 {
@@ -76,7 +76,7 @@ symbol=$1
 
 echo "Display symbol $symbol"
 
-# TODO check return value $? of perfmodel-display to ensure we have valid data
+# TODO check return value $? of perfmodel_display to ensure we have valid data
 cuda_a=`$PERFMODELDISPLAY -s $symbol -a cuda -p a`
 cuda_b=`$PERFMODELDISPLAY -s $symbol -a cuda -p b`
 cuda_c=`$PERFMODELDISPLAY -s $symbol -a cuda -p c`