diff --git a/bucket_sort.c b/bucket_sort.c
index 1c0b4ff947b7f696d0b2e8ac9eb7ed9731f0158c..151d166cd4220892cb4b20a4fce6226db1f33eb7 100644
--- a/bucket_sort.c
+++ b/bucket_sort.c
@@ -3,7 +3,7 @@
#include <time.h>
#include <omp.h>
#include <assert.h>
-
+#include <time.h>
int *create_rand_nums(int num_elements) {
int *rand_nums = (int *)malloc(sizeof(int) * num_elements);
assert(rand_nums != NULL);
@@ -16,79 +16,130 @@ int *create_rand_nums(int num_elements) {
int main(int argc, char** argv) {
if (argc != 3) {
- fprintf(stderr, "Usage: avg num_elements nuim_thread\n");
+ fprintf(stderr, "Usage: avg num_elements num_threads\n");
+ exit(1);
}
+ //MPI_Status Stat;
srand(time(NULL));
- int world_rank;
- int thread_count;
- int position=0, order=0;
- int i, j, k, l, t, rc, max = -RAND_MAX, min = RAND_MAX;
+ //MPI_Init(NULL, NULL);
+
+ //int world_rank;
+ //MPI_Comm_rank(MPI_COMM_WORLD, &world_rank);
+ //int world_size;
+ //MPI_Comm_size(MPI_COMM_WORLD, &world_size);
+
+ int i, j, k, l, max = -RAND_MAX, min = RAND_MAX;
int total_elements = atoi(argv[1]);
int range;
-
- int my_rank;
- thread_count = atoi(argv[2]);
-
-
- int inmsg[total_elements];
- int bucket[total_elements];
+ int world_size = atoi(argv[2]);
+ //int inmsg[total_elements];
+ int bucket[world_size][total_elements];
int *rand_nums = NULL;
-
- double time_start, time_stop;
-
- rand_nums = create_rand_nums(total_elements);
- for (i = 0; i < total_elements; i++) {
- if (rand_nums[i] > max)
- max = rand_nums[i];
- if (rand_nums[i] < min)
- min = rand_nums[i];
- }
- range = (max - min) / thread_count + ((max - min) % thread_count > 0);
- //time_start = MPI_Wtime();
- //bucketing
- #pragma omp parallel num_threads(thread_count,position,order) shared(rand_nums) private(bucket,i,j,k,my_rank)
- my_rank = omp_get_thread_num();
- for (j = 0; j < total_elements; j++) {
- if ((rand_nums[j] < my_rank * range + range) && (rand_nums[j] >= my_rank * range)) {
- bucket[i] = rand_nums[j];
- i++;
- }
- }
- for (l = i; l < total_elements; l++) {
- bucket[l] = RAND_MAX;
- }
-
- //Sort
- for (k = 0; k < i-1; k++)
- for (j = k+1; j < i; j++)
- if (bucket[k] > bucket[j]) {
- int temp = bucket[k];
- bucket[k] = bucket[j];
- bucket[j] = temp;
+ clock_t time_start, time_stop;
+ time_start = clock();
+ // if (world_rank == 0) {
+ rand_nums = create_rand_nums(total_elements);
+ for (i = 0; i < total_elements; i++) {
+ if (rand_nums[i] > max)
+ max = rand_nums[i];
+ if (rand_nums[i] < min)
+ min = rand_nums[i];
+ printf("%d ",rand_nums[i]);
+ }
+ printf("\n");
+ range = (max - min) / world_size + ((max - min) % world_size > 0);
+ //time_start = MPI_Wtime();
+ for (i = 0; i < world_size; i++) {
+ k = 0;
+ for (j = 0; j < total_elements; j++) {
+ if ((rand_nums[j] < i*range+range) && (rand_nums[j] >= i*range)) {
+ bucket[i][k] = rand_nums[j];
+ k++;
+ }
+ }
+ for (l = k; l < total_elements; l++) {
+ bucket[i][l] = -1;
+ }
+ //rc = MPI_Send(bucket[i], total_elements+1, MPI_INT, i, 1, MPI_COMM_WORLD);
}
- while (order != my_rank);
-
- #pragma omp critical
-
- for (j = 0; j < total_elements; j++) {
- if (bucket[j] >= 0) {
- if (bucket[j] < RAND_MAX) {
- rand_nums[position] = bucket[j];
- position++;
+ for (i = 1 ; i < total_elements-1; i++)// {
+ for (j = i; j < total_elements; j++)
+ if (bucket[0][i] > bucket[0][j]) {
+ int temp = bucket[0][i];
+ bucket[0][i] = bucket[0][j];
+ bucket[0][j] = temp;
+ }
+ /*j = i;
+
+ while ( j > 0 && bucket[0][j] < bucket[0][j-1]) {
+ t = bucket[0][j];
+ bucket[0][j] = bucket[0][j-1];
+ bucket[0][j-1] = t;
+
+ j--;
+ }
+ }*/
+ // } else {
+ //rc = MPI_Recv(inmsg, total_elements+1, MPI_INT, 0, 1, MPI_COMM_WORLD, &Stat);
+ //Sort
+ int thread_count = strtol(argv[2], NULL, 10);
+ #pragma omp parallel for num_threads(thread_count)
+ for(k=0;k<world_size;k++)
+ for (i = 0; i < total_elements-1; i++)
+ for (j = i+1; j < total_elements; j++)
+ if (bucket[k][i] > bucket[k][j]) {
+ int temp = bucket[k][i];
+ bucket[k][i] = bucket[k][j];
+ bucket[k][j] = temp;
+ }
+ /* for (i = 1 ; i < total_elements; i++) {
+ j = i;
+
+ while ( j > 0 && inmsg[j] < inmsg[j-1]) {
+ t = inmsg[j];
+ inmsg[j] = inmsg[j-1];
+ inmsg[j-1] = t;
+
+ j--;
+ }
+ } */
+ //rc = MPI_Send(inmsg, total_elements+1, MPI_INT, 0, 1, MPI_COMM_WORLD);
+ // }
+ // if (world_rank == 0) {
+ k = 0;
+ for (j = 0; j < total_elements; j++) {
+ if (bucket[0][j] >= 0) {
+ rand_nums[k] = bucket[0][j];
+ k++;
}
}
- }
- //time_stop = MPI_Wtime() - time_start;
-
- if (my_rank == 3) {
- for(j=0;j<total_elements;j++){
- printf("%d",rand_nums[j]);
+ for (i = 1; i < world_size; i++) {
+ // rc = MPI_Recv(bucket[i], total_elements+1, MPI_INT, i, 1, MPI_COMM_WORLD, &Stat);
+ for (j = 0; j < total_elements; j++) {
+ if (bucket[i][j] >= 0) {
+ rand_nums[k] = bucket[i][j];
+ k++;
+ }
+ }
}
- free(rand_nums);
-
- //printf("%d processes, %d elements, %.2lf seconds", thread_count, total_elements, time_stop);
+ // time_stop = MPI_Wtime() - time_start;
+
+ for(i=0;i<total_elements;i++){
+ printf("%d ",rand_nums[i]);
}
+ printf("\n");
+ time_stop = clock();
+ double waktu = (double) (time_stop - time_start) / CLOCKS_PER_SEC;
+ //if (world_rank == 0) {
+ free(rand_nums);
+ printf("%d processes, %d elements, %.2lf seconds", world_size, total_elements, waktu);
+ //}
+
+ // MPI_Barrier(MPI_COMM_WORLD);
+ // MPI_Finalize();
}
+
+
diff --git a/bucketsort.c b/bucketsort.c
deleted file mode 100644
index 8f7c19e3edb4b408b4757c694c363832240f4abb..0000000000000000000000000000000000000000
--- a/bucketsort.c
+++ /dev/null
@@ -1,130 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <mpi.h>
-#include <assert.h>
-
-int *create_rand_nums(int num_elements) {
- int *rand_nums = (int *)malloc(sizeof(int) * num_elements);
- assert(rand_nums != NULL);
- int i;
- for (i = 0; i < num_elements; i++) {
- rand_nums[i] = rand() % num_elements;
- }
- return rand_nums;
-}
-
-int main(int argc, char** argv) {
- if (argc != 3) {
- fprintf(stderr, "Usage: avg num_elements num_thread\n");
- }
-
- int world_rank;
-
- int i, j, k, l, t, rc, max = -RAND_MAX, min = RAND_MAX;
- int total_element = atoi(argv[1]);
- int total_thread = atoi(argv[2]);
- int range;
-
- int inmsg[total_elements];
- int bucket[total_elements];
- int *rand_nums = NULL;
-
- //double time_start, time_stop;
- //if (world_rank == 0) {
- rand_nums = create_rand_nums(total_elements);
- for (i = 0; i < total_elements; i++) {
- if (rand_nums[i] > max)
- max = rand_nums[i];
- if (rand_nums[i] < min)
- min = rand_nums[i];
- }
- range = (max - min) / total_thread + ((max - min) % total_thread > 0);
- //time_start = MPI_Wtime();
-
-# pragma omp parallel for schedule(static) default(none) \
- shared(rand_nums) private(i, bucket, j,k) \ num_threads(thread_count)
-
-
-
- for (i = 0; i < total_thread; i++) {
- k = 0;
- for (j = 0; j < total_elements; j++) {
- if ((rand_nums[j] < i*range+range) && (rand_nums[j] >= i*range)) {
- bucket[k] = rand_nums[j];
- k++;
- }
- }
- for (l = k; l < total_elements; l++) {
- bucket[l] = -1;
- }
- //rc = MPI_Send(bucket[i], total_elements+1, MPI_INT, i, 1, MPI_COMM_WORLD);
- }
- for (i = 1 ; i < total_elements-1; i++)// {
- for (j = i; j < total_elements; j++)
- if (bucket[i] > bucket[j]) {
- int temp = bucket[i];
- bucket[i] = bucket[j];
- bucket[j] = temp;
- }
- /*j = i;
-
- while ( j > 0 && bucket[0][j] < bucket[0][j-1]) {
- t = bucket[0][j];
- bucket[0][j] = bucket[0][j-1];
- bucket[0][j-1] = t;
-
- j--;
- }
- }*/
- //} else {
- //rc = MPI_Recv(inmsg, total_elements+1, MPI_INT, 0, 1, MPI_COMM_WORLD, &Stat);
- //Sort
- for (i = 0; i < total_elements-1; i++)
- for (j = i+1; j < total_elements; j++)
- if (bucket[i] > bucket[j]) {
- int temp = bucket[i];
- bucket[i] = bucket[j];
- bucket[j] = temp;
- }
- /* for (i = 1 ; i < total_elements; i++) {
- j = i;
-
- while ( j > 0 && inmsg[j] < inmsg[j-1]) {
- t = inmsg[j];
- inmsg[j] = inmsg[j-1];
- inmsg[j-1] = t;
-
- j--;
- }
- } */
- //rc = MPI_Send(inmsg, total_elements+1, MPI_INT, 0, 1, MPI_COMM_WORLD);
- //}
- //if (world_rank == 0) {
- k = 0;
- for (j = 0; j < total_elements; j++) {
- if (bucket[j] >= 0) {
- rand_nums[k] = bucket[j];
- k++;
- }
- }
- for (i = 1; i < total_thread; i++) {
- //rc = MPI_Recv(bucket[i], total_elements+1, MPI_INT, i, 1, MPI_COMM_WORLD, &Stat);
- for (j = 0; j < total_elements; j++) {
- if (bucket[j] >= 0) {
- rand_nums[k] = bucket[j];
- k++;
- }
- }
- }
- //time_stop = MPI_Wtime() - time_start;
-
- //}
- //if (world_rank == 0) {
- free(rand_nums);
- printf("%d processes, %d elements, %.2lf seconds", total_thread, total_elements/*, time_stop*/);
- //}
-
-}
-
-
diff --git a/main b/main
deleted file mode 100755
index 91b7da3fb8bdd7a99ad1da4ae86fdf1906010917..0000000000000000000000000000000000000000
Binary files a/main and /dev/null differ