Merge branch 'develop' into new-dl-api

Author: tttapa

.github/workflows/wheel-short-test.yml

@@ -121,7 +121,7 @@ jobs:
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
       CCACHE_DIR: /tmp/.ccache
-      MACOSX_DEPLOYMENT_TARGET: '10.9'
+      MACOSX_DEPLOYMENT_TARGET: '10.15'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -159,7 +159,7 @@ jobs:
         run: |
           source ./py-venv/bin/activate
           CMAKE_PREFIX_PATH="$VIRTUAL_ENV:$CMAKE_PREFIX_PATH" \
-          _PYTHON_HOST_PLATFORM='macosx-10.9-universal2' \
+          _PYTHON_HOST_PLATFORM='macosx-10.15-universal2' \
           ARCHFLAGS='-arch arm64 -arch x86_64' \
               python -m build -w .
       - name: Upload

.github/workflows/wheel.yml

@@ -338,7 +338,7 @@ jobs:
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
       CCACHE_DIR: /tmp/.ccache
-      MACOSX_DEPLOYMENT_TARGET: '10.9'
+      MACOSX_DEPLOYMENT_TARGET: '10.15'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -376,7 +376,7 @@ jobs:
         run: |
           source ./py-venv/bin/activate
           CMAKE_PREFIX_PATH="$VIRTUAL_ENV:$CMAKE_PREFIX_PATH" \
-          _PYTHON_HOST_PLATFORM='macosx-10.9-universal2' \
+          _PYTHON_HOST_PLATFORM='macosx-10.15-universal2' \
           ARCHFLAGS='-arch arm64 -arch x86_64' \
               python -m build -w .
       - name: Upload

examples/C++/Advanced/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_executable(lasso-fbs lasso-fbs.cpp)
-target_link_libraries(lasso-fbs PRIVATE alpaqa::alpaqa alpaqa::warnings)
+target_link_libraries(lasso-fbs PRIVATE alpaqa::alpaqa alpaqa::warnings)
+alpaqa_register_example(lasso-fbs)

examples/C++/Advanced/lasso-fbs.cpp

@@ -1,3 +1,4 @@
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/functions/l1-norm.hpp>
 #include <alpaqa/util/print.hpp>
 USING_ALPAQA_CONFIG(alpaqa::EigenConfigd);
