Skip to content

Commit 1b990f4

Browse files
committed
Merge branch 'main' into cdc-as81-add-population-range-source-set
2 parents 74cd935 + 651c501 commit 1b990f4

44 files changed

Lines changed: 231 additions & 2151 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Setup Pages
3838
id: pages
39-
uses: actions/configure-pages@v5
39+
uses: actions/configure-pages@v6
4040

4141
- name: Upload artifact
4242
uses: actions/upload-pages-artifact@v4
@@ -53,4 +53,4 @@ jobs:
5353
steps:
5454
- name: Deploy to GitHub Pages
5555
id: deployment
56-
uses: actions/deploy-pages@v4
56+
uses: actions/deploy-pages@v5

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.0.0-beta2.1](https://github.com/CDCgov/ixa/compare/ixa-v2.0.0-beta2...ixa-v2.0.0-beta2.1) - 2026-04-06
11+
12+
### Added
13+
14+
- `smallvec` and `smallbox` optimization in `set_property` ([#835](https://github.com/CDCgov/ixa/pull/835))
15+
16+
### Other
17+
18+
- remove debugger ([#828](https://github.com/CDCgov/ixa/pull/828))
19+
- bump actions/deploy-pages from 4 to 5 ([#830](https://github.com/CDCgov/ixa/pull/830))
20+
- bump actions/configure-pages from 5 to 6 ([#831](https://github.com/CDCgov/ixa/pull/831))
21+
1022
## [2.0.0-beta2](https://github.com/CDCgov/ixa/compare/ixa-v2.0.0-beta1.1...ixa-v2.0.0-beta2) - 2026-03-23
1123

1224
### Added

Cargo.toml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ paste = "^1.0.15"
3434
ctor = "^0.5.0"
3535
clap = { version = "^4.5.26", features = ["derive"] }
3636
clap-markdown = "0.1.5"
37-
shlex = "^1.3.0"
38-
rustyline = "^17.0.1"
3937
log = "^0.4.22"
4038
log4rs = { version = "^1.3.0", default-features = false, features = [
4139
"console_appender",
@@ -64,10 +62,12 @@ bytesize = "^2.0.1"
6462
hashbrown = "^0.16.0"
6563
ouroboros = "^0.18.5"
6664
thiserror = "^2.0.11"
65+
smallbox = "^0.8.8"
66+
smallvec = "^1.15.1"
6767

6868
[package]
6969
name = "ixa"
70-
version = "2.0.0-beta2"
70+
version = "2.0.0-beta2.1"
7171
rust-version = "1.88.0"
7272
description = "A framework for building agent-based models"
7373
repository.workspace = true
@@ -77,10 +77,9 @@ homepage.workspace = true
7777
authors.workspace = true
7878

7979
[features]
80-
default = ["logging", "debugger", "progress_bar", "profiling"]
80+
default = ["logging", "progress_bar"]
8181

8282
logging = ["log4rs", "fern", "wasm-bindgen", "web-sys"]
83-
debugger = ["shlex", "rustyline"]
8483
progress_bar = ["dep:progress_bar", "anyhow"]
8584

8685
profiling = ["dep:sysinfo", "dep:bytesize"]
@@ -110,6 +109,8 @@ hashbrown.workspace = true
110109
xxhash-rust.workspace = true
111110
rustc-hash.workspace = true
112111
thiserror.workspace = true
112+
smallvec.workspace = true
113+
smallbox.workspace = true
113114

114115
# Building docs
115116
clap-markdown = { workspace = true, optional = true }
@@ -121,10 +122,6 @@ indexmap = "2.13.0"
121122
# Logging
122123
log4rs = { workspace = true, optional = true }
123124

124-
# Debugger
125-
rustyline = { workspace = true, optional = true }
126-
shlex = { workspace = true, optional = true }
127-
128125
# Progress Bar
129126
progress_bar = { workspace = true, optional = true, features = ["logger"] }
130127
anyhow = { workspace = true, optional = true }

docs/book/src/cli-usage.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Default cli arguments for ixa runner
2929
* `--warn` — Set logging to WARN level. Shortcut for `--log-level warn`
3030
* `--debug` — Set logging to DEBUG level. Shortcut for `--log-level DEBUG`
3131
* `--trace` — Set logging to TRACE level. Shortcut for `--log-level TRACE`
32-
* `-d`, `--debugger <DEBUGGER>` — Set a breakpoint at a given time and start the debugger. Defaults to t=0.0
33-
* `-w`, `--web <WEB>` — Enable the Web API at a given time. Defaults to t=0.0
3432
* `-t`, `--timeline-progress-max <TIMELINE_PROGRESS_MAX>` — Enable the timeline progress bar with a maximum time
3533
* `--no-stats` — Suppresses the printout of summary statistics at the end of the simulation
3634

docs/book/src/examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Demonstrates the profiling module: counting events, opening spans, computing
2929
statistics, and writing profiling data to JSON.
3030

3131
```sh
32-
cargo run --example profiling
32+
cargo run --example profiling --features profiling
3333
```
3434

3535
## End-to-end Examples

docs/book/src/topics/profiling-module.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,15 @@ Ixa includes a lightweight, feature-gated profiling module you can use to:
88
- Write results to a JSON file along with execution statistics
99

1010
The API lives under `ixa::profiling` and is behind the `profiling` Cargo feature
11-
(enabled by default). If you disable the feature, the API becomes a no-op so you
12-
can leave profiling calls in your code.
11+
(disabled by default). If you do not enable the feature, the API becomes a no-op
12+
so you can leave profiling calls in your code.
13+
14+
When running the built-in profiling example from the root crate, enable the
15+
feature explicitly:
16+
17+
```sh
18+
cargo run --example profiling --features profiling
19+
```
1320

1421
## Example console output
1522

examples/profiling/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ authors.workspace = true
1010
publish = false
1111

1212
[dependencies]
13-
ixa = { path = "../../" }
13+
ixa = { path = "../../", features = ["profiling"] }
1414
serde_json.workspace = true
1515

1616
[lints]

integration-tests/ixa-runner-tests/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ homepage.workspace = true
1010
authors.workspace = true
1111

1212
[dependencies]
13-
ixa = { path = "../../", features = ["logging", "debugger", "progress_bar", "profiling"] }
13+
ixa = { path = "../../", features = ["logging", "progress_bar", "profiling"] }
1414
clap.workspace = true
1515

1616
[dev-dependencies]
@@ -28,8 +28,8 @@ path = "bin/runner_test_custom_args.rs"
2828
bench = false
2929

3030
[[bin]]
31-
name = "runner_test_debug"
32-
path = "bin/runner_test_debug.rs"
31+
name = "runner_generic"
32+
path = "bin/runner_generic.rs"
3333
bench = false
3434

3535
[[bin]]

integration-tests/ixa-runner-tests/bin/runner_test_debug.rs renamed to integration-tests/ixa-runner-tests/bin/runner_generic.rs

File renamed without changes.

integration-tests/ixa-runner-tests/tests/debugger.rs

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)