pioder/prir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dane testowe, ustawianie ilosci watkow, usuwanie pamieci, poprawki w alokacji, dane testowe etc.

Browse Source
This commit is contained in:
Piotr Dergun
2016-10-18 00:36:50 +02:00
parent 3be291f00a
commit ec51579e1f
1 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
DergunPiotr-WaskoDominik/zad1/macierz_omp.cpp
View File

@@ -1,18 +1,22 @@
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <stdio.h> #include <cmath>
#include <omp.h>
using namespace std; using namespace std;
void array_alloc(double **arr, long arrsize) void array_alloc(long **&arr, long arrsize)
{ {
try try
{ {
arr = new double* [arrsize]; arr = new long* [arrsize];
arr[0] = new double [arrsize*arrsize];
arr[0] = new long [arrsize*arrsize];
for(long i = 1; i < arrsize; i++) for(long i = 1; i < arrsize; ++i)
arr[i] = arr[i-1] + arrsize; arr[i] = arr[i-1] + arrsize;
} }
catch (bad_alloc& ex) catch (bad_alloc& ex)
{ {
@@ -21,7 +25,7 @@ void array_alloc(double **arr, long arrsize)
} }
} }
void array_destroy(double **arr) void array_destroy(long **arr)
{ {
delete [] arr[0]; delete [] arr[0];
delete [] arr; delete [] arr;
@@ -29,9 +33,10 @@ void array_destroy(double **arr)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
double **A=NULL;//, **B=NULL, **C=NULL; long **A=NULL, **B=NULL, **C=NULL;
long rozmiar=0; long rozmiar=0;
char *endptr; char *endptr;
int threads_num=0;
if (argc < 3) if (argc < 3)
{ {
@@ -52,10 +57,44 @@ int main(int argc, char *argv[])
cerr << "The number of matrix dimension must be positive" << endl; cerr << "The number of matrix dimension must be positive" << endl;
exit(1); exit(1);
} }
threads_num = strtol(argv[1], &endptr, 10);
if (*endptr)
{
cerr << "Invalid number of threads format" << endl;
exit(1);
}
if (threads_num <= 0)
{
cerr << "The number of threads must be positive" << endl;
exit(1);
}
//ustawienie odpowiedniej ilosci watkow
omp_set_num_threads(threads_num);
//alokacja macierzy
array_alloc(A, rozmiar); array_alloc(A, rozmiar);
getchar(); array_alloc(B, rozmiar);
array_alloc(C, rozmiar);
//jeszcze czyszczenie pamięci //wypelnienie macierzy A liczbami "losowymi"
for (long i=0; i<rozmiar; ++i)
for (long j=0; j<rozmiar; ++j)
A[i][j] = (long)(sin(i) * i * j) % 10; // postarac sie to zoptymalizowac!
//wypelnienie macierzy B liczbami "losowymi"
for (long i=0; i<rozmiar; ++i)
for (long j=0; j<rozmiar; ++j)
B[i][j] = (long)(cos(j) *(i+j)) % 10; // postarac sie to zoptymalizowac!
//mnozenie macierzy - TO DO
array_destroy(A);
array_destroy(B);
array_destroy(C);
exit(0); exit(0);
} }