chore: reorganize the repo to workspace

The plan is to move all fundamental blocks to a separate "gomez_core" crate which can be used for implementing solvers and optimizers in other libraries, without the need to import implementations in gomez. There may be further splitting done in the future.
datamole-ai · Jan 29, 2024 · 2cfa7a3 · 2cfa7a3
1 parent f4fad97
commit 2cfa7a3
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,10 +111,6 @@ jobs:
         working-directory: gsl-wrapper
         run: cargo test --profile ${{ matrix.profile }}
 
-      - name: Run checks (benches)
-        working-directory: gomez-bench
-        run: cargo check --profile ${{ matrix.profile }}
-
   rust-check-docs:
     name: Rust docs check
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,4 +20,4 @@ jobs:
         run: cargo test
 
       - name: Publish package
-        run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }}
+        run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }} --package gomez
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,24 +1,4 @@
-[package]
-name = "gomez"
-version = "0.5.0"
-authors = ["Petr Nevyhoštěný <[email protected]>"]
-description = "Framework and implementation for mathematical optimization and solving non-linear systems of equations."
-documentation = "https://docs.rs/gomez/"
-repository = "https://github.com/datamole-ai/gomez"
-license = "MIT"
-readme = "README.md"
-keywords = ["nonlinear-equations", "optimization", "math", "science"]
-categories = ["science", "mathematics"]
-edition = "2021"
-
-[features]
-testing = []
-
-[dependencies]
-approx = "0.5.0"
-fastrand = "2.0.0"
-fastrand-contrib = "0.1.0"
-getset = "0.1.0"
-log = "0.4.0"
-nalgebra = "0.32.0"
-thiserror = "1.0.0"
+[workspace]
+members = ["crates/*"]
+exclude = ["gsl-wrapper"]
+resolver = "2"
diff --git a/gomez-bench/Cargo.toml → crates/gomez-bench/Cargo.toml b/gomez-bench/Cargo.toml → crates/gomez-bench/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 divan = "0.1.2"
-gomez = { path = "..", features = ["testing"] }
-gsl-wrapper = { path = "../gsl-wrapper" }
+gomez = { path = "../gomez", features = ["testing"] }
+gsl-wrapper = { path = "../../gsl-wrapper" }
 
 [[bench]]
 name = "main"

diff --git a/gomez-bench/benches/main.rs → crates/gomez-bench/benches/main.rs b/gomez-bench/benches/main.rs → crates/gomez-bench/benches/main.rs
diff --git a/crates/gomez/Cargo.toml b/crates/gomez/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "gomez"
+version = "0.5.0"
+authors = ["Petr Nevyhoštěný <[email protected]>"]
+description = "Framework and implementation for mathematical optimization and solving non-linear systems of equations."
+documentation = "https://docs.rs/gomez/"
+repository = "https://github.com/datamole-ai/gomez"
+license = "MIT"
+readme = "../../README.md"
+keywords = ["nonlinear-equations", "optimization", "math", "science"]
+categories = ["science", "mathematics"]
+edition = "2021"
+
+[features]
+testing = []
+
+[dependencies]
+approx = "0.5.0"
+fastrand = "2.0.0"
+fastrand-contrib = "0.1.0"
+getset = "0.1.0"
+log = "0.4.0"
+nalgebra = "0.32.0"
+thiserror = "1.0.0"
diff --git a/examples/custom_algorithm.rs → crates/gomez/examples/custom_algorithm.rs b/examples/custom_algorithm.rs → crates/gomez/examples/custom_algorithm.rs
diff --git a/examples/equations.rs → crates/gomez/examples/equations.rs b/examples/equations.rs → crates/gomez/examples/equations.rs
diff --git a/examples/optimization.rs → crates/gomez/examples/optimization.rs b/examples/optimization.rs → crates/gomez/examples/optimization.rs
diff --git a/src/algo.rs → crates/gomez/src/algo.rs b/src/algo.rs → crates/gomez/src/algo.rs
diff --git a/src/algo/lipo.rs → crates/gomez/src/algo/lipo.rs b/src/algo/lipo.rs → crates/gomez/src/algo/lipo.rs
diff --git a/src/algo/nelder_mead.rs → crates/gomez/src/algo/nelder_mead.rs b/src/algo/nelder_mead.rs → crates/gomez/src/algo/nelder_mead.rs
diff --git a/src/algo/steffensen.rs → crates/gomez/src/algo/steffensen.rs b/src/algo/steffensen.rs → crates/gomez/src/algo/steffensen.rs
diff --git a/src/algo/trust_region.rs → crates/gomez/src/algo/trust_region.rs b/src/algo/trust_region.rs → crates/gomez/src/algo/trust_region.rs
diff --git a/src/analysis.rs → crates/gomez/src/analysis.rs b/src/analysis.rs → crates/gomez/src/analysis.rs
diff --git a/src/core.rs → crates/gomez/src/core.rs b/src/core.rs → crates/gomez/src/core.rs
diff --git a/src/core/base.rs → crates/gomez/src/core/base.rs b/src/core/base.rs → crates/gomez/src/core/base.rs
diff --git a/src/core/domain.rs → crates/gomez/src/core/domain.rs b/src/core/domain.rs → crates/gomez/src/core/domain.rs
diff --git a/src/core/function.rs → crates/gomez/src/core/function.rs b/src/core/function.rs → crates/gomez/src/core/function.rs
diff --git a/src/core/optimizer.rs → crates/gomez/src/core/optimizer.rs b/src/core/optimizer.rs → crates/gomez/src/core/optimizer.rs
diff --git a/src/core/solver.rs → crates/gomez/src/core/solver.rs b/src/core/solver.rs → crates/gomez/src/core/solver.rs
diff --git a/src/core/system.rs → crates/gomez/src/core/system.rs b/src/core/system.rs → crates/gomez/src/core/system.rs
diff --git a/src/derivatives.rs → crates/gomez/src/derivatives.rs b/src/derivatives.rs → crates/gomez/src/derivatives.rs
diff --git a/src/driver.rs → crates/gomez/src/driver.rs b/src/driver.rs → crates/gomez/src/driver.rs
diff --git a/src/lib.rs → crates/gomez/src/lib.rs b/src/lib.rs → crates/gomez/src/lib.rs
diff --git a/src/testing.rs → crates/gomez/src/testing.rs b/src/testing.rs → crates/gomez/src/testing.rs