Commit 75337c24 authored by Doak, Peter W.'s avatar Doak, Peter W.
Browse files

fixing test build issues on summit

parent ddf28be3

include/dca/linalg/util/memory.hpp

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
#include "dca/linalg/util/gpu_stream.hpp"

#include "dca/util/ignore.hpp"



#ifdef DCA_HAVE_GPU

#include "dca/linalg/util/gpu_type_mapping.hpp"

#endif



namespace dca {

namespace linalg {

namespace util {

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_interband/bilayer_lattice_Nc1_interband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -51,10 +51,11 @@ TEST(bilayerLattice_Nc1_interband, Self_Energy) { 
  using LatticeType = dca::phys::models::bilayer_lattice<DcaPointGroupType>;

  using ModelType = dca::phys::models::TightBindingModel<LatticeType>;

  using Threading = dca::parallel::NoThreading;

  using Scalar = double;

  using ParametersType =

      dca::phys::params::Parameters<dca::testing::DcaMpiTestEnvironment::ConcurrencyType, Threading,

                                    dca::profiling::NullProfiler, ModelType, RngType,

                                    dca::ClusterSolverId::CT_AUX>;

                                    dca::ClusterSolverId::CT_AUX,dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>;

  using DcaDataType = dca::phys::DcaData<ParametersType>;

  using QmcSolverType =

      dca::phys::solver::CtauxClusterSolver<dca::linalg::CPU, ParametersType, DcaDataType>;

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intra_plus_interband/bilayer_lattice_Nc1_intra_plus_interband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -51,10 +51,11 @@ TEST(bilayerLattice_Nc1_intra_plus_interband, Self_Energy) { 
  using LatticeType = dca::phys::models::bilayer_lattice<DcaPointGroupType>;

  using ModelType = dca::phys::models::TightBindingModel<LatticeType>;

  using Threading = dca::parallel::NoThreading;

  using Scalar = double;

  using ParametersType =

      dca::phys::params::Parameters<dca::testing::DcaMpiTestEnvironment::ConcurrencyType, Threading,

                                    dca::profiling::NullProfiler, ModelType, RngType,

                                    dca::ClusterSolverId::CT_AUX>;

                                    dca::ClusterSolverId::CT_AUX, dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>;

  using DcaDataType = dca::phys::DcaData<ParametersType>;

  using QmcSolverType =

      dca::phys::solver::CtauxClusterSolver<dca::linalg::CPU, ParametersType, DcaDataType>;

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intraband/bilayer_lattice_Nc1_intraband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -51,10 +51,11 @@ TEST(bilayerLattice_Nc1_intraband, Self_Energy) { 
  using LatticeType = dca::phys::models::bilayer_lattice<DcaPointGroupType>;

  using ModelType = dca::phys::models::TightBindingModel<LatticeType>;

  using Threading = dca::parallel::NoThreading;

  using Scalar = double;

  using ParametersType =

      dca::phys::params::Parameters<dca::testing::DcaMpiTestEnvironment::ConcurrencyType, Threading,

                                    dca::profiling::NullProfiler, ModelType, RngType,

                                    dca::ClusterSolverId::CT_AUX>;

                                    dca::ClusterSolverId::CT_AUX, dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>;

  using DcaDataType = dca::phys::DcaData<ParametersType>;

  using QmcSolverType =

      dca::phys::solver::CtauxClusterSolver<dca::linalg::CPU, ParametersType, DcaDataType>;

test/integration/coarsegraining/coarsegraining_test.cpp

+13 −7
Original line number Diff line number Diff line
@@ -57,13 +57,17 @@ using Model1 = dca::phys::models::TightBindingModel< 
using Model2 = dca::phys::models::TightBindingModel<

    dca::phys::models::twoband_chain<dca::phys::domains::no_symmetry<2>>>;



using Scalar = double;



#ifdef UPDATE_BASELINE

using Parameters = dca::phys::params::Parameters<Concurrency, Threading, dca::profiling::NullProfiler,

                                                 Model1, void, dca::ClusterSolverId::CT_AUX>;

                                                 Model1, void, dca::ClusterSolverId::CT_AUX, dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>>;

const std::string input = input_dir + "input_singleband.json";

#else

using Parameters = dca::phys::params::Parameters<Concurrency, Threading, dca::profiling::NullProfiler,

                                                 Model2, void, dca::ClusterSolverId::CT_AUX>;

using Parameters =

    dca::phys::params::Parameters<Concurrency, Threading, dca::profiling::NullProfiler, Model2,

                                  void, dca::ClusterSolverId::CT_AUX,

                                  dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>;

const std::string input = input_dir + "input_bilayer.json";

#endif  // UPDATE_BASELINE
@@ -158,8 +162,9 @@ void performTest(const bool test_dca_plus) { 
          auto real_grw = data.G_r_w(r % 2, s, 0, s, r / 2, w);

          auto test_grw = G_check(0, s, 0, s, r, w);

          double thresh = 1e-6;

          EXPECT_LE(std::abs(real_grw - test_grw), thresh) << data.G_r_w(r % 2, s, 0, s, r / 2, w) << " - "

                                               << G_check(0, s, 0, s, r, w) << " > " << thresh;

          EXPECT_LE(std::abs(real_grw - test_grw), thresh)

              << data.G_r_w(r % 2, s, 0, s, r / 2, w) << " - " << G_check(0, s, 0, s, r, w) << " > "

              << thresh;

        }

#endif  // UPDATE_BASELINE

  }
@@ -195,7 +200,8 @@ void computeMockSigma(SigmaType& Sigma) { 
int main(int argc, char** argv) {

  int result = 0;



  std::cout << "This Test is not portable.  Currently passes on summit with build-aux std version\nFails almost everywherer else.";

  std::cout << "This Test is not portable.  Currently passes on summit with build-aux std "

               "version\nFails almost everywherer else.";



  ::testing::InitGoogleTest(&argc, argv);