diff --git a/README.md b/README.md index dabe446e5a52b5b21a7a5a4e0b9a38051e6b2947..a38a01d30066615e0242d2365b8838ba425ee405 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Untuk menjalankan program serial, ketik command 'make serial'. Untuk menjalankan Tugas dikerjakan bersama-sama -- **Elvina (13517079)** implementasi openmp dari kode serial yang sudah dibuat -- **Saskia Imani (13517142)** implementasi openmp dari kode serial yang sudah dibuat +- **Elvina (13517079)** implementasi CUDA dari kode serial yang sudah dibuat +- **Saskia Imani (13517142)** implementasi CUDA dari kode serial yang sudah dibuat ## Deskripsi Solusi Paralel @@ -90,9 +90,9 @@ Berikut adalah waktu (dalam microsecond) hasil pengujian program seri dan parale #### N = 3000 -- 47533131.000000 -- 48901078.000000 -- 47363284.000000 +- 728158162.000000 +- 744997507.000000 +- 601858115.000000 ## Analisis Kinerja Paralel dan Serial diff --git a/output/parallel_result_3000_1.txt b/output/parallel_result_3000_1.txt index c66f901bd318f21014204da747643f0d9f1e2554..d3ae98fd75a03e96c358b67cdabd11802f1ef333 100644 Binary files a/output/parallel_result_3000_1.txt and b/output/parallel_result_3000_1.txt differ diff --git a/output/parallel_result_3000_2.txt b/output/parallel_result_3000_2.txt index 840c6d6e5b0c877f1faeace7fe4dd290862c9750..c177135a05aea14ab2d8c97ec1109532760e6825 100644 Binary files a/output/parallel_result_3000_2.txt and b/output/parallel_result_3000_2.txt differ diff --git a/output/parallel_result_3000_3.txt b/output/parallel_result_3000_3.txt index b3c82b4ce7ecee1447f90244c6da13580ec297f9..262a6c75c396c623a8e457c2c98b16b5e640ca0f 100644 Binary files a/output/parallel_result_3000_3.txt and b/output/parallel_result_3000_3.txt differ diff --git a/parallel_result_3000_1.txt b/parallel_result_3000_1.txt deleted file mode 100644 index 79b148a0653f0a046ba2feaab454deb07ec83797..0000000000000000000000000000000000000000 Binary files a/parallel_result_3000_1.txt and /dev/null differ diff --git a/parallel_result_3000_2.txt b/parallel_result_3000_2.txt deleted file mode 100644 index c177135a05aea14ab2d8c97ec1109532760e6825..0000000000000000000000000000000000000000 Binary files a/parallel_result_3000_2.txt and /dev/null differ diff --git a/parallel_result_3000_3.txt b/parallel_result_3000_3.txt deleted file mode 100644 index 31746292279e6bfe3a422dfc5faafe1767906915..0000000000000000000000000000000000000000 Binary files a/parallel_result_3000_3.txt and /dev/null differ diff --git a/src/parallel.cu b/src/parallel.cu index 2b44ccd476322882ea3e1a4f8f8e4e70668ca631..82f09b97ad485ad000468ce6b7e01f6442b22a66 100644 --- a/src/parallel.cu +++ b/src/parallel.cu @@ -79,6 +79,7 @@ void dijkstra(int n, int sub_n, long matrix[], long result[]) { int main (int argc, char **argv) { long *matrix, *result; // Matrix size i * j of distance from vertice [i] to vertice [j] int n; // Number of vertices + int num_blocks, num_threads; // int my_rank, thread_count, sub_n; clock_t start, end; double cpu_time_used; @@ -135,12 +136,12 @@ __device__ void write_output(long matrix[], int n_row, int n_col, double time) { FILE * file; file = fopen (OUTPUT_FILE_PATH,"w"); - for (int i = 0; i < n_row; i++) { + /*for (int i = 0; i < n_row; i++) { for (int j = 0; j < n_col; j++) { fprintf(file, "%ld ", matrix[i * n_col + j]); } fprintf(file, "\n"); - } + }*/ fprintf(file, "Process finished in %f microseconds.\n", time); fclose (file); }