ipopt cmake settings

Author: lukelowry

CMakeLists.txt

@@ -126,7 +126,7 @@ endif("${isSystemDir}" STREQUAL "-1")
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
 if(GRIDKIT_ENABLE_IPOPT)
-  include(FindIpopt)
+  find_package(Ipopt REQUIRED)
   enable_language(Fortran) # Needed for linking to HSL
 endif()
 
@@ -217,7 +217,10 @@ configure_package_config_file(
   INSTALL_DESTINATION share/cmake/gridkit
   NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
+# Make the dependency finder available beside the generated package config.
+configure_file(cmake/FindIpopt.cmake ${CMAKE_CURRENT_BINARY_DIR}/FindIpopt.cmake COPYONLY)
+
 # Install configuration file
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfigVersion.cmake
-        DESTINATION share/cmake/gridkit)
+              ${CMAKE_CURRENT_BINARY_DIR}/FindIpopt.cmake DESTINATION share/cmake/gridkit)

cmake/Config.cmake.in

@@ -5,12 +5,18 @@
 
 @PACKAGE_INIT@
 
-include ( "${CMAKE_CURRENT_LIST_DIR}/GridKitTargets.cmake" )
-
 include(CMakeFindDependencyMacro)
 set(GridKit_ENABLE_SUNDIALS @GRIDKIT_ENABLE_SUNDIALS@)
 if(GridKit_ENABLE_SUNDIALS)
   list(APPEND CMAKE_PREFIX_PATH @SUNDIALS_DIR@)
   enable_language(C)
   find_dependency(SUNDIALS)
 endif()
+
+set(GridKit_ENABLE_IPOPT @GRIDKIT_ENABLE_IPOPT@)
+if(GridKit_ENABLE_IPOPT AND NOT TARGET IPOPT)
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+  find_dependency(Ipopt MODULE)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/GridKitTargets.cmake")

cmake/FindIpopt.cmake

@@ -1,7 +1,7 @@
 #
 #[[
 
-Finds Ipopt include directory and libraries and exports target `Ipopt`
+Finds Ipopt include directory and libraries and exports target `IPOPT`
 
 User may set:
 - IPOPT_ROOT_DIR
@@ -26,7 +26,6 @@ find_library(
 
 if(IPOPT_LIBRARY)
   set(IPOPT_LIBRARY CACHE FILEPATH "Path to Ipopt library")
-  message(STATUS "Found Ipopt library: " ${IPOPT_LIBRARY})
   get_filename_component(
     IPOPT_LIBRARY_DIR
     ${IPOPT_LIBRARY}
@@ -56,25 +55,12 @@ find_path(
     include/coin-or
     include/coinor)
 
-if(IPOPT_LIBRARY)
-  message(STATUS "Found Ipopt include: ${IPOPT_INCLUDE_DIR}")
-  mark_as_advanced(IPOPT_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Ipopt REQUIRED_VARS IPOPT_LIBRARY IPOPT_INCLUDE_DIR)
+mark_as_advanced(IPOPT_LIBRARY IPOPT_INCLUDE_DIR)
+
+if(Ipopt_FOUND AND NOT TARGET IPOPT)
   add_library(IPOPT INTERFACE IMPORTED)
   target_link_libraries(IPOPT INTERFACE ${IPOPT_LIBRARY})
   target_include_directories(IPOPT INTERFACE ${IPOPT_INCLUDE_DIR})
-else()
-  if(NOT IPOPT_ROOT_DIR)
-    message(STATUS "Ipopt dir not found! Please provide correct filepath.")
-    set(IPOPT_DIR
-        ${IPOPT_DIR}
-        CACHE PATH "Path to Ipopt installation root.")
-    unset(IPOPT_INCLUDE_DIR CACHE)
-    unset(IPOPT_LIBRARY CACHE)
-    unset(IPOPT_LIBRARY_DIR CACHE)
-  elseif(NOT IPOPT_LIB)
-    message(STATUS "Ipopt library not found! Please provide correct filepath.")
-  endif()
-  if(IPOPT_ROOT_DIR AND NOT IPOPT_INCLUDE_DIR)
-    message(STATUS "Ipopt include directory  not found! Please provide correct path.")
-  endif()
 endif()

examples/Consumer/CMakeLists.txt

@@ -36,6 +36,12 @@ else()
     GridKit::power_elec_microload)
 endif()
 
+if(GRIDKIT_ENABLE_ENZYME AND GRIDKIT_ENABLE_IPOPT)
+  install(FILES ${CMAKE_SOURCE_DIR}/tests/UnitTests/OptimalPowerFlow/runSystemTests.cpp
+                ${CMAKE_SOURCE_DIR}/tests/UnitTests/OptimalPowerFlow/SystemTests.hpp
+          DESTINATION ${_rel_consumer_path}/OptimalPowerFlow)
+endif()
+
 # Install CMakeLists.txt for example project
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GridKitConsumer/CMakeLists.txt.in
                ${CMAKE_CURRENT_BINARY_DIR}/GridKitConsumer/CMakeLists.txt @ONLY)

examples/Consumer/GridKitConsumer/CMakeLists.txt.in

@@ -28,3 +28,15 @@ include(CTest)
 add_test(NAME GridKitConsumer
     COMMAND consumer
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+
+if(TARGET GridKit::optimal_power_flow_systemmodel_dependency_tracking
+   AND TARGET GridKit::solvers_opt_steady)
+  add_executable(opf_consumer OptimalPowerFlow/runSystemTests.cpp)
+  target_link_libraries(
+    opf_consumer
+    GridKit::optimal_power_flow_systemmodel
+    GridKit::optimal_power_flow_systemmodel_dependency_tracking
+    GridKit::solvers_opt_steady
+    GridKit::testing)
+  add_test(NAME GridKitOPFConsumer COMMAND opf_consumer)
+endif()

examples/EconomicDispatch/README.md

@@ -38,6 +38,8 @@ Input paths are relative to the solver file; output is relative to the working
 directory. Missing state values use the case operating point; supplied currents
 must include both `ir` and `ii`.
 
+Machines marked `online: false` in the input state are currently rejected.
+
  Case device                                  | Optimal power flow component
  ---------------------------------------------|-----------------------------
  `Bus`, `BusInfinite`                         | `Bus`, infinite for `BusInfinite`