Use Cargo workspaces to directly include vecmap dependency

lf-lang · Feb 5, 2023 · e16e34d · e16e34d
1 parent 7685764
commit e16e34d
Show file tree

Hide file tree

Showing 47 changed files with 26,619 additions and 66 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,69 +1,10 @@
-[package]
-name = "reactor_rt"
-version = "0.1.0"
-authors = ["Clément Fournier <clement.fournier76@gmail.com>"]
-edition = "2021"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-log = "0.4"
-index_vec = "0.1"
-#itertools = "0.10.1"
-#bit-set = "0.5"
-smallvec = { version = "1.6", features = ["const_generics"] }
-petgraph = "0.6"
-array-macro = "2.1"
-atomic_refcell = "0.1"
-crossbeam-utils = "0.8"
-crossbeam-channel = { git = "https://github.com/oowekyala/crossbeam.git", rev = "9eed66904f969156dedad4eef61ce91d23b9cccb" }
-static_assertions = "1.1.0"
-rayon = { version = "1.5", optional = true }
-vecmap = { git = "https://github.com/jhaye/vecmap", rev = "94a2709665620ed7847529cd90a44c19ebd8a195" }
-cfg-if = "1.0.0"
-
-[dev-dependencies]
-criterion = "0.3"
-env_logger = "0.9"
-assert_matches = "1.5"
-dmsort = "1.0.1"
-
-[features]
-default=["vec-id-sets"]
-# Enable the parallel runtime implementation todo make default
-parallel-runtime=["rayon"]
-# Enables 64-bit wide reaction ids on 64 bit architectures.
-# This may reduce performance, but allows for 2^32 reactor
-# instances compared to the default of 2^16, which may feel
-# a bit tight for some applications.
-wide-ids=[]
-vec-id-sets=[]
-no-unsafe=[]
-# used internally for benchmarking, to access private APIs
-public-internals=[]
-
-[[bench]]
-name = "savina_pong"
-harness = false
-
-[[bench]]
-name = "global_id"
-path = "benches/micro/global_id.rs"
-required-features = ["public-internals"]
-harness = false
-
-[[bench]]
-name = "dmsort"
-path = "benches/micro/dmsort.rs"
-required-features = ["public-internals"]
-harness = false
-
-[[bench]]
-name = "exec_reactions"
-path = "benches/micro/exec_reactions.rs"
-required-features = ["public-internals"]
-harness = false
+members = [
+    "runtime",
+    "vecmap",
+]
+exclude = [ "vecmap/creusot" ]
 
 [profile.bench]
