resolve conflicts

pghysels · Aug 23, 2023 · d100713 · d100713
1 parent 9faa15f
commit d100713
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/src/BLR/BLRMatrixMPI.GPU.cpp b/src/BLR/BLRMatrixMPI.GPU.cpp
@@ -114,10 +114,6 @@ namespace strumpack {
       msg_size = ranks.back();
 
       if (spopts.use_gpu_aware_mpi()) {
-<<<<<<< HEAD
-=======
-        std::cout << "bcast_row - gpu aware" << std::endl;
->>>>>>> 5bd891642cd78af3a69cd1593d6b685049789e26
         // assert(pinned_size >= msg_size);
         // gpu::DeviceMemory<scalar_t> dpinptr(msg_size);
         auto dbytes = workspace.get_device_bytes(msg_size*sizeof(scalar_t));
@@ -245,10 +241,6 @@ namespace strumpack {
       msg_size = ranks.back();
       // assert(pinned.size() >= msg_size);
       if (spopts.use_gpu_aware_mpi()){
-<<<<<<< HEAD
-=======
-        std::cout << "bcast_col - gpu aware" << std::endl;
->>>>>>> 5bd891642cd78af3a69cd1593d6b685049789e26
         //gpu::DeviceMemory<scalar_t> dpinptr(msg_size);
         //scalar_t *ptr = dpinptr.template as<scalar_t>();
         auto dbytes = workspace.get_device_bytes(msg_size*sizeof(scalar_t));
@@ -421,12 +413,7 @@ namespace strumpack {
         DenseTile<scalar_t> Tii;
         for (std::size_t i=0; i<rb; i++) {
           auto mi = A11.tilerows(i);
-<<<<<<< HEAD
           Tii = DenseTile<scalar_t>(DenseMW_t(mi, mi, dcol1, mi););
-=======
-          DenseMW_t test(mi, mi, dcol1, mi);
-          Tii = DenseTile<scalar_t>(test);
->>>>>>> 5bd891642cd78af3a69cd1593d6b685049789e26
           if (g->is_local_row(i)) {
             piv_tile.resize(mi);
             if (g->is_local_col(i)) {