Commit 8d2e3d3d authored by gbalduzz's avatar gbalduzz
Browse files

test cleanup

parent 7603179b

build-aux/daint_gpu.cmake

+1 −2
Original line number Diff line number Diff line
@@ -22,5 +22,4 @@ set(MAGMA_DIR $ENV{MAGMAROOT} CACHE PATH 




# Intel MKL flags

set(CMAKE_EXE_LINKER_FLAGS '-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64

    -lmkl_sequential -lmkl_core -lpthread -lm -ldl')
 
set(CMAKE_EXE_LINKER_FLAGS '-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl' CACHE INTERNAL "" FORCE)

test/integration/cluster_solver/ss_ct_hyb/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
set(TEST_INCLUDES )

set(TEST_LIBRARIES ${DCA_LIBS} ${DCA_CUDA_LIBS} statistical_testing)

set(TEST_LIBRARIES ${DCA_LIBS} ${DCA_CUDA_LIBS})



dca_add_gtest(NiO_no_change_test

    GTEST_MAIN

    EXTENSIVE

    MPI MPI_NUMPROC 2

    INCLUDE_DIRS ${DCA_INCLUDE_DIRS};${PROJECT_SOURCE_DIR}

test/integration/cluster_solver/ss_ct_hyb/NiO_no_change_test.cpp

+26 −3
Original line number Diff line number Diff line
@@ -23,15 +23,18 @@ 
#include "dca/phys/parameters/parameters.hpp"

#include "dca/profiling/null_profiler.hpp"

#include "dca/util/git_version.hpp"

#include "dca/testing/dca_mpi_test_environment.hpp"

#include "dca/testing/minimalist_printer.hpp"



constexpr int update_baseline = false;



const std::string test_directory = DCA_SOURCE_DIR "/test/integration/cluster_solver/ss_ct_hyb/";



TEST(Ni0NoChangeTest, GreensFunction) {

using Concurrency = dca::parallel::MPIConcurrency;

  Concurrency concurrency(0, nullptr);

dca::testing::DcaMpiTestEnvironment* dca_test_env = nullptr;



TEST(Ni0NoChangeTest, GreensFunction) {

  auto& concurrency = dca_test_env->concurrency;

  const int id = concurrency.id();



  if (id == 0)
@@ -109,3 +112,23 @@ TEST(Ni0NoChangeTest, GreensFunction) { 
    }

  }

}



int main(int argc, char** argv) {

  int result = 0;



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



  dca_test_env = new dca::testing::DcaMpiTestEnvironment(argc, argv, "");

  ::testing::AddGlobalTestEnvironment(dca_test_env);



  ::testing::TestEventListeners& listeners = ::testing::UnitTest::GetInstance()->listeners();



  if (dca_test_env->concurrency.id() != 0) {

    delete listeners.Release(listeners.default_result_printer());

    listeners.Append(new dca::testing::MinimalistPrinter);

  }



  result = RUN_ALL_TESTS();



  return result;

}

test/integration/coarsegraining/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line 


dca_add_gtest(coarsegraining_test

        EXTENSIVE

        GTEST_MAIN

        MPI MPI_NUMPROC 2

        INCLUDE_DIRS ${DCA_INCLUDE_DIRS}

        LIBS         ${DCA_LIBS}

test/integration/coarsegraining/coarsegraining_test.cpp

+26 −5
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
#include "gtest/gtest.h"



#include "dca/function/function.hpp"

#include "dca/function/util/difference.hpp"

#include "dca/io/hdf5/hdf5_reader.hpp"

#include "dca/io/hdf5/hdf5_writer.hpp"

#include "dca/io/json/json_reader.hpp"

#include "dca/phys/dca_data/dca_data.hpp"

#include "dca/phys/domains/cluster/symmetries/point_groups/no_symmetry.hpp"
@@ -40,10 +41,8 @@ 
#include "dca/phys/parameters/parameters.hpp"

#include "dca/profiling/null_profiler.hpp"

#include "dca/testing/minimalist_printer.hpp"

#include "dca/testing/dca_mpi_test_environment.hpp"

#include "dca/util/git_version.hpp"

#include "dca/util/modules.hpp"

#include "dca/io/hdf5/hdf5_reader.hpp"

#include "dca/io/hdf5/hdf5_writer.hpp"



// Set to true to dump the result in an hdf5 file.

constexpr bool write_G_r_w = false;
@@ -76,8 +75,10 @@ using KDmn = Data::KClusterDmn; 
template <class SigmaType>

void computeMockSigma(SigmaType& Sigma);



dca::testing::DcaMpiTestEnvironment* dca_test_env;



void performTest(const bool test_dca_plus) {

  static Concurrency concurrency(0, nullptr);

  auto& concurrency = dca_test_env->concurrency;



  Parameters parameters(dca::util::GitVersion::string(), concurrency);

  parameters.read_input_and_broadcast<dca::io::JSONReader>(input);
@@ -185,3 +186,23 @@ void computeMockSigma(SigmaType& Sigma) { 
          Sigma(b, s, b, s, k, w) = sigma_val;

  }

}



int main(int argc, char** argv) {

  int result = 0;



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



  dca_test_env = new dca::testing::DcaMpiTestEnvironment(argc, argv, "");

  ::testing::AddGlobalTestEnvironment(dca_test_env);



  ::testing::TestEventListeners& listeners = ::testing::UnitTest::GetInstance()->listeners();



  if (dca_test_env->concurrency.id() != 0) {

    delete listeners.Release(listeners.default_result_printer());

    listeners.Append(new dca::testing::MinimalistPrinter);

  }



  result = RUN_ALL_TESTS();



  return result;

}