浏览代码

rename mvsc to msvc

Nathalie Furmento 11 年之前
父节点
当前提交
701306e64c

+ 2 - 2
ChangeLog

@@ -52,7 +52,7 @@ Small features:
     storing performance models. Available through the new option -d of
     the tool starpu_perfmodel_display
   * New batch files to execute StarPU applications under Microsoft
-    Visual Studio (They are installed in path_to_starpu/bin/mvsc)/
+    Visual Studio (They are installed in path_to_starpu/bin/msvc)/
   * Functions starpu_insert_task and starpu_mpi_insert_task are
     renamed in starpu_task_insert and starpu_mpi_task_insert. Old
     names are kept to avoid breaking old codes.
@@ -227,7 +227,7 @@ Small features:
     storing performance models. Available through the new option -d of
     the tool starpu_perfmodel_display
   * New batch files to execute StarPU applications under Microsoft
-    Visual Studio (They are installed in path_to_starpu/bin/mvsc)/
+    Visual Studio (They are installed in path_to_starpu/bin/msvc)/
   * Add cl_arg_free, callback_arg_free, prologue_callback_arg_free fields to
     enable automatic free(cl_arg); free(callback_arg);
     free(prologue_callback_arg) on task destroy.

+ 5 - 5
INSTALL

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2009-2012  Université de Bordeaux 1
-# Copyright (C) 2010, 2011, 2013  Centre National de la Recherche Scientifique
+# Copyright (C) 2010, 2011, 2013, 2014  Centre National de la Recherche Scientifique
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -220,14 +220,14 @@ Running StarPU Applications on Microsoft Visual C
 -------------------------------------------------
 
 Batch files are provided to run StarPU applications under Microsoft
-Visual C. They are installed in path_to_starpu/bin/mvsc.
+Visual C. They are installed in path_to_starpu/bin/msvc.
 
 To execute a StarPU application, you first need to set the environment
 variable STARPUPATH.
 
 c:\....> cd c:\cygwin\home\ci\starpu\
 c:\....> set STARPUPATH=c:\cygwin\home\ci\starpu\
-c:\....> cd bin\mvsc
+c:\....> cd bin\msvc
 c:\....> starpu_open.bat starpu_simple.c
 
 The batch script will run Microsoft Visual C with a basic project file
@@ -241,10 +241,10 @@ StarPU application from the command prompt.
 
 c:\....> cd c:\cygwin\home\ci\starpu\
 c:\....> set STARPUPATH=c:\cygwin\home\ci\starpu\
-c:\....> cd bin\mvsc
+c:\....> cd bin\msvc
 c:\....> starpu_exec.bat ..\..\..\..\examples\basic_examples\hello_world.c
 
-MVSC StarPU Execution
+MSVC StarPU Execution
 ...
 /out:hello_world.exe
 ...

+ 1 - 1
configure.ac

