diff --git a/src/scripts/compilation.sh b/src/scripts/compilation.sh index a8a0cba..5f1ece9 100755 --- a/src/scripts/compilation.sh +++ b/src/scripts/compilation.sh @@ -5,6 +5,7 @@ WD=$PWD cd $BUILDDIR/.. make all +make build/cnn_cuda_matrix_multiplication.o cd $WD echo "Compiling matrix_multiplication_benchmark.cu" @@ -14,9 +15,9 @@ nvcc -ljpeg \ "$BUILDDIR/"cuda_utils.o \ -o benchmark-matrix-multiplication -echo "Compiling matrix_multiplication_benchmark.cu" +echo "Compiling convolution_benchmark.cu" nvcc -ljpeg \ convolution_benchmark.cu \ - "$BUILDDIR/"cnn_cuda_matrix_multiplication.o \ + "$BUILDDIR/"cnn_cuda_convolution.o \ "$BUILDDIR/"cuda_utils.o \ -o benchmark-convolution \ No newline at end of file diff --git a/src/scripts/convolution_benchmark.cu b/src/scripts/convolution_benchmark.cu index 4bc6053..9dbefe6 100644 --- a/src/scripts/convolution_benchmark.cu +++ b/src/scripts/convolution_benchmark.cu @@ -150,7 +150,7 @@ void run_convolution_test(int input_dim, int output_dim, int rows, int columns) end = clock(); cpu_time_used = ((double) (end - start)) / CLOCKS_PER_SEC; - printf("CPU: %lf\n", rows, columns, input_dim, output_dim, cpu_time_used); + printf("CPU: %lf\n", cpu_time_used); // Vérification de l'égalité des matrices //printf("(%d, %d, %d, %d) Checking equality.\n", rows, columns, input_dim, output_dim);