瀏覽代碼

StarPU: Use character _ instead of - in filenames

Nathalie Furmento 15 年之前
父節點
當前提交
5218cd2639

+ 17 - 17
examples/Makefile.am

@@ -111,13 +111,13 @@ noinst_HEADERS = 				\
 	mult/gordon/func_sgemm_ibm.h		\
 	cuda/incrementer_cuda.h			\
 	gordon/null.h				\
-	fortran/bindings/StarPU-fortran.h	\
-	ppm-downscaler/ppm-downscaler.h		\
-	ppm-downscaler/yuv-downscaler.h		\
+	fortran/bindings/StarPU_fortran.h	\
+	ppm_downscaler/ppm_downscaler.h		\
+	ppm_downscaler/yuv_downscaler.h		\
 	strassen/strassen.h			\
 	strassen/strassen_models.h		\
-	spmv/matrix-market/mmio.h		\
-	spmv/matrix-market/mm_to_bcsr.h		\
+	spmv/matrix_market/mmio.h		\
+	spmv/matrix_market/mm_to_bcsr.h		\
 	spmv/dw_spmv.h				\
 	spmv/dw_block_spmv.h
 
@@ -127,38 +127,38 @@ noinst_HEADERS = 				\
 ##################
 
 examplebin_PROGRAMS +=				\
-	basic-examples/hello-world
+	basic_examples/hello_world
 
 basic_examples_hello_world_SOURCES =		\
-	basic-examples/hello-world.c
+	basic_examples/hello_world.c
 
 examplebin_PROGRAMS +=				\
-	basic-examples/vector-scal
+	basic_examples/vector_scal
 
 basic_examples_vector_scal_SOURCES =		\
-	basic-examples/vector-scal.c
+	basic_examples/vector_scal.c
 
 examplebin_PROGRAMS +=				\
-	basic-examples/mult
+	basic_examples/mult
 
 basic_examples_mult_SOURCES =			\
-	basic-examples/mult.c
+	basic_examples/mult.c
 
 ###################
 # PPM downscaling #
 ###################
 
 examplebin_PROGRAMS +=				\
-	ppm-downscaler/ppm-downscaler
+	ppm_downscaler/ppm_downscaler
 
 ppm_downscaler_ppm_downscaler_SOURCES =		\
-	ppm-downscaler/ppm-downscaler.c
+	ppm_downscaler/ppm_downscaler.c
 
 examplebin_PROGRAMS +=				\
-	ppm-downscaler/yuv-downscaler
+	ppm_downscaler/yuv_downscaler
 
 ppm_downscaler_yuv_downscaler_SOURCES =		\
-	ppm-downscaler/yuv-downscaler.c
+	ppm_downscaler/yuv_downscaler.c
 
 ######
 # Pi #
@@ -395,8 +395,8 @@ endif
 spmv_dw_block_spmv_SOURCES =			\
 	spmv/dw_block_spmv.c			\
 	spmv/dw_block_spmv_kernels.c		\
-	spmv/matrix-market/mm_to_bcsr.c		\
-	spmv/matrix-market/mmio.c
+	spmv/matrix_market/mm_to_bcsr.c		\
+	spmv/matrix_market/mmio.c
 
 endif
 

+ 5 - 5
examples/audio/Makefile

@@ -6,15 +6,15 @@ CFLAGS+=$$(pkg-config --cflags libstarpu)
 LIBS+=$$(pkg-config --libs fftw3f)
 CFLAGS+=$$(pkg-config --cflags fftw3f)
 
-all: starpu-audio-processing
+all: starpu_audio_processing
 
-starpu-audio-processing.o: starpu-audio-processing.c
+starpu_audio_processing.o: starpu_audio_processing.c
 
-starpu-audio-processing: starpu-audio-processing.o
-	$(CC) $(LDFLAGS) starpu-audio-processing.o -o starpu-audio-processing $(LIBS)
+starpu_audio_processing: starpu_audio_processing.o
+	$(CC) $(LDFLAGS) starpu_audio_processing.o -o starpu_audio_processing $(LIBS)
 
 clean:
 	rm -f *.o
