[SymForce] Rename opt/cholesky opt/sparse_cholesky

This is because a dense cholesky solver is being added but don't want to put it in the same directory because of the special license restrictions of the sparse cholesky solver. Topic: rename_opt_cholesky GitOrigin-RevId: b629bfc820bd0d729636cacdb33513a26a8fa685
symforce-org · Apr 17, 2023 · f5356d8 · f5356d8
1 parent caea9da
commit f5356d8
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/LICENSE b/LICENSE
@@ -200,12 +200,12 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-# symforce/opt/cholesky
+# symforce/opt/sparse_cholesky
 
-Code in symforce/opt/cholesky is adapted from LDL/SuiteSparse and its
+Code in symforce/opt/sparse_cholesky is adapted from LDL/SuiteSparse and its
 corresponding implementation in the SparseCholesky module of the Eigen library,
 and is licensed under the MPL2 license as described in
-symforce/opt/cholesky/LICENSE
+symforce/opt/sparse_cholesky/LICENSE
 
 # Third Party Code
 

diff --git a/symforce/opt/CMakeLists.txt b/symforce/opt/CMakeLists.txt
@@ -114,8 +114,8 @@ add_metis()
 # ------------------------------------------------------------------------------
 # symforce_cholesky
 
-file(GLOB SYMFORCE_CHOLESKY_SOURCES CONFIGURE_DEPENDS cholesky/*.cc)
-file(GLOB SYMFORCE_CHOLESKY_HEADERS CONFIGURE_DEPENDS cholesky/*.h cholesky/*.tcc)
+file(GLOB SYMFORCE_CHOLESKY_SOURCES CONFIGURE_DEPENDS sparse_cholesky/*.cc)
+file(GLOB SYMFORCE_CHOLESKY_HEADERS CONFIGURE_DEPENDS sparse_cholesky/*.h sparse_cholesky/*.tcc)
 add_library(
   symforce_cholesky
   ${SYMFORCE_LIBRARY_TYPE}

diff --git a/symforce/opt/levenberg_marquardt_solver.h b/symforce/opt/levenberg_marquardt_solver.h
@@ -11,10 +11,10 @@
 #include <lcmtypes/sym/optimization_stats_t.hpp>
 #include <lcmtypes/sym/optimizer_params_t.hpp>
 
-#include "./cholesky/sparse_cholesky_solver.h"
 #include "./internal/levenberg_marquardt_state.h"
 #include "./linearization.h"
 #include "./optimization_stats.h"
+#include "./sparse_cholesky/sparse_cholesky_solver.h"
 #include "./tic_toc.h"
 #include "./values.h"
 

diff --git a/symforce/opt/cholesky/LICENSE → symforce/opt/sparse_cholesky/LICENSE b/symforce/opt/cholesky/LICENSE → symforce/opt/sparse_cholesky/LICENSE
diff --git a/...ce/opt/cholesky/sparse_cholesky_solver.cc → ...sparse_cholesky/sparse_cholesky_solver.cc b/...ce/opt/cholesky/sparse_cholesky_solver.cc → ...sparse_cholesky/sparse_cholesky_solver.cc
diff --git a/...rce/opt/cholesky/sparse_cholesky_solver.h → .../sparse_cholesky/sparse_cholesky_solver.h b/...rce/opt/cholesky/sparse_cholesky_solver.h → .../sparse_cholesky/sparse_cholesky_solver.h
diff --git a/...e/opt/cholesky/sparse_cholesky_solver.tcc → ...parse_cholesky/sparse_cholesky_solver.tcc b/...e/opt/cholesky/sparse_cholesky_solver.tcc → ...parse_cholesky/sparse_cholesky_solver.tcc
diff --git a/symforce/opt/sparse_schur_solver.h b/symforce/opt/sparse_schur_solver.h
@@ -12,7 +12,7 @@
 #include <Eigen/MetisSupport>
 #include <Eigen/Sparse>
 
-#include "./cholesky/sparse_cholesky_solver.h"
+#include "./sparse_cholesky/sparse_cholesky_solver.h"
 
 namespace sym {
 

diff --git a/test/sparse_cholesky_solver_test.cc b/test/sparse_cholesky_solver_test.cc
@@ -16,7 +16,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <sym/ops/storage_ops.h>
-#include <symforce/opt/cholesky/sparse_cholesky_solver.h>
+#include <symforce/opt/sparse_cholesky/sparse_cholesky_solver.h>
 #include <symforce/opt/tic_toc.h>
 
 using SparseMatrix = Eigen::SparseMatrix<double>;

diff --git a/test/sparse_schur_solver_test.cc b/test/sparse_schur_solver_test.cc
@@ -20,7 +20,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <spdlog/spdlog.h>
 
-#include <symforce/opt/cholesky/sparse_cholesky_solver.h>
+#include <symforce/opt/sparse_cholesky/sparse_cholesky_solver.h>
 #include <symforce/opt/sparse_schur_solver.h>
 #include <symforce/opt/tic_toc.h>