Minor CMake cleanup (#50)

Author: pelesh

CMakeLists.txt

@@ -9,18 +9,8 @@ cmake_minimum_required(VERSION 3.18)
 project(ExaGO VERSION "1.6.0")
 
 set(CMAKE_CXX_STANDARD 17)
-# Enable setting Mac OS X rpath
-set(CMAKE_MACOSX_RPATH 1)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
-if(POLICY CMP0074)
-  cmake_policy(SET CMP0074 NEW) # CMake 3.12
-endif()
-
-if(POLICY CMP0104)
-  cmake_policy(SET CMP0104 NEW) # CMake 3.18
-endif()
-
 # We default to release builds
 set(_DEFAULT_CMAKE_BUILD_TYPE RelWithDebInfo)
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -68,7 +58,7 @@ option(EXAGO_ENABLE_PETSC "Enable PETSc support" ON)
 # MPI support is enabled by default
 option(EXAGO_ENABLE_MPI "Enable MPI support" ON)
 
-# Ipopt support is disabled by default
+# Ipopt support is enabled by default
 option(EXAGO_ENABLE_IPOPT "Enable Ipopt support" ON)
 
 # HiOP support is disabled by default
@@ -166,10 +156,6 @@ if(EXAGO_ENABLE_MPI)
     set(TESTING_MAX_NUMPROCS ${MPIEXEC_MAX_NUMPROCS})
   endif()
   message(STATUS "Max ranks for testing: ${TESTING_MAX_NUMPROCS}")
-  if(NOT DEFINED MPI_CXX_COMPILER)
-    set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-    set(CMAKE_C_COMPILER ${MPI_C_COMPILER})
-  endif(NOT DEFINED MPI_CXX_COMPILER)
   include_directories(
     ${MPI_CXX_HEADER_DIR} ${MPI_CXX_ADDITIONAL_INCLUDE_DIRS}
     ${MPI_CXX_COMPILER_INCLUDE_DIRS}
@@ -185,18 +171,18 @@ endif(EXAGO_ENABLE_MPI)
 # If CUDA support is enabled, set up CUDA compiler and flags
 if(EXAGO_ENABLE_CUDA)
   include(CheckLanguage)
-  enable_language(CUDA)
   check_language(CUDA)
+  enable_language(CUDA)
 
-  find_package(CUDA REQUIRED)
+  find_package(CUDAToolkit REQUIRED)
 
   if(NOT DEFINED CMAKE_CUDA_STANDARD)
-    set(CMAKE_CUDA_STANDARD 11)
+    set(CMAKE_CUDA_STANDARD 17)
     set(CMAKE_CUDA_STANDARD_REQUIRED ON)
   endif()
 
   if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-    set(CMAKE_CUDA_ARCHITECTURES 35)
+    set(CMAKE_CUDA_ARCHITECTURES 70)
   endif()
 
   set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-extended-lambda")
@@ -208,7 +194,7 @@ endif(EXAGO_ENABLE_CUDA)
 # If HIP support is enabled, set up HIP compiler and flags
 if(EXAGO_ENABLE_HIP)
   set(EXAGO_HAVE_HIP 1)
-  add_definitions(-DHAVE_HIP) # For hipmagma
+  add_compile_definitions(HAVE_HIP) # For hipmagma
   find_package(hip REQUIRED)
 endif()
 
@@ -226,9 +212,6 @@ if(EXAGO_ENABLE_PETSC)
   set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save})
 endif()
 
-# Set install rpath to the locations where EXAGO and PETSc libraries reside.
-# TODO: Automatically skip if PETSc and EXAGO are already on system lib path.
-# set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib ${PETSC_DIR}/lib)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 
 if(EXAGO_ENABLE_IPOPT)

tests/functionality/opflow/CMakeLists.txt

@@ -56,8 +56,6 @@ if(EXAGO_RUN_TESTS)
       DEPENDS
       HIOP_SPARSE
       RAJA
-      WORKING_DIRECTORY
-      ${CMAKE_SOURCE_DIR}
     )
   endif(EXAGO_ENABLE_GPU)
 
@@ -83,8 +81,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_opflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/ipopt_pbpol.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
     DEPENDS
     IPOPT
   )
@@ -127,8 +123,6 @@ if(EXAGO_RUN_TESTS)
     -opflow_allow_lineflow_violation
     -opflow_lineflowviolation_penalty
     100
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
     DEPENDS
     IPOPT
   )

tests/functionality/pflow/CMakeLists.txt

@@ -26,8 +26,6 @@ if(EXAGO_RUN_TESTS)
       ${EXAGO_EXTRA_MPI_FLAGS}
       $<TARGET_FILE:test_pflow_functionality>
       ${CMAKE_CURRENT_SOURCE_DIR}/pflow${np}procs.toml
-      WORKING_DIRECTORY
-      ${CMAKE_SOURCE_DIR}
     )
   endforeach(np)
 endif()

tests/functionality/scopflow/CMakeLists.txt

@@ -20,8 +20,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_scopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/ipopt_cont.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -33,8 +31,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_scopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/empar_cont.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   # Disabled test for now, feature not ready yet
@@ -104,8 +100,6 @@ if(EXAGO_RUN_TESTS)
     ${TESTING_MAX_NUMPROCS}
     $<TARGET_FILE:test_scopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/hiop_cont_mpi.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -135,8 +129,6 @@ if(EXAGO_RUN_TESTS)
     ${TESTING_MAX_NUMPROCS}
     $<TARGET_FILE:test_scopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/hiop_raja.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   foreach(fmt "MATPOWER" "CSV" "JSON" "MINIMAL")

tests/functionality/sopflow/CMakeLists.txt

@@ -22,8 +22,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_sopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/sopflow_multiscenario.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -35,8 +33,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_sopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/sopflow_multiscenario2.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -52,8 +48,6 @@ if(EXAGO_RUN_TESTS)
     -opflow_ignore_lineflow_constraints
     -hiop_mem_space
     HOST
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -80,8 +74,6 @@ if(EXAGO_RUN_TESTS)
     ${RUNCMD}
     $<TARGET_FILE:test_sopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/sopflow_multicontingency.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -96,8 +88,6 @@ if(EXAGO_RUN_TESTS)
     ${CMAKE_CURRENT_SOURCE_DIR}/sopflow_multiscenario_serial.toml
     -hiop_mem_space
     HOST
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(
@@ -112,8 +102,6 @@ if(EXAGO_RUN_TESTS)
     ${TESTING_MAX_NUMPROCS}
     $<TARGET_FILE:test_sopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/sopflow_multiscenario_parallel.toml
-    WORKING_DIRECTORY
-    ${CMAKE_SOURCE_DIR}
   )
 
   exago_add_test(