Maniverse 0.3.1__tar.gz → 0.3.3__tar.gz

{maniverse-0.3.1 → maniverse-0.3.3/Maniverse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Maniverse
-Version: 0.3.1
+Version: 0.3.3
 Summary: Numerical optimization on manifolds
 Home-page: https://github.com/FreemanTheMaverick/Maniverse.git
 Author: FreemanTheMaverick
@@ -78,12 +78,7 @@ $ git clone https://github.com/FreemanTheMaverick/Maniverse.git
     $ python
     >>> import Maniverse as mv
     ```
-### Pip (for Python use only)
-* Setting environment variables
-```
-$ export PYTHON3=[The path where you can find "Python.h".] # You may check this by the command "locate Python.h".
-$ export EIGEN3=[The path where you can find "Eigen/", "signature_of_eigen3_matrix_library" and "unsupported/".] # This is optional. If this is not set, the Eigen3 library will be downloaded automatically.
-```
+### Pip (for Python only)
 * Installation with `pip`
 ```
 pip install Maniverse

{maniverse-0.3.1 → maniverse-0.3.3}/Maniverse.egg-info/SOURCES.txt

@@ -6,12 +6,25 @@ Maniverse.egg-info/PKG-INFO
 Maniverse.egg-info/SOURCES.txt
 Maniverse.egg-info/dependency_links.txt
 Maniverse.egg-info/top_level.txt
+src/Macro.h
 src/PyManiverse.cpp
 src/Manifold/Grassmann.cpp
+src/Manifold/Grassmann.h
 src/Manifold/Manifold.cpp
+src/Manifold/Manifold.h
 src/Manifold/Orthogonal.cpp
+src/Manifold/Orthogonal.h
+src/Manifold/PyManifoldIn.h
+src/Manifold/PyManifoldOut.h
 src/Manifold/Simplex.cpp
+src/Manifold/Simplex.h
 src/Manifold/TransRotInvPointCloud.cpp
+src/Manifold/TransRotInvPointCloud.h
 src/Optimizer/HessUpdate.cpp
+src/Optimizer/HessUpdate.h
+src/Optimizer/PyOptimizerIn.h
+src/Optimizer/PyOptimizerOut.h
 src/Optimizer/SubSolver.cpp
-src/Optimizer/TrustRegion.cpp
+src/Optimizer/SubSolver.h
+src/Optimizer/TrustRegion.cpp
+src/Optimizer/TrustRegion.h

maniverse-0.3.3/Maniverse.egg-info/top_level.txt

@@ -0,0 +1,4 @@
+Maniverse
+src
+src/Manifold
+src/Optimizer

{maniverse-0.3.1/Maniverse.egg-info → maniverse-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Maniverse
-Version: 0.3.1
+Version: 0.3.3
 Summary: Numerical optimization on manifolds
 Home-page: https://github.com/FreemanTheMaverick/Maniverse.git
 Author: FreemanTheMaverick
@@ -78,12 +78,7 @@ $ git clone https://github.com/FreemanTheMaverick/Maniverse.git
     $ python
     >>> import Maniverse as mv
     ```
-### Pip (for Python use only)
-* Setting environment variables
-```
-$ export PYTHON3=[The path where you can find "Python.h".] # You may check this by the command "locate Python.h".
-$ export EIGEN3=[The path where you can find "Eigen/", "signature_of_eigen3_matrix_library" and "unsupported/".] # This is optional. If this is not set, the Eigen3 library will be downloaded automatically.
-```
+### Pip (for Python only)
 * Installation with `pip`
 ```
 pip install Maniverse

{maniverse-0.3.1 → maniverse-0.3.3}/README.md

@@ -61,12 +61,7 @@ $ git clone https://github.com/FreemanTheMaverick/Maniverse.git
     $ python
     >>> import Maniverse as mv
     ```
-### Pip (for Python use only)
-* Setting environment variables
-```
-$ export PYTHON3=[The path where you can find "Python.h".] # You may check this by the command "locate Python.h".
-$ export EIGEN3=[The path where you can find "Eigen/", "signature_of_eigen3_matrix_library" and "unsupported/".] # This is optional. If this is not set, the Eigen3 library will be downloaded automatically.
-```
+### Pip (for Python only)
 * Installation with `pip`
 ```
 pip install Maniverse

{maniverse-0.3.1 → maniverse-0.3.3}/pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "pybind11", "wget"]
+requires = ["setuptools", "pybind11"]
 build-backend = "setuptools.build_meta"

{maniverse-0.3.1 → maniverse-0.3.3}/setup.py

@@ -1,33 +1,27 @@
 import os
-import wget
+import urllib.request
 import tarfile
-import subprocess
 from glob import glob
 from setuptools import setup, find_packages
-from setuptools.command.build import build
+from setuptools.command.build_py import build_py
 import pybind11
 from pybind11.setup_helpers import Pybind11Extension, ParallelCompile, naive_recompile
 
-__version__ = "0.3.1"
-pwd = os.path.dirname(__file__)
-
-# Checking dependencies
-EIGEN3 = os.getenv("EIGEN3", default = '')
-if len(EIGEN3) > 0:
-	print("Looking for Eigen3 at %s ..." % EIGEN3, end='')
-	if os.path.exists(EIGEN3 + "/Eigen/") and os.path.exists(EIGEN3 + "/unsupported/") and os.path.isfile(EIGEN3 + "/signature_of_eigen3_matrix_library"):
-		print("Found!")
-	else:
-		raise RuntimeError("Eigen3 does not exist!")
-else:
-	print("The environment variable $EIGEN3 is not set. -> Downloading ...")
-	filename = wget.download("https://gitlab.com/libeigen/eigen/-/archive/3.4-rc1/eigen-3.4-rc1.tar.gz", bar = None)
-	with tarfile.open(filename) as tar:
-		tar.extractall(path = pwd) # Directory: eigen-3.4-rc1
-	EIGEN3 = pwd + "/eigen-3.4-rc1/"
-	print("EIGEN3 is %s." % EIGEN3)
+__version__ = "0.3.3"
 
-pwd = os.path.abspath(pwd)
+# Downloading Eigen3
+pwd = os.path.dirname(__file__)
+EIGEN3 = pwd + "/eigen-3.4-rc1/"
+class CustomBuild(build_py):
+	def run(self):
+		url = "https://gitlab.com/libeigen/eigen/-/archive/3.4-rc1/eigen-3.4-rc1.tar.gz"
+		dest = pwd + "/eigen-3.4-rc1.tar.gz"
+		print("Downloading Eigen3 from %s to %s ..." % (url, dest))
+		urllib.request.urlretrieve(url, dest)
+		print("Extracting %s to %s ..." % (dest, EIGEN3))
+		with tarfile.open(dest) as tar:
+			tar.extractall(path = pwd) # Directory: eigen-3.4-rc1
+		super().run()
 
 ParallelCompile(
 	"NPY_NUM_BUILD_JOBS",
@@ -35,12 +29,11 @@ ParallelCompile(
 ).install()
 
 MV_CPP = sorted(glob("src/*.cpp") + glob("src/*/*.cpp"))
-MV_HEADER = sorted(glob("src/*.h") + glob("src/*/*.h"))
 ext_modules = [ Pybind11Extension(
 	"Maniverse",
 	MV_CPP,
 	undef_macros = ["DEBUG"],
-	include_dirs = [EIGEN3, MV_HEADER],
+	include_dirs = [EIGEN3],
 	extra_compile_args = ["-O3", "-D__PYTHON__", "-DEIGEN_INITIALIZE_MATRICES_BY_ZERO"],
 	cxx_std = 17,
 	language = "c++"
@@ -54,6 +47,13 @@ setup(
 		long_description = open("README.md").read(),
 		long_description_content_type = "text/markdown",
 		url = "https://github.com/FreemanTheMaverick/Maniverse.git",
+		cmdclass = {"build_py": CustomBuild},
 		ext_modules = ext_modules,
+		packages = ["src", "src/Manifold", "src/Optimizer"],
+		package_data = {
+			"src": ["*.h"],
+			"src/Manifold": ["*.h"],
+			"src/Optimizer": ["*.h"],
+		},
 		classifiers = ["Programming Language :: Python :: 3"]
 )

maniverse-0.3.3/src/Macro.h

@@ -0,0 +1,19 @@
+#define EigenArray Eigen::ArrayXd
+#define EigenVector Eigen::VectorXd
+#define EigenDiagonal Eigen::DiagonalMatrix<double, -1, -1>
+#define EigenMatrix Eigen::MatrixXd
+#define EigenZero Eigen::MatrixXd::Zero
+#define EigenOne Eigen::MatrixXd::Identity
+
+#define Diag(X) (X).diagonal().asDiagonal()
+#define Dot(X, Y) ( (X).transpose() * (Y) ).trace()
+
+#define __Not_Implemented__\
+	std::string func_name = __func__;\
+	std::string class_name = typeid(*this).name();\
+	throw std::runtime_error(func_name + " for " + class_name + " is not implemented!");
+
+#define __True_False__(x) ( x ? "True" : "False" )
+
+#define __now__ std::chrono::high_resolution_clock::now()
+#define __duration__(start, end) std::chrono::duration<double>(end - start).count()

maniverse-0.3.3/src/Manifold/Grassmann.h

@@ -0,0 +1,27 @@
+#include "Manifold.h"
+
+class Grassmann: public Manifold{ public:
+	EigenMatrix Projector;
+	mutable std::vector<std::tuple<EigenMatrix, EigenMatrix>> LogCache;
+	mutable std::vector<std::tuple<EigenMatrix, EigenMatrix, EigenMatrix>> TransportTangentCache;
+
+	Grassmann(EigenMatrix p, bool matrix_free);
+
+	int getDimension() const override;
+	double Inner(EigenMatrix X, EigenMatrix Y) const override;
+
+	EigenMatrix Exponential(EigenMatrix X) const override;
+	EigenMatrix Logarithm(Manifold& N) const override;
+
+	EigenMatrix TangentProjection(EigenMatrix A) const override;
+	EigenMatrix TangentPurification(EigenMatrix A) const override;
+
+	EigenMatrix TransportTangent(EigenMatrix X, EigenMatrix Y) const override;
+	EigenMatrix TransportManifold(EigenMatrix X, Manifold& N) const override;
+
+	void Update(EigenMatrix p, bool purify) override;
+	void getGradient() override;
+	void getHessian() override;
+
+	std::unique_ptr<Manifold> Clone() const override;
+};

maniverse-0.3.3/src/Manifold/Manifold.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#define __Check_Log_Map__\
+	if ( typeid(N) != typeid(*this) )\
+		throw std::runtime_error("The point to logarithm map is not in " + std::string(typeid(*this).name()) + "but in " + std::string(typeid(N).name()) + "!");
+
+#define __Check_Vec_Transport__\
+	if ( typeid(N) != typeid(*this) )\
+		throw std::runtime_error("The destination of vector transport is not in " + std::string(typeid(*this).name()) + "but in " + std::string(typeid(N).name()) + "!");
+
+class Manifold{ public:
+	std::string Name;
+	EigenMatrix P;
+	EigenMatrix Ge;
+	EigenMatrix Gr;
+	bool MatrixFree;
+	EigenMatrix Hem;
+	std::vector<std::tuple<double, EigenMatrix>> Hrm;
+	std::function<EigenMatrix (EigenMatrix)> He;
+	std::function<EigenMatrix (EigenMatrix)> Hr;
+	std::vector<EigenMatrix> BasisSet;
+
+	Manifold(EigenMatrix p, bool matrix_free);
+	virtual int getDimension() const;
+	virtual double Inner(EigenMatrix X, EigenMatrix Y) const;
+	void getBasisSet();
+	void getHessianMatrix();
+
+	virtual EigenMatrix Exponential(EigenMatrix X) const;
+	virtual EigenMatrix Logarithm(Manifold& N) const;
+
+	virtual EigenMatrix TangentProjection(EigenMatrix A) const;
+	virtual EigenMatrix TangentPurification(EigenMatrix A) const;
+
+	virtual EigenMatrix TransportTangent(EigenMatrix X, EigenMatrix Y) const;
+	virtual EigenMatrix TransportManifold(EigenMatrix X, Manifold& N) const;
+
+	virtual void Update(EigenMatrix p, bool purify);
+	virtual void getGradient();
+	virtual void getHessian();
+
+	virtual ~Manifold() = default;
+	virtual std::unique_ptr<Manifold> Clone() const;
+};
+
+std::vector<std::tuple<double, EigenMatrix>> Diagonalize(
+		EigenMatrix& A, std::vector<EigenMatrix>& basis_set);

maniverse-0.3.3/src/Manifold/Orthogonal.h

@@ -0,0 +1,23 @@
+#include "Manifold.h"
+
+class Orthogonal: public Manifold{ public:
+	Orthogonal(EigenMatrix p, bool matrix_free);
+
+	int getDimension() const override;
+	double Inner(EigenMatrix X, EigenMatrix Y) const override;
+
+	EigenMatrix Exponential(EigenMatrix X) const override;
+	EigenMatrix Logarithm(Manifold& N) const override;
+
+	EigenMatrix TangentProjection(EigenMatrix A) const override;
+	EigenMatrix TangentPurification(EigenMatrix A) const override;
+
+	EigenMatrix TransportTangent(EigenMatrix X, EigenMatrix Y) const override;
+	EigenMatrix TransportManifold(EigenMatrix X, Manifold& N) const override;
+
+	void Update(EigenMatrix p, bool purify) override;
+	void getGradient() override;
+	void getHessian() override;
+
+	std::unique_ptr<Manifold> Clone() const override;
+};

maniverse-0.3.3/src/Manifold/PyManifoldIn.h

@@ -0,0 +1,5 @@
+Init_Manifold(m);
+Init_Simplex(m);
+Init_Orthogonal(m);
+Init_Grassmann(m);
+Init_TransRotInvPointCloud(m);

maniverse-0.3.3/src/Manifold/PyManifoldOut.h

@@ -0,0 +1,5 @@
+void Init_Manifold(pybind11::module_& m);
+void Init_Simplex(pybind11::module_& m);
+void Init_Orthogonal(pybind11::module_& m);
+void Init_Grassmann(pybind11::module_& m);
+void Init_TransRotInvPointCloud(pybind11::module_& m);

maniverse-0.3.3/src/Manifold/Simplex.h

@@ -0,0 +1,24 @@
+#include "Manifold.h"
+
+class Simplex: public Manifold{ public:
+	EigenMatrix Hem;
+	Simplex(EigenMatrix p, bool hess_transport_matrix);
+
+	int getDimension() const override;
+	double Inner(EigenMatrix X, EigenMatrix Y) const override;
+
+	EigenMatrix Exponential(EigenMatrix X) const override;
+	EigenMatrix Logarithm(Manifold& N) const override;
+
+	EigenMatrix TangentProjection(EigenMatrix A) const override;
+	EigenMatrix TangentPurification(EigenMatrix A) const override;
+
+	//EigenMatrix TransportTangent(EigenMatrix X, EigenMatrix Y) override;
+	//EigenMatrix TransportManifold(EigenMatrix X, Manifold& N) override;
+
+	void Update(EigenMatrix p, bool purify) override;
+	void getGradient() override;
+	void getHessian() override;
+
+	std::unique_ptr<Manifold> Clone() const override;
+};

maniverse-0.3.3/src/Manifold/TransRotInvPointCloud.h

@@ -0,0 +1,23 @@
+#include "Manifold.h"
+
+class TransRotInvPointCloud: public Manifold{ public:
+	TransRotInvPointCloud(EigenMatrix p, bool matrix_free);
+
+	int getDimension() const override;
+	double Inner(EigenMatrix X, EigenMatrix Y) const override;
+
+	EigenMatrix Exponential(EigenMatrix X) const override;
+	EigenMatrix Logarithm(Manifold& N) const override;
+
+	EigenMatrix TangentProjection(EigenMatrix A) const override;
+	EigenMatrix TangentPurification(EigenMatrix A) const override;
+
+	//EigenMatrix TransportTangent(EigenMatrix X, EigenMatrix Y) override const;
+	EigenMatrix TransportManifold(EigenMatrix X, Manifold& N) const override;
+
+	void Update(EigenMatrix p, bool purify) override;
+	void getGradient() override;
+	void getHessian() override;
+
+	std::unique_ptr<Manifold> Clone() const override;
+};

maniverse-0.3.3/src/Optimizer/HessUpdate.h

@@ -0,0 +1,21 @@
+class HessUpdate{ public:
+	int Size = 0;
+	bool Verbose = 1;
+	std::vector<std::unique_ptr<Manifold>> Ms;
+	std::vector<std::map<std::string, EigenMatrix>> Caches; // For matrix-free
+	std::vector<std::tuple<double, EigenMatrix>> EigenPairs; // For non-matrix-free
+	std::function<double (double)> CautiousThreshold = [](double gnorm){ return -gnorm; };
+	HessUpdate(int n);
+	void Append(Manifold& M, EigenMatrix Step);
+	virtual void AdmittedAppend(Manifold& M, EigenMatrix Step);
+	EigenMatrix Hessian(EigenMatrix v);
+	virtual EigenMatrix HessianMatrixFree(EigenMatrix v);
+	void Clear();
+	virtual ~HessUpdate() = default;
+};
+
+class BroydenFletcherGoldfarbShanno: public HessUpdate{ public:
+	BroydenFletcherGoldfarbShanno(int n): HessUpdate(n){}
+	void AdmittedAppend(Manifold& M, EigenMatrix Step) override;
+	EigenMatrix HessianMatrixFree(EigenMatrix v) override;
+};

maniverse-0.3.3/src/Optimizer/PyOptimizerIn.h

@@ -0,0 +1,3 @@
+Init_TrustRegion(m);
+Init_SubSolver(m);
+Init_HessUpdate(m);

maniverse-0.3.3/src/Optimizer/PyOptimizerOut.h

@@ -0,0 +1,3 @@
+void Init_TrustRegion(pybind11::module_& m);
+void Init_SubSolver(pybind11::module_& m);
+void Init_HessUpdate(pybind11::module_& m);

maniverse-0.3.3/src/Optimizer/SubSolver.h

@@ -0,0 +1,16 @@
+class TruncatedConjugateGradient{ public:
+	Manifold* M;
+	std::function<EigenMatrix (EigenMatrix)>* Func;
+	bool Verbose;
+	bool ShowTarget;
+	double Radius;
+	std::function<bool (double, double, double, double)> Tolerance;
+	std::vector<std::tuple<double, EigenMatrix, EigenMatrix>> Sequence; // Step size, S, P.
+	TruncatedConjugateGradient(){};
+	TruncatedConjugateGradient(
+			Manifold* m, std::function<EigenMatrix (EigenMatrix)>* func,
+			bool verbose, bool showtarget
+	): M(m), Func(func), Verbose(verbose), ShowTarget(showtarget){};
+	void Run();
+	std::tuple<double, EigenMatrix> Find(); // Step size, S.
+};

maniverse-0.3.3/src/Optimizer/TrustRegion.h

@@ -0,0 +1,33 @@
+class TrustRegionSetting{ public:
+	double R0;
+	double RhoThreshold;
+	std::function<double (double, double, double)> Update;
+	TrustRegionSetting();
+};
+
+bool TrustRegion(
+		std::function<
+			std::tuple<
+				double,
+				EigenMatrix,
+				std::function<EigenMatrix (EigenMatrix)>
+			> (EigenMatrix, int)
+		>& func,
+		TrustRegionSetting& tr_setting,
+		std::tuple<double, double, double> tol,
+		double tcg_tol,
+		int recalc_hess, int max_iter,
+		double& L, Manifold& M, int output);
+
+bool TrustRegionRationalFunction(
+		std::function<
+			std::tuple<
+				double,
+				EigenMatrix,
+				std::function<EigenMatrix (EigenMatrix)>
+			> (EigenMatrix, int)
+		>& func,
+		TrustRegionSetting& tr_setting,
+		std::tuple<double, double, double> tol,
+		int recalc_hess, int max_iter,
+		double& L, Manifold& M, int output);

maniverse-0.3.1/Maniverse.egg-info/top_level.txt

@@ -1 +0,0 @@
-Maniverse