-	rm -f starpu-audio-processing
+	rm -f starpu_audio_processing
 	rm -f input.dat input.raw
 	rm -f output.dat output.wav output.raw

examples/audio/starpu-audio-processing.c → examples/audio/starpu_audio_processing.c


examples/basic-examples/hello-world.c → examples/basic-examples/hello_world.c


examples/basic-examples/vector-scal.c → examples/basic-examples/vector_scal.c


+ 2 - 2
examples/fortran/bindings/Makefile

@@ -20,9 +20,9 @@ FFLAGS+= -g -Wall
 
 all: hello
 
-hello.F: StarPU-fortran.h
+hello.F: StarPU_fortran.h
 
-hello: hello.F hello-c.o
+hello: hello.F hello_c.o
 
 clean:
 	rm -f *.o *.mod hello

examples/fortran/bindings/StarPU-fortran.h → examples/fortran/bindings/StarPU_fortran.h


+ 1 - 1
examples/fortran/bindings/hello.F

@@ -14,7 +14,7 @@ C
 C See the GNU Lesser General Public License in COPYING.LGPL for more details.
 C
 
-#include "StarPU-fortran.h"
+#include "StarPU_fortran.h"
       
       SUBROUTINE HELLOSUB(X)
           INTEGER :: X

examples/fortran/bindings/hello-c.c → examples/fortran/bindings/hello_c.c


+ 1 - 1
examples/ppm-downscaler/ppm-downscaler.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "ppm-downscaler.h"
+#include "ppm_downscaler.h"
 
 #include <starpu.h>
 

examples/ppm-downscaler/ppm-downscaler.h → examples/ppm-downscaler/ppm_downscaler.h


+ 3 - 3
examples/ppm-downscaler/yuv-downscaler.c

@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "yuv-downscaler.h"
+#include "yuv_downscaler.h"
 
 struct timeval start;
 struct timeval end;
@@ -40,8 +40,8 @@ void parse_args(int argc, char **argv)
 		strcpy(filename_out, argv[2]);
 	}
 	else {
-		sprintf(filename_in, "%s/examples/ppm-downscaler/%s", STARPU_DIR, filename_in_default);
-		sprintf(filename_out, "%s/examples/ppm-downscaler/%s", STARPU_DIR, filename_out_default);
+		sprintf(filename_in, "%s/examples/ppm_downscaler/%s", STARPU_DIR, filename_in_default);
+		sprintf(filename_out, "%s/examples/ppm_downscaler/%s", STARPU_DIR, filename_out_default);
 	}
 }
 

examples/ppm-downscaler/yuv-downscaler.h → examples/ppm-downscaler/yuv_downscaler.h


+ 2 - 2
examples/starpufft/Makefile.am

@@ -34,7 +34,7 @@ EXTRA_DIST =			\
 	testf_threads.c		\
 	test_threads.c
 
-libstarpufft_la_SOURCES = starpufft.c starpufftf.c starpufft-common.c
+libstarpufft_la_SOURCES = starpufft.c starpufftf.c starpufft_common.c
 libstarpufft_la_LIBADD = $(top_builddir)/src/libstarpu.la $(FFTW_LIBS) $(FFTWF_LIBS)
 libstarpufft_la_CFLAGS = $(FFTWF_CFLAGS)
 
@@ -47,7 +47,7 @@ cudaf_kernels.o: cudaf_kernels.cu
 	$(NVCC) $(AM_CPPFLAGS) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I${includedir}
 
 libstarpufft_la_SOURCES += cudaf_kernels.cu
-am_libstarpufft_la_OBJECTS = cudaf_kernels.o starpufftf.lo starpufft-common.lo
+am_libstarpufft_la_OBJECTS = cudaf_kernels.o starpufftf.lo starpufft_common.lo
 
 if STARPU_HAVE_CUFFTDOUBLECOMPLEX
 cuda_kernels.o: cuda_kernels.cu

examples/starpufft/starpufft-common.c → examples/starpufft/starpufft_common.c