Skip to content
Snippets Groups Projects
Commit 08870f1d authored by Marcin Kirsz's avatar Marcin Kirsz
Browse files

fix for solver when N > M

parent 4471fd0b
No related branches found
No related tags found
No related merge requests found
Pipeline #43456 failed
Stage: build.debug
    Stage: run.unit.tests
      Stage: build_release
        Stage: trigger
          Hide whitespace changes
          Inline Side-by-side
          Showing
          with 5 additions and 6 deletions
          trainer.h
          + 5
          − 6
          View file @ 08870f1d
          ...@@ -254,7 +254,7 @@ class MPI_Trainer: public Trainer { ...@@ -254,7 +254,7 @@ class MPI_Trainer: public Trainer {
          // Distribute data in 2D block cyclic // Distribute data in 2D block cyclic
          DesignMatrix<DM_Function_Base&> dm2(*fb, config); DesignMatrix<DM_Function_Base&> dm2(*fb, config);
          dm2.Phi.resize(phi_rows2,phi_cols2); dm2.Phi.resize(phi_rows2,phi_cols2);
          dm2.T.resize(phi_rows2); dm2.T.resize(phi_rows2>phi_cols2 ? phi_rows2 : phi_cols2);
          dm2.Tlabels.resize(phi_rows2); dm2.Tlabels.resize(phi_rows2);
          pdgemr2d_(&PHI_rows, &PHI_cols, dm.Phi.ptr(), &ione, &ione, descPHI, pdgemr2d_(&PHI_rows, &PHI_cols, dm.Phi.ptr(), &ione, &ione, descPHI,
          ...@@ -263,20 +263,19 @@ class MPI_Trainer: public Trainer { ...@@ -263,20 +263,19 @@ class MPI_Trainer: public Trainer {
          pdgemr2d_(&PHI_rows, &ione, dm.T.ptr(), &ione, &ione, descB, pdgemr2d_(&PHI_rows, &ione, dm.T.ptr(), &ione, &ione, descB,
          dm2.T.ptr(), &ione, &ione, descB2, &context2); dm2.T.ptr(), &ione, &ione, descB2, &context2);
          double *b2 = dm2.T.ptr();
          double wkopt2; double wkopt2;
          int lwork2 = -1; // query -> get size of the work matrix int lwork2 = -1; // query -> get size of the work matrix
          std::cout << "rank: " << rank << " 1. trans: " << trans << " PHI_cols " << PHI_cols << " PHI_rows " << PHI_rows << "nrhs: " << nrhs << std::endl; std::cout << "rank: " << rank << " 1. trans: " << trans << " PHI_cols " << PHI_cols << " PHI_rows " << PHI_rows << " nrhs: " << nrhs << std::endl;
          pdgels_(&trans, &PHI_rows, &PHI_cols, &nrhs, dm2.Phi.ptr(), &ia, &ja, pdgels_(&trans, &PHI_rows, &PHI_cols, &nrhs, dm2.Phi.ptr(), &ia, &ja,
          descPHI2, b2, &ib, &jb, descB2, &wkopt2, &lwork2, &info2); descPHI2, dm2.T.ptr(), &ib, &jb, descB2, &wkopt2, &lwork2, &info2);
          if (info2 != 0) { if (info2 != 0) {
          printf("Error in pdgels, info = %d\n", info); printf("Error in pdgels, info = %d\n", info);
          } }
          lwork2 = (int)wkopt2; lwork2 = (int)wkopt2;
          double *work2 = new double[lwork2]; double *work2 = new double[lwork2];
          std::cout << "rank: " << rank << " 2. trans: " << trans << " PHI_cols " << PHI_cols << " PHI_rows " << PHI_rows << "nrhs: " << nrhs << std::endl; std::cout << "rank: " << rank << " 2. trans: " << trans << " PHI_cols " << PHI_cols << " PHI_rows " << PHI_rows << " nrhs: " << nrhs << std::endl;
          pdgels_(&trans, &PHI_rows, &PHI_cols, &nrhs, dm2.Phi.ptr(), &ia, &ja, pdgels_(&trans, &PHI_rows, &PHI_cols, &nrhs, dm2.Phi.ptr(), &ia, &ja,
          descPHI2, b2, &ib, &jb, descB2, work2, &lwork2, &info2); descPHI2, dm2.T.ptr(), &ib, &jb, descB2, work2, &lwork2, &info2);
          // get weight vector, for context1 // get weight vector, for context1
          pdgemr2d_(&PHI_rows, &ione, dm2.T.ptr(), &ione, &ione, descB2, pdgemr2d_(&PHI_rows, &ione, dm2.T.ptr(), &ione, &ione, descB2,
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment