fixed samplesort

added samplesort reading from file

Author: zonagit

makefile

@@ -9,19 +9,19 @@ CFLAGS=-I.
 %.o: %.cpp
 				$(CXX) -c -o $@ $< $(CFLAGS)
 
-all: samplesort seqsort
+all: samplesortdisk samplesort seqsort
 
 seqsort: seqsort.o 
 			  $(LINK) -o $@ $< 
 
 samplesort: samplesort.o 
 			  $(LINK) -o $@ $< 
-#data: data.o 
-#			  $(LINK) -o $@ $< 
+samplesortdisk: samplesortdisk.o 
+			  $(LINK) -o $@ $< 
 
 
 #select: select.o 
 #			  $(LINK) -o $@ $< 
 
 clean:
-	rm -f *.o *~ seqsort samplesort
+	rm -f *.o *~ seqsort samplesort samplesortdisk

samplesort.c

@@ -7,8 +7,8 @@
 #define DEBUG_INITIAL_SORT 0
 #define DEBUG_SPLITTERS 0
 #define DEBUG_BUCKETS 0
-#define DEBUG_FINAL_SORT 1
-#define USE_SMALL_ARRAY 1
+#define DEBUG_FINAL_SORT 0
+#define USE_SMALL_ARRAY 0
 
 char * ws;//strong or weak scaling indicator
 int rank,npes, root =0; 
@@ -147,17 +147,17 @@ void samplesort(long int *a,size_t count,size_t size,int (compare)(const void *,
 
 #if DEBUG_BUCKETS
   for (i=0;i<count;i++) {
-    printf("Element in rank:%d %d %lu\n",rank,i,a[i]);
+    printf("rank=%d i=%d a[i]=%lu\n",rank,i,a[i]);
   }
   MPI_Barrier(comm);
   for (i=0;i<npes;i++){
-    printf("Counts in rank:%d %lu %lu\n",rank,global_splitters[i],send_counts[i]);
+    printf("rank=%d global_splitters[i]=%lu send_counts[i]=%lu\n",rank,global_splitters[i],send_counts[i]);
   }
 #endif
   recv_counts = (int *) malloc(npes*sizeof(int));
   //each processor now tells each other how many elements they will recieve
   //i.e. how many elements are in their bucket
-  MPI_Alltoall(send_counts,1,MPI_LONG,recv_counts,1,MPI_LONG,comm);
+  MPI_Alltoall(send_counts,1,MPI_INT,recv_counts,1,MPI_INT,comm);
   //imagine npes=3. Then
   //process 0: recv_counts[0]=send_counts[0] from p0,
   //recv_counts[1]=send_counts[0] from p1,recv_counts[2]=send_counts[0]
@@ -167,7 +167,7 @@ void samplesort(long int *a,size_t count,size_t size,int (compare)(const void *,
 #if DEBUG_BUCKETS
   MPI_Barrier(comm);
   for (i=0;i<npes;i++){
-    printf("%d %lu %lu\n",rank,send_counts[i],recv_counts[i]);
+    printf("rank=%d send_counts=%lu recv_counts=%lu\n",rank,send_counts[i],recv_counts[i]);
 }
 #endif
   //The processors now have to send the proper elements to each other.
@@ -184,14 +184,10 @@ void samplesort(long int *a,size_t count,size_t size,int (compare)(const void *,
 
     recv_offsets[i] = j;
     j += recv_counts[i];
-    printf("recv_counts %d %d\n",rank,recv_counts[i]);
   }
   //buckets have different sizes given by j 
-  printf("jj %d %d\n",rank,j);
-  for (i =0;i<(npes-1);i++)
-    printf("%d %d\n",rank,global_splitters[i]);
   buckets = (long int *)malloc (j*size);
-  // MPI_Alltoallv(a,send_counts,send_offsets,MPI_LONG,buckets,recv_counts,recv_offsets,MPI_LONG,comm);
+  MPI_Alltoallv(a,send_counts,send_offsets,MPI_LONG,buckets,recv_counts,recv_offsets,MPI_LONG,comm);
   //alltoallv: Imagine sends for p0, send_counts[0]=5,send_counts[1]=2,
   //send_counts[2]=7. Then a[0-4] from p0 goes to buckets[0-4] of p0
   //a[5-6] from p0 goes to buckets[0-1] of p1 and a[7-13] from p0 goes to
@@ -211,13 +207,23 @@ void samplesort(long int *a,size_t count,size_t size,int (compare)(const void *,
   }
   MPI_Barrier(comm);
   for (i=0;i<j;i++) {
-    printf("Rank:%d buckets[i]=%lu\n",rank,buckets[i]);
+    printf("Rank:%d i=%lu buckets[i]=%lu\n",rank,i,buckets[i]);
   }
+  MPI_Barrier(comm);
 #endif
-  /*  for (i=0;i<psize;i++) {
-    printf("Rank after %d %lu\n",rank,a[i]);
-    }*/
-  
+  /*//Gather at the root the lengths of all the buckets
+   MPI_Gather(&j,1,MPI_LONG,recv_counts,1,MPI_LONG,root,comm);
+  //Compute index offsets where to put the bucket elements
+  if (rank == root) {
+    k = 0;
+    for (i=0;i<count;i++) {
+      recv_offsets[i]=k;
+      k += recv_counts[i];
+    }
+    //gather sorted data
+    */
+  //Now we have to put all the buckets together in the original array a
+ 
   free(local_splitters);
   free(all_splitters);
   free(global_splitters);
@@ -226,7 +232,7 @@ void samplesort(long int *a,size_t count,size_t size,int (compare)(const void *,
   free(recv_counts);
   free(send_offsets);
   free(recv_offsets);
-  free(buckets);
+  //free(buckets);
 }
 
 void sort(long int n)
@@ -258,9 +264,12 @@ void sort(long int n)
     a[i] = rand_interval(rank,rank*2+30);
   }   
 #endif
+  double t1,t2;
+  t1 = MPI_Wtime();
   samplesort(a,psize,sizeof(long int),compare,MPI_COMM_WORLD);
-
-  free(a);
+  t2 = MPI_Wtime();
+  printf("Time elapsed in rank %d was %f\n",rank, t2-t1);
+  //free(a);
 }
 
 int main(int argc,char** argv)
@@ -303,5 +312,4 @@ int main(int argc,char** argv)
   //Finalize
   MPI_Finalize();
   return 0;
-}
-
+}