-debug = true
-
+debug = true
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -0,0 +1,65 @@
+[package]
+name = "reactor_rt"
+version = "0.1.0"
+authors = ["Clément Fournier <clement.fournier76@gmail.com>"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4"
+index_vec = "0.1"
+#itertools = "0.10.1"
+#bit-set = "0.5"
+smallvec = { version = "1.6", features = ["const_generics"] }
+petgraph = "0.6"
+array-macro = "2.1"
+atomic_refcell = "0.1"
+crossbeam-utils = "0.8"
+crossbeam-channel = { git = "https://github.com/oowekyala/crossbeam.git", rev = "9eed66904f969156dedad4eef61ce91d23b9cccb" }
+static_assertions = "1.1.0"
+rayon = { version = "1.5", optional = true }
+vecmap = { path = "../vecmap" }
+cfg-if = "1.0.0"
+
+[dev-dependencies]
+criterion = "0.3"
+env_logger = "0.9"
+assert_matches = "1.5"
+dmsort = "1.0.1"
+
+[features]
+default=["vec-id-sets"]
+# Enable the parallel runtime implementation todo make default
+parallel-runtime=["rayon"]
+# Enables 64-bit wide reaction ids on 64 bit architectures.
+# This may reduce performance, but allows for 2^32 reactor
+# instances compared to the default of 2^16, which may feel
+# a bit tight for some applications.
+wide-ids=[]
+vec-id-sets=[]
+no-unsafe=[]
+# used internally for benchmarking, to access private APIs
+public-internals=[]
+
+[[bench]]
+name = "savina_pong"
+harness = false
+
+[[bench]]
+name = "global_id"
+path = "benches/micro/global_id.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "dmsort"
+path = "benches/micro/dmsort.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "exec_reactions"
+path = "benches/micro/exec_reactions.rs"
+required-features = ["public-internals"]
+harness = false
diff --git a/benches/README.md → runtime/benches/README.md b/benches/README.md → runtime/benches/README.md
diff --git a/benches/SavinaPong.lf → runtime/benches/SavinaPong.lf b/benches/SavinaPong.lf → runtime/benches/SavinaPong.lf
diff --git a/benches/micro/dmsort.rs → runtime/benches/micro/dmsort.rs b/benches/micro/dmsort.rs → runtime/benches/micro/dmsort.rs
diff --git a/benches/micro/exec_reactions.rs → runtime/benches/micro/exec_reactions.rs b/benches/micro/exec_reactions.rs → runtime/benches/micro/exec_reactions.rs
diff --git a/benches/micro/global_id.rs → runtime/benches/micro/global_id.rs b/benches/micro/global_id.rs → runtime/benches/micro/global_id.rs
diff --git a/benches/savina_pong.rs → runtime/benches/savina_pong.rs b/benches/savina_pong.rs → runtime/benches/savina_pong.rs
diff --git a/src/actions.rs → runtime/src/actions.rs b/src/actions.rs → runtime/src/actions.rs
diff --git a/src/assembly.rs → runtime/src/assembly.rs b/src/assembly.rs → runtime/src/assembly.rs
diff --git a/src/ids.rs → runtime/src/ids.rs b/src/ids.rs → runtime/src/ids.rs
diff --git a/src/lib.rs → runtime/src/lib.rs b/src/lib.rs → runtime/src/lib.rs
diff --git a/src/ports.rs → runtime/src/ports.rs b/src/ports.rs → runtime/src/ports.rs
diff --git a/src/scheduler/assembly_impl.rs → runtime/src/scheduler/assembly_impl.rs b/src/scheduler/assembly_impl.rs → runtime/src/scheduler/assembly_impl.rs
diff --git a/src/scheduler/context.rs → runtime/src/scheduler/context.rs b/src/scheduler/context.rs → runtime/src/scheduler/context.rs
diff --git a/src/scheduler/debug.rs → runtime/src/scheduler/debug.rs b/src/scheduler/debug.rs → runtime/src/scheduler/debug.rs
diff --git a/src/scheduler/dependencies.rs → runtime/src/scheduler/dependencies.rs b/src/scheduler/dependencies.rs → runtime/src/scheduler/dependencies.rs
diff --git a/src/scheduler/events.rs → runtime/src/scheduler/events.rs b/src/scheduler/events.rs → runtime/src/scheduler/events.rs
diff --git a/src/scheduler/mod.rs → runtime/src/scheduler/mod.rs b/src/scheduler/mod.rs → runtime/src/scheduler/mod.rs
diff --git a/src/scheduler/scheduler_impl.rs → runtime/src/scheduler/scheduler_impl.rs b/src/scheduler/scheduler_impl.rs → runtime/src/scheduler/scheduler_impl.rs
diff --git a/src/test/mod.rs → runtime/src/test/mod.rs b/src/test/mod.rs → runtime/src/test/mod.rs
diff --git a/src/test/stuff_that_must_compile.rs → runtime/src/test/stuff_that_must_compile.rs b/src/test/stuff_that_must_compile.rs → runtime/src/test/stuff_that_must_compile.rs
diff --git a/src/test/test_ports.rs → runtime/src/test/test_ports.rs b/src/test/test_ports.rs → runtime/src/test/test_ports.rs
diff --git a/src/test/testutil.rs → runtime/src/test/testutil.rs b/src/test/testutil.rs → runtime/src/test/testutil.rs
diff --git a/src/time.rs → runtime/src/time.rs b/src/time.rs → runtime/src/time.rs
diff --git a/src/timers.rs → runtime/src/timers.rs b/src/timers.rs → runtime/src/timers.rs
diff --git a/src/triggers.rs → runtime/src/triggers.rs b/src/triggers.rs → runtime/src/triggers.rs
diff --git a/src/util/mod.rs → runtime/src/util/mod.rs b/src/util/mod.rs → runtime/src/util/mod.rs
diff --git a/vecmap/.gitignore b/vecmap/.gitignore
@@ -0,0 +1,2 @@
+/target
+/Cargo.lock
diff --git a/vecmap/Cargo.toml b/vecmap/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "vecmap"
+version = "0.1.0"
+edition = "2021"
+license = "MIT"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]