Merge pull request #17 from jcarpent/devel

jcarpent · web-flow · commit ce3c417d6a8c · 2022-08-24T09:57:23.000+02:00
Fix packaging issues and add more packaging test
diff --git a/.github/workflows/ci-linux-osx-win-conda.yml b/.github/workflows/ci-linux-osx-win-conda.yml
@@ -120,12 +120,15 @@ jobs:
     #     g++ -std=c++17 examples/cpp/overview-simple.cpp -o overview-simple $(pkg-config --cflags proxsuite)
     #     ./overview-simple
 
-    # - name: Test CMake pacakging [Conda]
-    #   shell: bash -l {0}
-    #   run: |
-    #     cd build
-    #     g++ -std=c++17 examples/cpp/overview-simple.cpp -o overview-simple $(pkg-config --cflags proxsuite)
-    #     ./overview-simple
+    - name: Test CMake pacakging [Conda/Linux&macOS]
+      if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
+      shell: bash -l {0}
+      run: |
+        cd test/packaging/cmake
+        mkdir build && cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}  -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        cmake --build . --config ${{ matrix.build_type }} --target all
+        ./run-proxqp
 
     - name: Uninstall [Conda]
       shell: bash -l {0}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,17 +91,20 @@ set(SIMDE_HINT_FAILURE
     "Set BUILD_WITH_VECTORIZATION_SUPPORT=OFF or install Simde on your system.\n If Simde is already installed, ensure that the CMake variable CMAKE_MODULE_PATH correctly points toward the location of FindSimde.cmake file."
 )
 if(BUILD_WITH_VECTORIZATION_SUPPORT)
