Unverified Commit 7eeb61ca authored by Peter Doak's avatar Peter Doak Committed by GitHub
Browse files

Merge pull request #255 from PDoakORNL/hpx_merge_master 

Hpx merge master
Tests pass hpx and std threads on summit.  std threads and hip on Spock.
parents 2bd088c1 6dc14c5f

.vscode/settings.json

0 → 100644
+3 −0
Original line number Diff line number Diff line 
{

    "cmake.configureOnOpen": true

}
 
 No newline at end of file

CMakeLists.txt

+18 −3
Original line number Diff line number Diff line
@@ -9,6 +9,18 @@ project(DCA++ LANGUAGES C CXX) 


cmake_policy(VERSION 3.18)



################################################################################

# Always use <PackageName>_ROOT vars to search first

if(POLICY CMP0074)

   cmake_policy(SET CMP0074 NEW)

endif()



################################################################################

# Always use <PackageName>_ROOT vars to search first

if(POLICY CMP0074)

   cmake_policy(SET CMP0074 NEW)

endif()



################################################################################

# Disable in-source builds.

if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
@@ -24,6 +36,8 @@ set(SANE_DEV_BUILD true) 
# Include CMake scripts from cmake directory.

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)



################################################################################

# Enable CTest/CDash dashboard testing

enable_testing()

include(CTest)
@@ -122,6 +136,8 @@ include(dca_linking) 
# Libraries

add_subdirectory(src)



message(Threading Libs: "${DCA_THREADING_LIBS}")



# We are trying to move away from this abdication targeting try to explicitly link

# without using this mess.

set(DCA_LIBS
@@ -137,7 +153,6 @@ set(DCA_LIBS 
  nfft

  tetrahedron_mesh

  ${DCA_RNG_LIBRARY}

  parallel_stdthread

  parallel_util

  dca_algorithms

  json

CTestConfig.cmake

+3 −1
Original line number Diff line number Diff line 
## This file should be placed in the root directory of your project.

## Then modify the CMakeLists.txt file in the root directory of your

## project to incorporate the testing dashboard.

## # The following are required to uses Dart and the Cdash dashboard

##

## # The following are required to submit to the CDash dashboard:

##   ENABLE_TESTING()

##   INCLUDE(CTest)



set(CTEST_PROJECT_NAME "DCA")

set(CTEST_NIGHTLY_START_TIME "00:00:00 GMT")

applications/cluster_solver_check/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
if (DCA_BUILD_CLUSTER_SOLVER_CHECK)

  add_executable(cluster_solver_check cluster_solver_check.cpp)

  target_include_directories(cluster_solver_check PRIVATE ${DCA_INCLUDE_DIRS})

  target_link_libraries(cluster_solver_check ${DCA_LIBS} statistical_testing)

  target_link_libraries(cluster_solver_check  PRIVATE ${DCA_LIBS} statistical_testing)



  if (DCA_WITH_CUDA)

    cuda_add_cublas_to_target(cluster_solver_check)

build-aux/daint_gpu.cmake

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ set(CMAKE_CUDA_ARCHITECTURES 60 CACHE STRING "number of the CUDA compute archite 


#set(CMAKE_CUDA_SEPARABLE_COMPILATION ON)



set(FFTW_ROOT $ENV{FFTW_DIR}/.. CACHE PATH "Path to fftw3 library")



# For the GPU support we also need MAGMA.

# MAGMA has been installed with EasyBuild.

set(MAGMA_DIR $ENV{MAGMAROOT} CACHE PATH