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

fixing linking issues for HPX

parent 7f8c0a3d

include/dca/parallel/hpx/hpx.hpp

+4 −4
Original line number Diff line number Diff line
@@ -68,21 +68,21 @@ struct thread_traits { 
static std::vector<int> affinity_;



// Returns a list of cores id for which the calling thread has affinity.

std::vector<int> get_affinity()

inline std::vector<int> get_affinity()

{

    // do nothing, hpx handles this internally

    return affinity_;

}



// Set a list of cores id for which the calling thread has affinity.

void set_affinity(const std::vector<int>& cores)

inline void set_affinity(const std::vector<int>& cores)

{

    // do nothing, hpx handles this internally

    affinity_ = cores;

}



// Number of cores used by this process.

int get_core_count() {

inline int get_core_count() {

    return std::thread::hardware_concurrency(); // hpx::get_num_worker_threads();

}

src/phys/dca_step/cluster_solver/ctint/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ add_library(ctint 


target_link_libraries(ctint PUBLIC time_and_frequency_domains dca_hdf5 json)



dca_gpu_runtime_link(ctint)



if (DCA_HAVE_GPU)

  target_include_directories(ctint PRIVATE ${MAGMA_INCLUDE_DIR})  

  target_link_libraries(ctint PUBLIC gpu_utils)

  dca_gpu_runtime_link(ctint)



endif()

test/unit/io/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ dca_add_gtest(json_reader_test 
        LIBS json)



dca_add_gtest(reader_writer_test

  LIBS dca_hdf5 hdf5::hdf5_cpp json function)

  LIBS dca_hdf5 hdf5::hdf5_cpp json function ${DCA_THREADING_LIBS})



if (DCA_HAVE_ADIOS2)

  dca_add_gtest(adios2_reader_writer_test

test/unit/phys/dca_step/cluster_solver/ctint/structs/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ dca_add_gtest(solver_configuration_test 
    FAST

    GTEST_MAIN

    INCLUDE_DIRS ${TEST_INCLUDES}

    LIBS random;ctint;time_and_frequency_domains;function;json

    LIBS random;ctint;time_and_frequency_domains;function;json;${DCA_THREADING_LIBS}

    )



dca_add_gtest(read_write_ctint_config_test

  FAST

  GTEST_MAIN

  INCLUDE_DIRS ${TEST_INCLUDES}

  LIBS random;time_and_frequency_domains;function;ctint

  LIBS random;time_and_frequency_domains;function;ctint;${DCA_THREADING_LIBS}

  )



if (DCA_HAVE_GPU)