-  add_project_dependency(Simde REQUIRED)
+  add_project_dependency(Simde REQUIRED FIND_EXTERNAL "Simde")
 endif()
 
 # Build the main library
 file(GLOB_RECURSE ${PROJECT_NAME}_HEADERS ${PROJECT_SOURCE_DIR}/include/*.hpp)
 
-add_library(proxsuite INTERFACE ${${PROJECT_NAME}_HEADERS})
+add_library(proxsuite INTERFACE)
 target_link_libraries(
   proxsuite
   PUBLIC
   INTERFACE Eigen3::Eigen)
+target_include_directories(
+  proxsuite INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+                      "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 set(EXPORTED_TARGETS_LIST proxsuite)
 
 add_header_group(${PROJECT_NAME}_HEADERS)
@@ -133,9 +136,6 @@ endif()
 install(
   TARGETS ${EXPORTED_TARGETS_LIST}
   EXPORT ${TARGETS_EXPORT_NAME}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
-  INCLUDES
-  DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -58,10 +58,7 @@ function(CREATE_PYTHON_TARGET target_name COMPILE_OPTIONS dependencies)
                                                     "\$ORIGIN/../../..")
   endif()
 
-  install(
-    TARGETS ${target_name}
-    EXPORT ${TARGETS_EXPORT_NAME}
-    DESTINATION ${${PYWRAP}_INSTALL_DIR})
+  install(TARGETS ${target_name} DESTINATION ${${PYWRAP}_INSTALL_DIR})
 endfunction()
 
 create_python_target(proxsuite_pywrap "" proxsuite-not-vectorized)
diff --git a/cmake-external/FindSimde.cmake b/cmake-external/FindSimde.cmake
diff --git a/cmake-module b/cmake-module
@@ -1 +1 @@
-Subproject commit f4e4be6a6f6577d86c9e2b09ae3a9bf1a545437e
+Subproject commit 0241fe27f6ceb5e49d4dbacb068b43639a2caf95
diff --git a/include/proxsuite/proxqp/utils/random_qp_problems.hpp b/include/proxsuite/proxqp/utils/random_qp_problems.hpp
@@ -330,19 +330,6 @@ sparse_matrix_rand_not_compressed(isize nrows, isize ncols, Scalar p)
   return A;
 }
 
-LDLT_EXPLICIT_TPL_DECL(2, matrix_rand<f32>);
-LDLT_EXPLICIT_TPL_DECL(1, vector_rand<f32>);
-LDLT_EXPLICIT_TPL_DECL(2, positive_definite_rand<f32>);
-LDLT_EXPLICIT_TPL_DECL(1, orthonormal_rand<f32>);
-LDLT_EXPLICIT_TPL_DECL(3, sparse_matrix_rand<f32>);
-LDLT_EXPLICIT_TPL_DECL(3, sparse_positive_definite_rand<f32>);
-
-LDLT_EXPLICIT_TPL_DECL(2, matrix_rand<f64>);
-LDLT_EXPLICIT_TPL_DECL(1, vector_rand<f64>);
-LDLT_EXPLICIT_TPL_DECL(2, positive_definite_rand<f64>);
-LDLT_EXPLICIT_TPL_DECL(1, orthonormal_rand<f64>);
-LDLT_EXPLICIT_TPL_DECL(3, sparse_matrix_rand<f64>);
-LDLT_EXPLICIT_TPL_DECL(3, sparse_positive_definite_rand<f64>);
 } // namespace rand
 using proxqp::usize;
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,7 +7,11 @@ add_library(cnpy OBJECT src/cnpy.cpp)
 target_link_libraries(cnpy Eigen3::Eigen)
 target_include_directories(cnpy PUBLIC ./include)
 
-add_library(proxsuite-test-util STATIC ./src/util_f64.cpp ./src/util_f32.cpp)
+file(GLOB_RECURSE TEST_HEADERS ./include/*.hpp)
+add_header_group(TEST_HEADERS)
+
+add_library(proxsuite-test-util STATIC ./src/util_f64.cpp ./src/util_f32.cpp
+                                       ${TEST_HEADERS})
 target_include_directories(proxsuite-test-util PUBLIC ./include)
 if(BUILD_WITH_VECTORIZATION_SUPPORT)
   target_link_libraries(proxsuite-test-util proxsuite-vectorized matio)
diff --git a/test/include/util_f32.hpp b/test/include/util_f32.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <proxsuite/proxqp/utils/random_qp_problems.hpp>
+
+namespace proxsuite {
+namespace proxqp {
+namespace utils {
+
+namespace eigen {
+LDLT_EXPLICIT_TPL_DECL(2, llt_compute<Mat<f32, colmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, ldlt_compute<Mat<f32, colmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, llt_compute<Mat<f32, rowmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, ldlt_compute<Mat<f32, rowmajor>>);
+} // namespace eigen
+namespace rand {
+LDLT_EXPLICIT_TPL_DECL(2, matrix_rand<f32>);
+LDLT_EXPLICIT_TPL_DECL(1, vector_rand<f32>);
+LDLT_EXPLICIT_TPL_DECL(2, positive_definite_rand<f32>);
+LDLT_EXPLICIT_TPL_DECL(1, orthonormal_rand<f32>);
+LDLT_EXPLICIT_TPL_DECL(3, sparse_matrix_rand<f32>);
+LDLT_EXPLICIT_TPL_DECL(3, sparse_positive_definite_rand<f32>);
+} // namespace rand
+
+LDLT_EXPLICIT_TPL_DECL(2, matmul_impl<long double>);
+LDLT_EXPLICIT_TPL_DECL(1, mat_cast<proxqp::f32, long double>);
+
+} // namespace utils
+} // namespace proxqp
+} // namespace proxsuite
diff --git a/test/include/util_f64.hpp b/test/include/util_f64.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <proxsuite/proxqp/utils/random_qp_problems.hpp>
+
+namespace proxsuite {
+namespace proxqp {
+namespace utils {
+
+namespace eigen {
+LDLT_EXPLICIT_TPL_DECL(2, llt_compute<Mat<f64, colmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, ldlt_compute<Mat<f64, colmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, llt_compute<Mat<f64, rowmajor>>);
+LDLT_EXPLICIT_TPL_DECL(2, ldlt_compute<Mat<f64, rowmajor>>);
+} // namespace eigen
+
+namespace rand {
+LDLT_EXPLICIT_TPL_DECL(2, matrix_rand<f64>);
+LDLT_EXPLICIT_TPL_DECL(1, vector_rand<f64>);
+LDLT_EXPLICIT_TPL_DECL(2, positive_definite_rand<f64>);
+LDLT_EXPLICIT_TPL_DECL(1, orthonormal_rand<f64>);
+LDLT_EXPLICIT_TPL_DECL(3, sparse_matrix_rand<f64>);
+LDLT_EXPLICIT_TPL_DECL(3, sparse_positive_definite_rand<f64>);
+} // namespace rand
+
+LDLT_EXPLICIT_TPL_DECL(1, mat_cast<f64, long double>);
+
+} // namespace utils
+} // namespace proxqp
+} // namespace proxsuite
diff --git a/test/include/utils.hpp b/test/include/utils.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "util_f32.hpp"
+#include "util_f64.hpp"
diff --git a/test/packaging/cmake/CMakeLists.txt b/test/packaging/cmake/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(ExternalLib CXX)
+find_package(proxsuite REQUIRED)
+set(CMAKE_CXX_STANDARD 17)
+
+add_executable(run-proxqp ${CMAKE_CURRENT_LIST_DIR}/../src/run-proxqp.cpp)
+target_link_libraries(run-proxqp PUBLIC proxsuite::proxsuite)
diff --git a/test/packaging/src/run-proxqp.cpp b/test/packaging/src/run-proxqp.cpp
@@ -0,0 +1,36 @@
+#include <proxsuite/proxqp/dense/dense.hpp> // load the dense solver backend
+#include <proxsuite/proxqp/utils/random_qp_problems.hpp> // used for generating a random convex Qp
+
+using namespace proxsuite::proxqp;
+using T = double;
+
+int
+main()
+{
+  isize dim = 10;
+  isize n_eq(dim / 4);
+  isize n_in(dim / 4);
+  // generate a random qp
+  T sparsity_factor(0.15);
+  T strong_convexity_factor(1.e-2);
+
+  dense::Model<T> qp = utils::dense_strongly_convex_qp(
+    dim, n_eq, n_in, sparsity_factor, strong_convexity_factor);
+
+  dense::QP<T> Qp(dim, n_eq, n_in);                  // create the QP object
+  Qp.init(qp.H, qp.g, qp.A, qp.b, qp.C, qp.u, qp.l); // initialize the model
+  Qp.solve(); // solve the problem without warm start
+
+  auto x_wm = utils::rand::vector_rand<T>(dim);
+  auto y_wm = utils::rand::vector_rand<T>(n_eq);
+  auto z_wm = utils::rand::vector_rand<T>(n_in);
+  Qp.solve(x_wm, y_wm,
+           z_wm); // if you have a warm start, put it here
+
+  // print an optimal solution x,y and z
+  std::cout << "optimal x: " << Qp.results.x << std::endl;
+  std::cout << "optimal y: " << Qp.results.y << std::endl;
+  std::cout << "optimal z: " << Qp.results.z << std::endl;
+
+  return 0;
+}
diff --git a/test/src/util_f32.cpp b/test/src/util_f32.cpp
@@ -1,4 +1,5 @@
-#include <proxsuite/proxqp/utils/random_qp_problems.hpp>
+#include "util_f64.hpp"
+
 namespace proxsuite {
 namespace proxqp {
 namespace utils {
diff --git a/test/src/util_f64.cpp b/test/src/util_f64.cpp
@@ -1,4 +1,5 @@
-#include <proxsuite/proxqp/utils/random_qp_problems.hpp>
+#include "util_f64.hpp"
+
 namespace proxsuite {
 namespace proxqp {
 namespace utils {
@@ -19,41 +20,6 @@ LDLT_EXPLICIT_TPL_DEF(3, sparse_matrix_rand<f64>);
 LDLT_EXPLICIT_TPL_DEF(3, sparse_positive_definite_rand<f64>);
 } // namespace rand
 
-namespace osqp {
-auto
-to_sparse(Mat<c_float, colmajor> const& mat) -> SparseMat<c_float>
-{
-  SparseMat<c_float> out(mat.rows(), mat.cols());
-
-  using Eigen::Index;
-  for (Index j = 0; j < mat.cols(); ++j) {
-    for (Index i = 0; i < mat.rows(); ++i) {
-      if (mat(i, j) != 0) {
-        out.insert(i, j) = mat(i, j);
-      }
-    }
-  }
-  out.makeCompressed();
-  return out;
-}
-
-auto
-to_sparse_sym(Mat<c_float, colmajor> const& mat) -> SparseMat<c_float>
-{
-  SparseMat<c_float> out(mat.rows(), mat.cols());
-  using Eigen::Index;
-  for (Index j = 0; j < mat.cols(); ++j) {
-    for (Index i = 0; i < j + 1; ++i) {
-      if (mat(i, j) != 0) {
-        out.insert(i, j) = mat(i, j);
-      }
-    }
-  }
-  out.makeCompressed();
-  return out;
-}
-} // namespace osqp
-
 LDLT_EXPLICIT_TPL_DEF(1, mat_cast<f64, long double>);
 
 } // namespace utils
