Commit 6dc14c5f authored by Doak, Peter W.'s avatar Doak, Peter W.
Browse files

fixes for std thread

parent 125ae06c

include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_walker.hpp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <stdexcept>

#include <vector>



#include "dca/config/threading.hpp"

#include "dca/linalg/linalg.hpp"

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

#include "dca/linalg/matrixop.hpp"

test/performance/phys/ctaux/CMakeLists.txt

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ target_compile_definitions(ctaux_walker_performance_test PRIVATE DCA_SOURCE_DIR= 




if (DCA_HAVE_GPU)

  #target_compile_definitions(ctaux_walker_performance_test PRIVATE DCA_HAVE_CUDA)

  #target_link_directories(ctaux_walker_performance_test PRIVATE ${CUDA_TOOLKIT_ROOT_DIR}/lib64/)

  #target_link_libraries(ctaux_walker_performance_test PRIVATE magma::magma blas_kernels)

  dca_gpu_runtime_link(ctaux_walker_performance_test)

  dca_gpu_blas_link(ctaux_walker_performance_test)

  if (DCA_HAVE_CUDA)

test/performance/phys/ctaux/ctaux_walker_performance_test.cpp

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <iostream>

#include <string>



#include <hpx/hpx.hpp>

#include "dca/config/mc_options.hpp"

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

#include "dca/math/random/std_random_wrapper.hpp"
@@ -59,6 +58,9 @@ using Data = dca::phys::DcaData<Parameters>; 
using Real = dca::config::McOptions::MCScalar;

using Walker = dca::phys::solver::ctaux::CtauxWalker<device, Parameters, Data, Real>;



template <typename T>

using future = dca::parallel::thread_traits::future_type<T>;



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

  int submatrix_size = -1;

  int n_warmup = 30;
@@ -121,7 +123,7 @@ int main(int argc, char** argv) { 
    walkers.emplace_back(parameters, data, rngs.back(), i);

  }



  std::vector<hpx::future<void>> fs;

  std::vector<future<void>> fs;

  dca::parallel::ThreadPool pool(n_walkers);

  for (int i = 0; i < n_walkers; ++i) {

    fs.push_back(pool.enqueue([&do_sweeps, &walkers, i, n_warmup]() {

test/unit/math/nfft/CMakeLists.txt

+0 −9
Original line number Diff line number Diff line
@@ -7,18 +7,9 @@ else() 
  set(THIS_TEST_LIBS ${THIS_TEST_LIBS} hdf5::hdf5_cpp)

endif()



message("thread option for nfft test: ${test_thread_option}")



include(CMakePrintHelpers)

cmake_print_properties(TARGETS HPX::hpx

  PROPERTIES IMPORTED INTERFACE_LINK_LIBRARIES IMPORTED_LINK_FLAGS LOCATION)



dca_add_gtest(dnfft_1d_gpu_test

  THREADED

  GTEST_MAIN

  CUDA

  INCLUDE_DIRS ${FFTW_INCLUDE_DIR};${PROJECT_SOURCE_DIR}

  LIBS ${FFTW_LIBRARY} time_and_frequency_domains random function mc_kernels gpu_utils nfft)
 


cmake_print_properties(TARGETS dnfft_1d_gpu_test

  PROPERTIES LINK_LIBRARIES)