Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d7beb40
Add QN creation and sampling
ReubenJ Nov 25, 2024
ea4c283
Clarify vector of vals in grammar
ReubenJ Nov 26, 2024
0bfb251
Add tests
ReubenJ Dec 1, 2024
a7d1498
Fix QN tests
ReubenJ Dec 3, 2024
b94393e
Add methods, tests for QN properties
ReubenJ Dec 3, 2024
4a528b1
Fix target function depth tests
ReubenJ Dec 3, 2024
0b2897f
Refactor QN tests
ReubenJ Dec 3, 2024
50d48de
Add interpreter, async_step for QNs
ReubenJ Dec 3, 2024
f5e4c2f
Remove `Avg(...)` from grammar for now
ReubenJ Dec 3, 2024
eeae031
Fix rounding of activation levels
ReubenJ Dec 3, 2024
337c369
Add documentation
ReubenJ Dec 4, 2024
68724ef
Remove single letter functions
ReubenJ Dec 4, 2024
d43ce7a
Fix notebook failing linting
ReubenJ Dec 10, 2024
dbfaeac
SynthBN -> Synth
ReubenJ Dec 12, 2024
6cd7aec
Updates to experiments
ReubenJ Jan 14, 2025
53ae886
Switch to srun
ReubenJ Jan 14, 2025
388c833
Use SLURM_NTASKS
ReubenJ Jan 14, 2025
2afe49c
Update job name
ReubenJ Jan 14, 2025
bb7b897
Use Julia 1.10.2 to match cluster
ReubenJ Jan 14, 2025
f163ad5
Use SlurmClusterManager
ReubenJ Jan 14, 2025
2080476
Use SlurmClusterManager dynamically
ReubenJ Jan 14, 2025
ce8bdc7
Move SlurmClusterManager usage inside try block
ReubenJ Jan 14, 2025
6cd54c6
Don't use @quickactivate macro in slurm context
ReubenJ Jan 15, 2025
64d1685
Delete boilerplate script
ReubenJ Jan 15, 2025
f9d8b27
Update trajectory script
ReubenJ Jan 15, 2025
f3b8c01
Increase memory for sampling trajectories
ReubenJ Jan 15, 2025
1326e86
Even more memory
ReubenJ Jan 15, 2025
c21adc0
Clean up scripts
ReubenJ Jan 15, 2025
1bb2f63
Split script use distributed
ReubenJ Jan 15, 2025
89b0294
Clean up bash scripts
ReubenJ Jan 15, 2025
bf361ec
Fix new version of split script
ReubenJ Jan 15, 2025
3d74224
Fix new version of split script, pt2
ReubenJ Jan 15, 2025
20baf96
Updated synth process
ReubenJ Jan 16, 2025
d0b819c
Fewer steps per trajectory
ReubenJ Jan 16, 2025
2cd4f04
Support 1.10 Statistics
ReubenJ Jan 16, 2025
f16867b
Use QN version of GDS
ReubenJ Jan 16, 2025
61f8ea0
Try split up @everywhere
ReubenJ Jan 16, 2025
670c364
Reorganize synth script
ReubenJ Jan 16, 2025
3fc3f2c
Remove nested pmap
ReubenJ Jan 16, 2025
50540a7
Increase resources
ReubenJ Jan 16, 2025
28930fc
Fewer levels of trajectories
ReubenJ Jan 16, 2025
2c94356
More memory
ReubenJ Jan 16, 2025
c47c333
Add constraints
ReubenJ Jan 26, 2025
2de604d
Restructure synthesis experiments
ReubenJ Jan 28, 2025
e89f19a
Increase max depth
ReubenJ Jan 28, 2025
bba1ac2
Don't load files in main process
ReubenJ Jan 28, 2025
d7b17e1
Trying lower memory
ReubenJ Jan 28, 2025
bc8413b
Re-up memory
ReubenJ Jan 28, 2025
d46b555
Catch an error with some extra info
ReubenJ Jan 28, 2025
954132e
Catch an error and don't fail
ReubenJ Jan 28, 2025
4b860fa
Error message causing more errors...
ReubenJ Jan 28, 2025
58b4371
Don't fail on link checker
ReubenJ Feb 3, 2025
7cc2a1d
Add compat
ReubenJ Feb 3, 2025
e97e6e3
Uncomment tests
ReubenJ Feb 3, 2025
29499b4
Fix QN errors in testing
ReubenJ Feb 3, 2025
9481066
Add Aqua and JET
ReubenJ Feb 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ jobs:
id: lychee
uses: lycheeverse/lychee-action@v2
with:
fail: true
fail: false
args: --config '.lychee.toml' .
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.DS_Store
.benchmarkci
Manifest.toml
!experiments/SynthBN/Manifest.toml
!experiments/Synth/Manifest.toml
benchmark/*.json
coverage
docs/build/
Expand Down
23 changes: 21 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
name = "GraphDynamicalSystems"
uuid = "13529e2e-ed53-56b1-bd6f-420b01fca819"
authors = ["Reuben Gardos Reid <[email protected]>"]
version = "0.1.0"
version = "0.2.0"

[deps]
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
DynamicalSystems = "61744808-ddfa-5f27-97ff-6e42cc95d634"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
HerbConstraints = "1fa96474-3206-4513-b4fa-23913f296dfc"
HerbCore = "2b23ba43-8213-43cb-b5ea-38c12b45bd45"
HerbGrammar = "4ef9e186-2fe5-4b24-8de7-9f7291f24af7"
HerbSearch = "3008d8e8-f9aa-438a-92ed-26e9c7b4829f"
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
MetaGraphsNext = "fa8bd995-216d-47f1-8a91-f3b68fbeb377"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SoleLogics = "b002da8f-3cb3-4d91-bbe3-2953433912b5"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
AbstractTrees = "0.4.5"
DocStringExtensions = "0.9.3"
DynamicalSystems = "3"
FileIO = "1"
Graphs = "1.12"
HerbConstraints = "0.2.4"
HerbCore = "0.3.4"
HerbGrammar = "0.5"
HerbSearch = "0.4.1"
MLStyle = "0.4.17"
MetaGraphsNext = "0.7"
SoleLogics = "0.9, 0.10"
Random = "1.11"
SoleLogics = "0.12"
Statistics = "1.10,1.11.1"
julia = "1.6"
7 changes: 2 additions & 5 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Don't forget to run
#
# pkg> dev ..
#
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
LiveServer = "16fef848-5104-11e9-1b77-fb7a48bbb589"
GraphDynamicalSystems = "13529e2e-ed53-56b1-bd6f-420b01fca819"
LiveServer = "16fef848-5104-11e9-1b77-fb7a48bbb589"
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"

[compat]
Documenter = "1"
4 changes: 4 additions & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
using Revise

Revise.revise()

using GraphDynamicalSystems
using Documenter

Expand Down
2 changes: 1 addition & 1 deletion docs/src/95-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ Pages = ["95-reference.md"]
```

```@autodocs
Modules = [GraphDynamicalSystems]
Modules = [GraphDynamicalSystems, GraphDynamicalSystems.BooleanNetworks]
```
1 change: 1 addition & 0 deletions experiments/Synth/.envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
channels = ["bioconda"]

[pip.deps]
biodivine-aeon = ""
3 changes: 3 additions & 0 deletions experiments/Synth/LocalPreferences.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[CondaPkg]
backend = "MicroMamba"
pip_backend = "uv"
Loading
Loading