remove gsl; downgrade to c++11

luk036 · luk036 · commit d652077cee4b · 2023-04-10T14:35:20.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 /.vscode
 /cpm_modules
 /.cache
+/.trunk
+/.xmake
 .DS_Store
diff --git a/.trunk/.gitignore b/.trunk/.gitignore
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ option(INSTALL_ONLY "Enable for installation only" OFF)
 # Note: update this to your new project's name and version
 project(
   LmiSolver
-  VERSION 1.3.7
+  VERSION 1.3.8
   LANGUAGES CXX
 )
 
diff --git a/bench/BM_lmi.cpp b/bench/BM_lmi.cpp
@@ -34,8 +34,8 @@ template <typename Oracle> class my_oracle {
    * @param[in] B2
    * @param[in] c
    */
-  my_oracle(size_t m1, gsl::span<const Matrix> F1, const Matrix &B1, size_t m2,
-            gsl::span<const Matrix> F2, const Matrix &B2, Vec c)
+  my_oracle(size_t m1, const std::vector<Matrix> &F1, const Matrix &B1,
+            size_t m2, const std::vector<Matrix> &F2, const Matrix &B2, Vec c)
       : lmi1{m1, F1, B1}, lmi2{m2, F2, B2}, c{std::move(c)} {}
 
   /**
diff --git a/include/lmisolver/lmi0_oracle.hpp b/include/lmisolver/lmi0_oracle.hpp
@@ -2,8 +2,9 @@
 #pragma once
 
 #include "ldlt_ext.hpp"
-#include <gsl/span>
+// #include <gsl/span>
 #include <memory> // for unique_ptr
+#include <vector>
 
 /**
  * @brief Oracle for Linear Matrix Inequality.
@@ -20,7 +21,7 @@ template <typename Arr036, typename Mat = Arr036> class Lmi0Oracle {
   ldlt_ext _Q;
 
 private:
-  const gsl::span<const Mat> _F;
+  const std::vector<Mat> &_F;
   std::unique_ptr<Cut> cut;
 
 public:
@@ -30,8 +31,8 @@ template <typename Arr036, typename Mat = Arr036> class Lmi0Oracle {
    * @param[in] F
    * @param[in] dim
    */
-  Lmi0Oracle(size_t dim, gsl::span<const Mat> F)
-      : _Q(dim), _F{F}, cut{std::make_unique<Cut>()} {}
+  Lmi0Oracle(size_t dim, const std::vector<Mat> &F)
+      : _Q(dim), _F{F}, cut{std::unique_ptr<Cut>(new Cut{})} {}
 
   /**
    * @brief
diff --git a/include/lmisolver/lmi_old_oracle.hpp b/include/lmisolver/lmi_old_oracle.hpp
@@ -2,8 +2,9 @@
 #pragma once
 
 #include "ldlt_ext.hpp"
-#include <gsl/span>
+// #include <gsl/span>
 #include <memory> // for unique_ptr
+#include <vector>
 
 /**
  * @brief Oracle for Linear Matrix Inequality.
@@ -19,7 +20,7 @@ template <typename Arr036, typename Mat = Arr036> class LmiOldOracle {
 private:
   size_t _m;
   ldlt_ext _Q;
-  const gsl::span<const Mat> _F;
+  const std::vector<Mat> &_F;
   const Mat _F0;
   std::unique_ptr<Cut> cut;
 
@@ -30,9 +31,9 @@ template <typename Arr036, typename Mat = Arr036> class LmiOldOracle {
    * @param[in] F
    * @param[in] B
    */
-  LmiOldOracle(size_t dim, gsl::span<const Mat> F, Mat B)
-      : _m{dim},
-        _Q(_m), _F{F}, _F0{std::move(B)}, cut{std::make_unique<Cut>()} {}
+  LmiOldOracle(size_t dim, const std::vector<Mat> &F, Mat B)
+      : _m{dim}, _Q{dim}, _F{F}, _F0{std::move(B)}, cut{std::unique_ptr<Cut>(
+                                                        new Cut{})} {}
 
   /**
    * @brief
diff --git a/include/lmisolver/lmi_oracle.hpp b/include/lmisolver/lmi_oracle.hpp
@@ -2,8 +2,9 @@
 #pragma once
 
 #include "ldlt_ext.hpp"
-#include <gsl/span>
+// #include <gsl/span>
 #include <memory> // for unique_ptr
+#include <vector>
 
 /**
  * @brief Oracle for Linear Matrix Inequality.
@@ -18,7 +19,7 @@ template <typename Arr036, typename Mat = Arr036> class LmiOracle {
 
 private:
   ldlt_ext _Q;
-  const gsl::span<const Mat> _F;
+  const std::vector<Mat> &_F;
   const Mat _F0;
   std::unique_ptr<Cut> cut;
 
@@ -29,8 +30,9 @@ template <typename Arr036, typename Mat = Arr036> class LmiOracle {
    * @param[in] F
    * @param[in] B
    */
-  LmiOracle(size_t dim, gsl::span<const Mat> F, Mat B)
-      : _Q{dim}, _F{F}, _F0{std::move(B)}, cut{std::make_unique<Cut>()} {}
+  LmiOracle(size_t dim, const std::vector<Mat> &F, Mat B)
+      : _Q{dim}, _F{F}, _F0{std::move(B)}, cut{std::unique_ptr<Cut>(
+                                               new Cut{})} {}
 
   /**
    * @brief
diff --git a/specific.cmake b/specific.cmake
@@ -7,11 +7,11 @@ CPMAddPackage(
 
 CPMAddPackage(
   NAME EllAlgo
-  GIT_TAG 1.3.6
+  GIT_TAG 1.3.8
   GITHUB_REPOSITORY luk036/ellalgo-cpp
   OPTIONS "INSTALL_ONLY YES" # create an installable target
 )
 
-CPMAddPackage("gh:microsoft/GSL@3.1.0")
+# CPMAddPackage("gh:microsoft/GSL@3.1.0")
 
-set(SPECIFIC_LIBS EllAlgo::EllAlgo fmt::fmt GSL)
+set(SPECIFIC_LIBS EllAlgo::EllAlgo fmt::fmt)
diff --git a/test/source/test_integers.tpp b/test/source/test_integers.tpp
diff --git a/test/source/test_lmi.cpp b/test/source/test_lmi.cpp
@@ -8,17 +8,10 @@
 #include <ellalgo/ell_matrix.hpp>    // for EllStable
 #include <ellalgo/ell_stable.hpp>    // for EllStable
 #include <lmisolver/lmi_oracle.hpp>  // for LmiOracle
-// #include <xtensor/xarray.hpp>          // for xarray_container
-// #include <xtensor/xlayout.hpp>         // for layout_type,
-// layout_type::row... #include <xtensor/xmath.hpp>           // for sum
-// #include <xtensor/xoperation.hpp>      // for xfunction_type_t, operator*
-// #include <xtensor/xreducer.hpp>        // for xreducer
-// #include <xtensor/xtensor_forward.hpp> // for xarray
-// #include <fmt/format.h>
-#include <gsl/span> // for span
+// #include <gsl/span> // for span
 // #include <spdlog/sinks/stdout_sinks.h>
 // #include <spdlog/spdlog.h>
-#include <optional>    // for optional
+// #include <optional>    // for optional
 #include <tuple>       // for tuple
 #include <type_traits> // for move, add_const<>::type
 #include <valarray>
@@ -50,8 +43,8 @@ class my_oracle {
    * @param[in] B2
    * @param[in] c
    */
-  my_oracle(size_t m1, gsl::span<const Matrix> F1, const Matrix &B1, size_t m2,
-            gsl::span<const Matrix> F2, const Matrix &B2, Vec c)
+  my_oracle(size_t m1, const std::vector<Matrix> &F1, const Matrix &B1,
+            size_t m2, const std::vector<Matrix> &F2, const Matrix &B2, Vec c)
       : lmi1{m1, F1, B1}, lmi2{m2, F2, B2}, c{std::move(c)} {}
 
   /**
diff --git a/test/source/test_lmi_old.cpp b/test/source/test_lmi_old.cpp
@@ -8,17 +8,10 @@
 #include <ellalgo/ell_matrix.hpp>       // for EllStable
 #include <ellalgo/ell_stable.hpp>       // for EllStable
 #include <lmisolver/lmi_old_oracle.hpp> // for LmiOldOracle
-// #include <xtensor/xarray.hpp>          // for xarray_container
-// #include <xtensor/xlayout.hpp>         // for layout_type,
-// layout_type::row... #include <xtensor/xmath.hpp>           // for sum
-// #include <xtensor/xoperation.hpp>      // for xfunction_type_t, operator*
-// #include <xtensor/xreducer.hpp>        // for xreducer
-// #include <xtensor/xtensor_forward.hpp> // for xarray
-// #include <fmt/format.h>
-#include <gsl/span> // for span
+// #include <gsl/span> // for span
 // #include <spdlog/sinks/stdout_sinks.h>
 // #include <spdlog/spdlog.h>
-#include <optional>    // for optional
+// #include <optional>    // for optional
 #include <tuple>       // for tuple
 #include <type_traits> // for move, add_const<>::type
 #include <valarray>
@@ -50,8 +43,9 @@ class my_old_oracle {
    * @param[in] B2
    * @param[in] c
    */
-  my_old_oracle(size_t m1, gsl::span<const Matrix> F1, const Matrix &B1,
-                size_t m2, gsl::span<const Matrix> F2, const Matrix &B2, Vec c)
+  my_old_oracle(size_t m1, const std::vector<Matrix> &F1, const Matrix &B1,
+                size_t m2, const std::vector<Matrix> &F2, const Matrix &B2,
+                Vec c)
       : lmi1{m1, F1, B1}, lmi2{m2, F2, B2}, c{std::move(c)} {}
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ option(INSTALL_ONLY "Enable for installation only" OFF)`
`12`	`12`	`# Note: update this to your new project's name and version`
`13`	`13`	`project(`
`14`	`14`	`LmiSolver`
`15`		`- VERSION 1.3.7`
	`15`	`+ VERSION 1.3.8`
`16`	`16`	`LANGUAGES CXX`
`17`	`17`	`)`
`18`	`18`