@@ -2427,7 +2427,7 @@ AC_OUTPUT([
 	doc/doxygen/Makefile
 	doc/doxygen/doxygen-config.cfg
 	doc/doxygen/doxygen_filter.sh
-	tools/mvsc/starpu_var.bat
+	tools/msvc/starpu_var.bat
 ])
 
 AC_MSG_NOTICE([

+ 2 - 2
doc/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2013  Centre National de la Recherche Scientifique
+# Copyright (C) 2013, 2014  Centre National de la Recherche Scientifique
 #
 # Permission is granted to copy, distribute and/or modify this document
 # under the terms of the GNU Free Documentation License, Version 1.3
@@ -15,7 +15,7 @@ endif
 
 EXTRA_DIST =    tutorial/hello_world.c \
 		tutorial/hello_world_plugin.c \
-		tutorial/hello_world_mvsc.c \
+		tutorial/hello_world_msvc.c \
 		tutorial/Makefile \
 		tutorial/README \
 		tutorial/vector_scal.c \

doc/tutorial/hello_world_mvsc.c → doc/tutorial/hello_world_msvc.c


+ 0 - 1
include/starpu_fxt.h

@@ -66,7 +66,6 @@ void starpu_fxt_generate_trace(struct starpu_fxt_options *options);
 void starpu_fxt_start_profiling(void);
 void starpu_fxt_stop_profiling(void);
 void starpu_fxt_write_data_trace(char *filename_in);
-/* Add an event in the execution trace if FxT is enabled */
 void starpu_fxt_trace_user_event(unsigned long code);
 
 #ifdef __cplusplus

+ 14 - 14
tools/Makefile.am

@@ -29,12 +29,12 @@ dist_pkgdata_DATA = gdbinit
 EXTRA_DIST =				\
 	dev/rename.sed			\
 	dev/rename.sh			\
-	mvsc/starpu_clean.bat		\
-	mvsc/starpu_open.bat		\
-	mvsc/starpu_exec.bat		\
-	mvsc/starpu_var.bat		\
-	mvsc/starpu.sln			\
-	mvsc/starpu/starpu.vcxproj
+	msvc/starpu_clean.bat		\
+	msvc/starpu_open.bat		\
+	msvc/starpu_exec.bat		\
+	msvc/starpu_var.bat		\
+	msvc/starpu.sln			\
+	msvc/starpu/starpu.vcxproj
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
 
@@ -125,14 +125,14 @@ dist_bin_SCRIPTS +=			\
 	starpu_codelet_profile
 
 if STARPU_HAVE_WINDOWS
-STARPU_MVSC_dir		 =	$(bindir)
-nobase_STARPU_MVSC__DATA =		\
-	mvsc/starpu_clean.bat		\
-	mvsc/starpu_open.bat		\
-	mvsc/starpu_exec.bat		\
-	mvsc/starpu_var.bat		\
-	mvsc/starpu.sln			\
-	mvsc/starpu/starpu.vcxproj
+STARPU_MSVC_dir		 =	$(bindir)
+nobase_STARPU_MSVC__DATA =		\
+	msvc/starpu_clean.bat		\
+	msvc/starpu_open.bat		\
+	msvc/starpu_exec.bat		\
+	msvc/starpu_var.bat		\
+	msvc/starpu.sln			\
+	msvc/starpu/starpu.vcxproj
 endif
 
 if STARPU_HAVE_HELP2MAN

tools/mvsc/starpu.sln → tools/msvc/starpu.sln


tools/mvsc/starpu/starpu.vcxproj → tools/msvc/starpu/starpu.vcxproj


+ 3 - 3
tools/mvsc/starpu_clean.bat

@@ -2,7 +2,7 @@
 
 REM StarPU --- Runtime system for heterogeneous multicore architectures.
 REM
-REM Copyright (C) 2013  Centre National de la Recherche Scientifique
+REM Copyright (C) 2013, 2014  Centre National de la Recherche Scientifique
 REM
 REM StarPU is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU Lesser General Public License as published by
@@ -15,9 +15,9 @@ REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 REM
 REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-TITLE MVSC StarPU Cleaning
+TITLE MSVC StarPU Cleaning
 ECHO.
-ECHO MVSC StarPU Cleaning
+ECHO MSVC StarPU Cleaning
 ECHO.
 
 FOR %%d in (debug starpu\debug ipch) DO IF EXIST %%d RMDIR /S /Q %%d

+ 3 - 3
tools/mvsc/starpu_exec.bat

@@ -2,7 +2,7 @@
 
 REM StarPU --- Runtime system for heterogeneous multicore architectures.
 REM
-REM Copyright (C) 2013  Centre National de la Recherche Scientifique
+REM Copyright (C) 2013, 2014  Centre National de la Recherche Scientifique
 REM
 REM StarPU is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU Lesser General Public License as published by
@@ -15,9 +15,9 @@ REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 REM
 REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-TITLE MVSC StarPU Execution
+TITLE MSVC StarPU Execution
 ECHO.
-ECHO MVSC StarPU Execution
+ECHO MSVC StarPU Execution
 
 IF "%1" == "" GOTO invalidparam
 IF NOT EXIST %1 GOTO invalidparam

+ 3 - 3
tools/mvsc/starpu_open.bat

@@ -2,7 +2,7 @@
 
 REM StarPU --- Runtime system for heterogeneous multicore architectures.
 REM
-REM Copyright (C) 2013  Centre National de la Recherche Scientifique
+REM Copyright (C) 2013, 2014  Centre National de la Recherche Scientifique
 REM
 REM StarPU is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU Lesser General Public License as published by
@@ -15,9 +15,9 @@ REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 REM
 REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-TITLE MVSC StarPU Execution
+TITLE MSVC StarPU Execution
 ECHO.
-ECHO MVSC StarPU Execution
+ECHO MSVC StarPU Execution
 
 IF NOT EXIST %STARPU_PATH%\AUTHORS GOTO starpunotfound
 

+ 3 - 3
tools/mvsc/starpu_var.bat.in

@@ -2,7 +2,7 @@
 
 REM StarPU --- Runtime system for heterogeneous multicore architectures.
 REM
-REM Copyright (C) 2013  Centre National de la Recherche Scientifique
+REM Copyright (C) 2013, 2014  Centre National de la Recherche Scientifique
 REM
 REM StarPU is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU Lesser General Public License as published by
@@ -15,9 +15,9 @@ REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 REM
 REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-TITLE MVSC StarPU Environment
+TITLE MSVC StarPU Environment
 ECHO.
-ECHO MVSC StarPU Environment
+ECHO MSVC StarPU Environment
 
 IF NOT EXIST %STARPU_PATH%\AUTHORS GOTO starpunotfound