diff --git a/README.md b/README.md index 79e2180..330153f 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Examples for both C and C++ are available in `examples/c` and `examples/cpp` and # Usage - Link to the `libclarabel_c_shared` (shared library) or `libclarabel_c_static` (static library) target in CMake. -- `#include ` in your C/C++ source files. +- `#include ` in your C++ source files or ` in your C source files. # License 🔍 This project is licensed under the Apache License 2.0 - see the [LICENSE.md](LICENSE.md) file for details. diff --git a/examples/c/example_callback.c b/examples/c/example_callback.c index 9395170..feb7371 100644 --- a/examples/c/example_callback.c +++ b/examples/c/example_callback.c @@ -1,6 +1,6 @@ #include "utils.h" #include -#include +#include int custom_callback(ClarabelDefaultInfo *info, void* _userdata) diff --git a/examples/c/example_callback_with_state.c b/examples/c/example_callback_with_state.c index df0e405..eb9739c 100644 --- a/examples/c/example_callback_with_state.c +++ b/examples/c/example_callback_with_state.c @@ -1,6 +1,6 @@ #include "utils.h" #include -#include +#include typedef struct diff --git a/examples/c/example_expcone.c b/examples/c/example_expcone.c index c79463b..5b67200 100644 --- a/examples/c/example_expcone.c +++ b/examples/c/example_expcone.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include int main(void) diff --git a/examples/c/example_genpowcone.c b/examples/c/example_genpowcone.c index 3002180..0b6745f 100644 --- a/examples/c/example_genpowcone.c +++ b/examples/c/example_genpowcone.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include // Generalized Power Cone Example // diff --git a/examples/c/example_json.c b/examples/c/example_json.c index 497c3ae..616aba2 100644 --- a/examples/c/example_json.c +++ b/examples/c/example_json.c @@ -1,7 +1,7 @@ // #define FEATURE_SDP #include "utils.h" #include -#include +#include #include #include diff --git a/examples/c/example_lp.c b/examples/c/example_lp.c index cbb2ed1..acc904a 100644 --- a/examples/c/example_lp.c +++ b/examples/c/example_lp.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include int main(void) { diff --git a/examples/c/example_pardiso_mkl.c b/examples/c/example_pardiso_mkl.c index 1413754..9824722 100644 --- a/examples/c/example_pardiso_mkl.c +++ b/examples/c/example_pardiso_mkl.c @@ -3,7 +3,7 @@ #include "utils.h" #include -#include +#include int main(void) { diff --git a/examples/c/example_powcone.c b/examples/c/example_powcone.c index 4da7e1f..19c028e 100644 --- a/examples/c/example_powcone.c +++ b/examples/c/example_powcone.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include // Power Cone Example // diff --git a/examples/c/example_print_stream.c b/examples/c/example_print_stream.c index b904e31..1715eb6 100644 --- a/examples/c/example_print_stream.c +++ b/examples/c/example_print_stream.c @@ -1,7 +1,7 @@ // #define FEATURE_SDP #include "utils.h" #include -#include +#include #include #include diff --git a/examples/c/example_qp.c b/examples/c/example_qp.c index a85d6c9..cbfaa20 100644 --- a/examples/c/example_qp.c +++ b/examples/c/example_qp.c @@ -3,7 +3,7 @@ #include "utils.h" #include -#include +#include int main(void) { diff --git a/examples/c/example_qp_f32.c b/examples/c/example_qp_f32.c index 8e371df..da468fa 100644 --- a/examples/c/example_qp_f32.c +++ b/examples/c/example_qp_f32.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include int main(void) { diff --git a/examples/c/example_qp_f64.c b/examples/c/example_qp_f64.c index b898d49..3cd593e 100644 --- a/examples/c/example_qp_f64.c +++ b/examples/c/example_qp_f64.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include int main(void) { diff --git a/examples/c/example_sdp.c b/examples/c/example_sdp.c index be66dd3..afb2349 100644 --- a/examples/c/example_sdp.c +++ b/examples/c/example_sdp.c @@ -1,7 +1,7 @@ // #define FEATURE_SDP #include "utils.h" -#include +#include #include #include diff --git a/examples/c/example_socp.c b/examples/c/example_socp.c index aace879..64dd7c4 100644 --- a/examples/c/example_socp.c +++ b/examples/c/example_socp.c @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include int main(void) { diff --git a/examples/c/utils.h b/examples/c/utils.h index 7fd8513..1d401e1 100644 --- a/examples/c/utils.h +++ b/examples/c/utils.h @@ -1,7 +1,7 @@ #ifndef UTILS_H #define UTILS_H -#include +#include void print_solution_f64(ClarabelDefaultSolution_f64 *solution); diff --git a/examples/cpp/example_callback.cpp b/examples/cpp/example_callback.cpp index 85fb7e9..1cc43c2 100644 --- a/examples/cpp/example_callback.cpp +++ b/examples/cpp/example_callback.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/example_callback_with_state.cpp b/examples/cpp/example_callback_with_state.cpp index 92a0cbe..06fb7e5 100644 --- a/examples/cpp/example_callback_with_state.cpp +++ b/examples/cpp/example_callback_with_state.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/example_expcone.cpp b/examples/cpp/example_expcone.cpp index 16e3440..c51d534 100644 --- a/examples/cpp/example_expcone.cpp +++ b/examples/cpp/example_expcone.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include #include diff --git a/examples/cpp/example_faer.cpp b/examples/cpp/example_faer.cpp index 1ef8876..c89d1cf 100644 --- a/examples/cpp/example_faer.cpp +++ b/examples/cpp/example_faer.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/example_genpowcone.cpp b/examples/cpp/example_genpowcone.cpp index 9e0e572..8922c9d 100644 --- a/examples/cpp/example_genpowcone.cpp +++ b/examples/cpp/example_genpowcone.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include #include diff --git a/examples/cpp/example_json.cpp b/examples/cpp/example_json.cpp index e411d33..9c10222 100644 --- a/examples/cpp/example_json.cpp +++ b/examples/cpp/example_json.cpp @@ -1,6 +1,6 @@ // #define FEATURE_SDP #include "utils.h" -#include +#include #include using namespace clarabel; diff --git a/examples/cpp/example_lp.cpp b/examples/cpp/example_lp.cpp index 71e4241..20e3a90 100644 --- a/examples/cpp/example_lp.cpp +++ b/examples/cpp/example_lp.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/example_pardiso_mkl.cpp b/examples/cpp/example_pardiso_mkl.cpp index 398289f..60cfd5a 100644 --- a/examples/cpp/example_pardiso_mkl.cpp +++ b/examples/cpp/example_pardiso_mkl.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/example_powcone.cpp b/examples/cpp/example_powcone.cpp index aeb48a8..f411c91 100644 --- a/examples/cpp/example_powcone.cpp +++ b/examples/cpp/example_powcone.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include #include diff --git a/examples/cpp/example_print_stream.cpp b/examples/cpp/example_print_stream.cpp index 320f7f3..9f90f0b 100644 --- a/examples/cpp/example_print_stream.cpp +++ b/examples/cpp/example_print_stream.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include #include diff --git a/examples/cpp/example_qp.cpp b/examples/cpp/example_qp.cpp index b3b989a..e5dd77e 100644 --- a/examples/cpp/example_qp.cpp +++ b/examples/cpp/example_qp.cpp @@ -1,6 +1,6 @@ #include "utils.h" #include -#include +#include #include #include diff --git a/examples/cpp/example_sdp.cpp b/examples/cpp/example_sdp.cpp index 56c24aa..8a16cfc 100644 --- a/examples/cpp/example_sdp.cpp +++ b/examples/cpp/example_sdp.cpp @@ -1,7 +1,7 @@ // #define FEATURE_SDP #include "utils.h" -#include +#include #include #include #include diff --git a/examples/cpp/example_socp.cpp b/examples/cpp/example_socp.cpp index b53b6ba..dd61873 100644 --- a/examples/cpp/example_socp.cpp +++ b/examples/cpp/example_socp.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include #include #include diff --git a/examples/cpp/utils.h b/examples/cpp/utils.h index 1b4bfa5..528e950 100644 --- a/examples/cpp/utils.h +++ b/examples/cpp/utils.h @@ -1,7 +1,7 @@ #ifndef UTILS_H #define UTILS_H -#include +#include #include #include diff --git a/include/Clarabel.hpp b/include/Clarabel.hpp deleted file mode 100644 index 410348e..0000000 --- a/include/Clarabel.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef CLARABEL_H -#define CLARABEL_H - -#include "cpp/CscMatrix.h" -#include "cpp/DefaultSettings.h" -#include "cpp/DefaultInfo.h" -#include "cpp/DefaultSolution.h" -#include "cpp/DefaultSolver.h" -#include "cpp/SupportedConeT.h" - -#endif // CLARABEL_H diff --git a/include/Clarabel.h b/include/clarabel.h similarity index 100% rename from include/Clarabel.h rename to include/clarabel.h diff --git a/include/clarabel.hpp b/include/clarabel.hpp new file mode 100644 index 0000000..c5d8f10 --- /dev/null +++ b/include/clarabel.hpp @@ -0,0 +1,11 @@ +#ifndef CLARABEL_H +#define CLARABEL_H + +#include "cpp/CscMatrix.hpp" +#include "cpp/DefaultSettings.hpp" +#include "cpp/DefaultInfo.hpp" +#include "cpp/DefaultSolution.hpp" +#include "cpp/DefaultSolver.hpp" +#include "cpp/SupportedConeT.hpp" + +#endif // CLARABEL_H diff --git a/include/cpp/CscMatrix.h b/include/cpp/CscMatrix.hpp similarity index 100% rename from include/cpp/CscMatrix.h rename to include/cpp/CscMatrix.hpp diff --git a/include/cpp/DefaultInfo.h b/include/cpp/DefaultInfo.hpp similarity index 93% rename from include/cpp/DefaultInfo.h rename to include/cpp/DefaultInfo.hpp index 16982a9..9bff1df 100644 --- a/include/cpp/DefaultInfo.h +++ b/include/cpp/DefaultInfo.hpp @@ -1,7 +1,7 @@ #pragma once -#include "DefaultSettings.h" -#include "DefaultSolution.h" +#include "DefaultSettings.hpp" +#include "DefaultSolution.hpp" #include #include diff --git a/include/cpp/DefaultSettings.h b/include/cpp/DefaultSettings.hpp similarity index 100% rename from include/cpp/DefaultSettings.h rename to include/cpp/DefaultSettings.hpp diff --git a/include/cpp/DefaultSolution.h b/include/cpp/DefaultSolution.hpp similarity index 100% rename from include/cpp/DefaultSolution.h rename to include/cpp/DefaultSolution.hpp diff --git a/include/cpp/DefaultSolver.h b/include/cpp/DefaultSolver.hpp similarity index 99% rename from include/cpp/DefaultSolver.h rename to include/cpp/DefaultSolver.hpp index b9ac4e4..12206e8 100644 --- a/include/cpp/DefaultSolver.h +++ b/include/cpp/DefaultSolver.hpp @@ -1,10 +1,10 @@ #pragma once -#include "CscMatrix.h" -#include "DefaultInfo.h" -#include "DefaultSettings.h" -#include "DefaultSolution.h" -#include "SupportedConeT.h" +#include "CscMatrix.hpp" +#include "DefaultInfo.hpp" +#include "DefaultSettings.hpp" +#include "DefaultSolution.hpp" +#include "SupportedConeT.hpp" #include #include diff --git a/include/cpp/SupportedConeT.h b/include/cpp/SupportedConeT.hpp similarity index 100% rename from include/cpp/SupportedConeT.h rename to include/cpp/SupportedConeT.hpp diff --git a/tests/api_dimension_checks.cpp b/tests/api_dimension_checks.cpp index 52488d3..b296d08 100644 --- a/tests/api_dimension_checks.cpp +++ b/tests/api_dimension_checks.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_eq_constrained.cpp b/tests/basic_eq_constrained.cpp index 103e7bf..69ca5fb 100644 --- a/tests/basic_eq_constrained.cpp +++ b/tests/basic_eq_constrained.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_expcone.cpp b/tests/basic_expcone.cpp index ab13f0c..a64fc22 100644 --- a/tests/basic_expcone.cpp +++ b/tests/basic_expcone.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_genpowcone.cpp b/tests/basic_genpowcone.cpp index c46c0f9..2151830 100644 --- a/tests/basic_genpowcone.cpp +++ b/tests/basic_genpowcone.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_lp.cpp b/tests/basic_lp.cpp index 34a80d6..9375dfb 100644 --- a/tests/basic_lp.cpp +++ b/tests/basic_lp.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_powcone.cpp b/tests/basic_powcone.cpp index 96b8936..1974240 100644 --- a/tests/basic_powcone.cpp +++ b/tests/basic_powcone.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_qp.cpp b/tests/basic_qp.cpp index 77852ba..69a5c87 100644 --- a/tests/basic_qp.cpp +++ b/tests/basic_qp.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_sdp.cpp b/tests/basic_sdp.cpp index 35a7c58..0b3acf8 100644 --- a/tests/basic_sdp.cpp +++ b/tests/basic_sdp.cpp @@ -1,5 +1,5 @@ #ifdef FEATURE_SDP -#include +#include #include #include #include diff --git a/tests/basic_socp.cpp b/tests/basic_socp.cpp index 2f1f0a7..06d6578 100644 --- a/tests/basic_socp.cpp +++ b/tests/basic_socp.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/basic_unconstrained.cpp b/tests/basic_unconstrained.cpp index 23bff37..7d7af55 100644 --- a/tests/basic_unconstrained.cpp +++ b/tests/basic_unconstrained.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/data_updating.cpp b/tests/data_updating.cpp index 1a5ca96..e8dd8e4 100644 --- a/tests/data_updating.cpp +++ b/tests/data_updating.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/get_info.cpp b/tests/get_info.cpp index b28a19a..f9946b8 100644 --- a/tests/get_info.cpp +++ b/tests/get_info.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/mixed_conic.cpp b/tests/mixed_conic.cpp index 5dfb05b..c114b1a 100644 --- a/tests/mixed_conic.cpp +++ b/tests/mixed_conic.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/sdp_chordal.cpp b/tests/sdp_chordal.cpp index cd6a1c5..6d9767c 100644 --- a/tests/sdp_chordal.cpp +++ b/tests/sdp_chordal.cpp @@ -1,5 +1,5 @@ #ifdef FEATURE_SDP -#include +#include #include #include #include