Commit Graph

1736 Commits

Author SHA1 Message Date
Christopher McCarthy
2b93941a6b Merged PR 478: merged 3.0.0 into main for git history alignment
merged 3.0.0 into main for git history alignment

Related work items: #2457, #2472, #2536, #2552, #2560, #2561, #2563, #2570, #2588, #2606, #2626, #2628, #2637, #2639
v3.0.0
2024-07-22 13:24:33 +00:00
Defence Science and Technology Laboratory UK
7f9acc4329 Automated benchmark output commit for version 3.0.0 [skip ci] 2024-07-20 16:11:46 +00:00
Chris McCarthy
213e301e58 retrospectively benchmarked 3.0.0 using the new benchmark process 2024-07-20 15:05:56 +01:00
Archer Bowen
3eacad200e Merged PR 408: User Guide & Notebook changes to align with 3.0.0+internal
## Summary

They are a few changes made in 3.0.0-internal that cannot be synced up.
For example, some of the RLIB Notebooks were changed around to use uc6 or tap003 which don't exist in 3.0.0:
![image (2).png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/408/attachments/image%20%282%29.png)

Additionally, as my python env is different to that of the pipeline there is some meta-data differences such as:
![image.png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/408/attachments/image.png)

Which I'm pretty certain will sort it self out after the pipeline is finished.
2024-06-10 14:47:47 +00:00
Marek Wolan
d1bbab71b7 Updated session_output_writer.py 2024-06-10 14:46:06 +00:00
Marek Wolan
2d54d482a0 Updated session_output_reader.py 2024-06-10 14:45:56 +00:00
Marek Wolan
c538aee022 Rename benchmark variables and add h1 to notebooks 2024-06-10 12:58:07 +01:00
Chris McCarthy
05a6a4f7bd added manual benchmark pdf report and graphs 2024-06-10 11:12:41 +01:00
Archer.Bowen
2a6a16b222 Space inbetween title to prevent merge conflicts. 2024-06-10 10:50:58 +01:00
Archer.Bowen
af0e67a61a User-Guide update: Very minor changes to notebook code cells to match release version identically. 2024-06-10 10:41:05 +01:00
Archer.Bowen
1ad3adbec2 Merge remote-tracking branch 'origin/release/3.0.0' into user-guide-feedback-core-fixes 2024-06-10 09:54:02 +01:00
Chris McCarthy
4068231547 Refactored the benchmarking process 2024-06-07 19:59:55 +01:00
Archer.Bowen
ae242694f3 Minor change to title to prevent merge conflicts. 2024-06-07 17:13:21 +01:00
Archer.Bowen
146afea44f Updated copyright clause on .rst 2024-06-07 16:44:33 +01:00
Archer.Bowen
2954ca966f Updated core user guide to match exactly that of 3.0.0/internal. 2024-06-07 16:35:33 +01:00
Archer.Bowen
29d42a88dc Core user guide updated to reflect changes made down stream. 2024-06-07 14:48:22 +01:00
Archer.Bowen
71e0c4179e Merge branch 'user-guide-feedback-core-fixes' of https://dev.azure.com/ma-dev-uk/PrimAITE/_git/PrimAITE into user-guide-feedback-core-fixes 2024-06-03 15:51:55 +01:00
Archer.Bowen
18e6886381 User guide updates 2024-06-03 15:51:14 +01:00
Czar Echavez
3bad9aa51e #2628: committing to be reviewed 2024-06-01 13:23:27 +01:00
Czar Echavez
472040aa70 Merge remote-tracking branch 'origin/dev' into feature/2628-update-benchmarking-script-branched 2024-06-01 00:20:21 +01:00
Archer Bowen
c705a15d00 Merged PR 397: User Guide Feed Back Core Changes
Further changes to be made post sync.
2024-05-31 17:55:27 +00:00
Marek Wolan
2406579c78 format using precommit 2024-05-31 18:50:56 +01:00
Archer.Bowen
9f0c6ddbb4 Fix primaite dependencies formatting issue 2024-05-31 18:18:40 +01:00
Archer.Bowen
4a9b92eab1 Removing data-manp notebook outputs 2024-05-31 17:17:07 +01:00
Archer.Bowen
93a729029c Merge remote-tracking branch 'origin/dev' into user-guide-feedback-core-fixes 2024-05-31 17:13:27 +01:00
Archer.Bowen
0ac57147cd Updated index following new primAITE 2 Pager 2024-05-31 17:05:30 +01:00
Marek Wolan
262390b74d Merged PR 396: Merge fixes for bugs found during testing and updates to docs
- Merge branch 'feature/2588-minimal-deps' into bugfix/2626-too-many-open-files
- #2626 fix too many open files bug
- Merge remote-tracking branch 'origin/dev' into bugfix/reward-logging
- fix reward logging
- Merge remote-tracking branch 'origin/dev' into bugfix/reward-logging
- get ray to stop crashing
- Merged PR 394: Fix 'too many open files'
- Merged PR 395: Fix reward logging and get ray to stop complaining
- Fix firewall diagram