@@ -27,6 +28,8 @@ auto build_problem() {
 }
 
 int main() {
+    alpaqa::init_stdout();
+
     // Least squares problem
     auto [A, x_exact, b, λ] = build_problem();
     // ℓ₁ regularizer

examples/C++/CasADi/Rosenbrock/CMakeLists.txt

@@ -7,4 +7,5 @@ target_link_libraries(casadi-rosenbrock
 casadi_function_codegen_python(rosenbrock_functions "codegen-rosenbrock.py")
 target_compile_definitions(casadi-rosenbrock PRIVATE
     ROSENBROCK_FUNC_DLL=\"$<TARGET_FILE_NAME:rosenbrock_functions>\")
-add_dependencies(casadi-rosenbrock rosenbrock_functions)
+add_dependencies(casadi-rosenbrock rosenbrock_functions)
+alpaqa_register_example(casadi-rosenbrock)

examples/C++/CasADi/Rosenbrock/main.cpp

@@ -1,3 +1,4 @@
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/inner/directions/panoc/lbfgs.hpp>
 #include <alpaqa/inner/panoc.hpp>
 #include <alpaqa/outer/alm.hpp>
@@ -10,6 +11,7 @@
 namespace fs = std::filesystem;
 
 int main(int argc, char *argv[]) {
+    alpaqa::init_stdout();
     USING_ALPAQA_CONFIG(alpaqa::EigenConfigd);
 
     // Find the problem to load

examples/C++/CustomControlCppProblem/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_executable(custom-control-cpp-problem-example main.cpp)
 target_link_libraries(custom-control-cpp-problem-example
-    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+alpaqa_register_example(custom-control-cpp-problem-example)

examples/C++/CustomControlCppProblem/main.cpp

@@ -1,4 +1,5 @@
 #include <alpaqa/config/config.hpp>
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/inner/panoc-ocp.hpp>
 #include <alpaqa/problem/ocproblem.hpp>
 #include <alpaqa/util/print.hpp>
@@ -182,6 +183,7 @@ struct Problem {
 };
 
 int main() {
+    alpaqa::init_stdout();
     USING_ALPAQA_CONFIG(alpaqa::DefaultConfig);
 
     // Problem

examples/C++/CustomCppProblem/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_executable(custom-cpp-problem-example main.cpp)
 target_link_libraries(custom-cpp-problem-example
-    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+alpaqa_register_example(custom-cpp-problem-example)

examples/C++/CustomCppProblem/main.cpp

@@ -1,10 +1,12 @@
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/panoc-alm.hpp>
 #include <alpaqa/problem/box-constr-problem.hpp>
 #include <alpaqa/problem/problem-with-counters.hpp>
 
 #include <iostream>
 
 int main() {
+    alpaqa::init_stdout();
     USING_ALPAQA_CONFIG(alpaqa::DefaultConfig);
 
     // Problem specification

examples/C++/DLProblem/CMakeLists.txt

@@ -10,6 +10,7 @@ target_link_libraries(dl-problem-example
 target_compile_definitions(dl-problem-example
     PRIVATE DLPROBLEM_DLL=\"$<TARGET_FILE_NAME:problem-c>\")
 add_dependencies(dl-problem-example problem-c)
+alpaqa_register_example(dl-problem-example)
 
 # Stand-alone executable to test the matrix functions used by problem-c
 add_executable(test-matmul "test-matmul.c")

examples/C++/DLProblem/main.cpp

@@ -1,4 +1,5 @@
 #include <alpaqa/dl/dl-problem.hpp>
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/problem/problem-with-counters.hpp>
 #include <alpaqa/structured-panoc-alm.hpp>
 
@@ -11,6 +12,8 @@ namespace fs = std::filesystem;
 USING_ALPAQA_CONFIG(alpaqa::DefaultConfig);
 
 int main(int argc, char *argv[]) {
+    alpaqa::init_stdout();
+
     // Find the problem to load
     fs::path so_name = DLPROBLEM_DLL;
     if (argc > 1)

examples/C++/FortranProblem/CMakeLists.txt

@@ -4,3 +4,4 @@ target_link_libraries(fortran-problem-example
     PRIVATE alpaqa::alpaqa alpaqa::warnings problem-fortran)
 set_target_properties(fortran-problem-example PROPERTIES
     LINKER_LANGUAGE Fortran)
+alpaqa_register_example(fortran-problem-example)

examples/C++/FortranProblem/main.cpp

@@ -1,3 +1,4 @@
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/problem/box-constr-problem.hpp>
 #include <alpaqa/problem/problem-with-counters.hpp>
 #include <alpaqa/structured-panoc-alm.hpp>
@@ -32,6 +33,8 @@ struct FortranProblem : alpaqa::BoxConstrProblem<config_t> {
 };
 
 int main() {
+    alpaqa::init_stdout();
+
     // Instantiate a problem
     FortranProblem problem{problem_get_num_vars(), problem_get_num_constr()};
     // Wrap the problem to count the function evaluations

examples/C++/SimpleUnconstrProblem/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_executable(simple-unconstr-cpp-problem-example main.cpp)
 target_link_libraries(simple-unconstr-cpp-problem-example
-    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+    PRIVATE alpaqa::alpaqa alpaqa::warnings)
+alpaqa_register_example(simple-unconstr-cpp-problem-example)

examples/C++/SimpleUnconstrProblem/main.cpp

@@ -1,3 +1,4 @@
+#include <alpaqa/example-util.hpp>
 #include <alpaqa/panoc-alm.hpp>
 #include <alpaqa/problem/problem-with-counters.hpp>
 #include <alpaqa/problem/unconstr-problem.hpp>
@@ -31,7 +32,9 @@ struct RosenbrockProblem : alpaqa::UnconstrProblem<alpaqa::DefaultConfig> {
 };
 
 int main() {
+    alpaqa::init_stdout();
     USING_ALPAQA_CONFIG(RosenbrockProblem::config_t);
+
     // Instantiate a problem
     RosenbrockProblem problem;
 

examples/CMakeLists.txt

@@ -5,5 +5,13 @@ if (PROJECT_IS_TOP_LEVEL)
     find_package(alpaqa REQUIRED CONFIG OPTIONAL_COMPONENTS CasADi Dl Extra)
 endif()
 
+add_subdirectory(util)
+
+add_custom_target(examples ALL)
+function(alpaqa_register_example TGT)
+    target_link_libraries(${TGT} PRIVATE alpaqa::example-util)
+    add_dependencies(examples ${TGT})
+endfunction()
+
 add_subdirectory(C++)
 add_subdirectory(problems)

examples/util/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_library(example-util "src/stdout.cpp")
+target_include_directories(example-util PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+add_library(alpaqa::example-util ALIAS example-util)

examples/util/include/alpaqa/example-util.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+namespace alpaqa {
+void init_stdout();
+} // namespace alpaqa

examples/util/src/stdout.cpp

@@ -0,0 +1,14 @@
+#include <alpaqa/example-util.hpp>
+
+#ifdef _WIN32
+#define NOMINMAX
+#include <Windows.h>
+#endif
+
+namespace alpaqa {
+void init_stdout() {
+#ifdef _WIN32
+    SetConsoleOutputCP(CP_UTF8);
+#endif
+}
+} // namespace alpaqa