Skip to content

Commit

Permalink
🧐 Added new data
Browse files Browse the repository at this point in the history
  • Loading branch information
OakenKnight committed Jan 29, 2022
1 parent f90770f commit 99bb943
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 24 deletions.
6 changes: 3 additions & 3 deletions code/cuda-fractal.cu
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ __host__ static void run(double xmin, double xmax, double ymin, double ymax, in
}else{
num_of_chanels=1;
}
dim3 numBlocks(width,height*num_of_chanels);
dim3 numBlocks(width*num_of_chanels,height);

cudaError_t err = cudaSuccess;
compute_image_kernel<<<width*num_of_chanels, height>>>(xmin, xmax, ymin, ymax, max_iter, width, height, result, num_of_chanels);
Expand Down Expand Up @@ -163,7 +163,6 @@ int main(int argc, char** argv){
}


char *result = NULL;
clock_t begin = clock();

if(rgb==0){
Expand All @@ -172,7 +171,8 @@ int main(int argc, char** argv){
else{
num_of_chanels=3;
}


char *result = NULL;
err = cudaMalloc(&result, width * height * num_of_chanels * sizeof(char));
checkErr(err, "Failed to allocate result memory on gpu\n");
run(xmin, xmax, ymin, ymax, width, height, max_iter, result, rgb);
Expand Down
5 changes: 5 additions & 0 deletions code/data/cuda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@
475,475,5000,0.202013,1
475,475,10000,0.307125,1
475,475,25000,0.635930,1
490,490,1,0.098281,0
128,128,5000,0.102358,0
256,256,5000,0.131312,0
512,512,5000,0.244554,0
1024,1024,5000,0.600570,0
15 changes: 4 additions & 11 deletions code/data/distributed.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
512,512,10,0.216060
512,512,20,0.233595
512,512,50,0.267299
512,512,100,0.302489
512,512,500,0.633955
512,512,1000,1.076259
512,512,5000,5.135715
512,512,10000,10.481759
512,512,25000,21.092915


1024,1024,10,0.342896,0
1024,1024,20,0.430123,0
1024,1024,50,0.525623,0
Expand All @@ -28,3 +17,7 @@
1024,1024,5000,17.968881,1
1024,1024,10000,36.370190,1
1024,1024,25000,88.385223,1
128,128,5000,0.449109,0
256,256,5000,1.900149,0
512,512,5000,4.684450,0
1024,1024,5000,20.825298,0
14 changes: 4 additions & 10 deletions code/data/seq.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
512,512,10,0.248253
512,512,20,0.368183
512,512,50,0.668297
512,512,100,1.122874
512,512,500,4.668315
512,512,1000,8.839358
512,512,5000,42.123610
512,512,10000,84.236727
512,512,25000,210.643351
1024,1024,10,0.932078,0
1024,1024,20,1.446250,0
1024,1024,10,0.916775,0
Expand All @@ -17,4 +8,7 @@
1024,1024,1000,36.004139,0
1024,1024,5000,173.567248,0
1024,1024,10000,343.800713,0
1024,1024,25000,853.083032,0
1024,1024,25000,853.083032,0128,128,5000,2.772106,0
256,256,5000,10.802276,0
512,512,5000,42.910819,0
1024,1024,5000,169.526222,0
4 changes: 4 additions & 0 deletions code/data/shared.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
1024,1024,5000,25.337006,0
1024,1024,10000,49.603081,0
1024,1024,25000,121.834386,0
128,128,5000,0.373146,0
256,256,5000,1.629261,0
512,512,5000,6.238660,0
1024,1024,5000,27.375434,0
Binary file added distributed-fractal
Binary file not shown.
Binary file added fractal-images/cuda/bw_img128x128_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/cuda/bw_img256x256_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/distributed/bw_img128x128_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/distributed/bw_img256x256_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/distributed/bw_img512x512_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/seq/bw_img128x128_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/seq/bw_img256x256_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/seq/bw_img512x512_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/shared/bw_img128x128_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/shared/bw_img256x256_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fractal-images/shared/bw_img512x512_5000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gpu-fractal
Binary file not shown.
Binary file added seq-fractal
Binary file not shown.
Binary file added shared-fractal
Binary file not shown.

0 comments on commit 99bb943

Please sign in to comment.