Related work items: #2588, #2626
2024-05-31 15:47:41 +00:00
Marek Wolan
f9cff42856 glossary fact check 2024-05-31 16:03:47 +01:00
Marek Wolan
97d4c38298 remove tests from api docs 2024-05-31 15:56:27 +01:00
Chris McCarthy
4d61e857df dropped the automatic creation of primaite-dependencies.rst and made it manual as we now only need immediate dependencies 2024-05-31 15:42:41 +01:00
Marek Wolan
4ee29d129d Fix firewall diagram 2024-05-31 15:41:40 +01:00
Marek Wolan
53f01ca1e1 Merged PR 395: Fix reward logging and get ray to stop complaining
## Summary
Change the agent history log to also spit out rewards correctly.
Make ray adhere to new ray API

## Test process
Unit test pass
All notebooks run without crash

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [x] ran **pre-commit** checks for code style
- [x] attended to any **TO-DOs** left in the code
2024-05-31 14:38:05 +00:00
Marek Wolan
f7cb5bd370 Merged PR 394: Fix 'too many open files'
## Summary
Add a method to PCAP to clear file handlers. Invoke this method while resetting environment.

## Test process
no longer crashes on windows when i run too many episodes

## Checklist
- [x] PR is linked to a **work item**
- [x] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [n] written **tests** for any new functionality added with this PR
- [n] updated the **documentation** if this PR changes or adds functionality
- [n] written/updated **design docs** if this PR implements new functionality
- [n] updated the **change log**
- [x] ran **pre-commit** checks for code style
- [x] attended to any **TO-DOs** left in the code

Related work items: #2588, #2626
2024-05-31 14:31:25 +00:00
Marek Wolan
e48b71ea1a get ray to stop crashing 2024-05-31 15:25:08 +01:00
Czar Echavez
5f02846879 #2628: commit changes to combined av per episode 2024-05-31 15:20:10 +01:00
Marek Wolan
46ef3b8041 Merge remote-tracking branch 'origin/dev' into bugfix/reward-logging 2024-05-31 15:00:25 +01:00
Marek Wolan
c5f131ece5 fix reward logging 2024-05-31 15:00:18 +01:00
Marek Wolan
acfe49fd9f Merged PR 389: #2588 optional RL deps
## Summary
Make it optional to install ray, sb3, and their dependencies.

## Test process
pytest and notebooks

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2588 optional RL deps

Related work items: #2588
2024-05-31 13:17:27 +00:00
Archer.Bowen
71190a41c2 Fix to red agent image not loading 2024-05-31 14:10:01 +01:00
Marek Wolan
04dc486708 Merge remote-tracking branch 'origin/dev' into bugfix/reward-logging 2024-05-31 14:01:34 +01:00
Archer.Bowen
efc4e3e9b0 Core User Guide Feeedback Implemented.
Feedback Issues left:

1.Issues with red-agent image not embeded correctly in data_manipulation_e2e notebook

2._autosummary/tests.unit_tests.html is still completely blank.

3. _index.html is not updated with new 2-pager

4. _dependencies is not updated to just include tier-1 and primary for v3.

5. definiton of user_app_home is not confirmed
2024-05-31 13:55:20 +01:00
Czar Echavez
add8cc0ab1 #2628: temp commit 2024-05-31 13:47:02 +01:00
Marek Wolan
10ff2e008e Merge remote-tracking branch 'origin/dev' into feature/2588-minimal-deps 2024-05-31 13:31:22 +01:00
Marek Wolan
f8336d07bd #2626 fix too many open files bug 2024-05-31 13:28:56 +01:00
Marek Wolan
a96cd0064d Merged PR 393: drop python 3.8 builds 2024-05-31 12:00:53 +00:00
Marek Wolan
ac9184b7d8 Merge branch 'feature/2588-minimal-deps' into bugfix/2626-too-many-open-files 2024-05-31 12:42:52 +01:00
Marek Wolan
ae8b726beb drop python 3.8 builds 2024-05-31 11:27:27 +00:00
Marek Wolan
1c86948d61 #2588 fix import in notebook 2024-05-31 12:12:35 +01:00
Marek Wolan
c7b2ed7f86 Merge branch 'dev' into feature/2588-minimal-deps 2024-05-31 12:11:16 +01:00
Marek Wolan
a5cd902175 Merged PR 390: Updated pyproject.toml
ADD deepdiff to dependency list

Related work items: #2637
2024-05-31 10:30:47 +00:00