From b901e8385ebb2e395a31dd878cf7c19cfeea31e2 Mon Sep 17 00:00:00 2001
From: "nicolas.marie" <nicolas.marie@ensiie.eu>
Date: Mon, 18 Dec 2023 18:50:50 +0100
Subject: [PATCH] TP4 partie1
---
TPs/TP4/CODE/Partie1/Makefile | 6 +++---
TPs/TP4/CODE/Partie1/mpi_cuda_addvector.cu | 3 ---
TPs/TP4/CODE/Partie1/openmp_cuda_addvector.cu | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/TPs/TP4/CODE/Partie1/Makefile b/TPs/TP4/CODE/Partie1/Makefile
index 825a917..55800e9 100755
--- a/TPs/TP4/CODE/Partie1/Makefile
+++ b/TPs/TP4/CODE/Partie1/Makefile
@@ -17,10 +17,10 @@ openmp_%.pgr: openmp_%.cu
mpi: mpi_cuda_addvector.pgr
mpi_%.pgr: mpi_%.cu
- $(CC) $< -o $@ $(MPILIB) $(MPIINC)
-
-
+ $(CC) $< -o $@ $(MPILIB) $(MPIINC) #-ccbin "/usr/bin/mpic++"
clean:
rm -rf *.pgr
+
+
diff --git a/TPs/TP4/CODE/Partie1/mpi_cuda_addvector.cu b/TPs/TP4/CODE/Partie1/mpi_cuda_addvector.cu
index 1f1dbfc..cf6b02f 100755
--- a/TPs/TP4/CODE/Partie1/mpi_cuda_addvector.cu
+++ b/TPs/TP4/CODE/Partie1/mpi_cuda_addvector.cu
@@ -6,9 +6,6 @@
#define TSIZE 1024
-
-
-
__global__ void addVector(int * tab_a, int * tab_b, int * tab_c)
{
int index;
diff --git a/TPs/TP4/CODE/Partie1/openmp_cuda_addvector.cu b/TPs/TP4/CODE/Partie1/openmp_cuda_addvector.cu
index 332777d..6beecb7 100755
--- a/TPs/TP4/CODE/Partie1/openmp_cuda_addvector.cu
+++ b/TPs/TP4/CODE/Partie1/openmp_cuda_addvector.cu
@@ -53,7 +53,7 @@ int main(int argc, char*argv[])
#pragma omp parallel
{
- size=omp_get_thread_num();
+ size=omp_get_num_threads();
}
tab_a = (int *)malloc(sizeof(int)*TSIZE*size);
--
GitLab