From a6ae2af358d54296be480991476fb89e15c5ec1b Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 10:52:33 +0100 Subject: [PATCH 01/13] version bumps --- Project.toml | 2 +- src/ReinforcementLearningBase/Project.toml | 2 +- src/ReinforcementLearningCore/Project.toml | 2 +- src/ReinforcementLearningEnvironments/Project.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index a36d83790..300ab06ae 100644 --- a/Project.toml +++ b/Project.toml @@ -13,7 +13,7 @@ ReinforcementLearningEnvironments = "25e41dd2-4622-11e9-1641-f1adca772921" [compat] Reexport = "0.2, 1" ReinforcementLearningBase = "0.12" -ReinforcementLearningCore = "0.14" +ReinforcementLearningCore = "0.15" ReinforcementLearningEnvironments = "0.8" julia = "1.6" diff --git a/src/ReinforcementLearningBase/Project.toml b/src/ReinforcementLearningBase/Project.toml index d15780bd3..69f9e26bf 100644 --- a/src/ReinforcementLearningBase/Project.toml +++ b/src/ReinforcementLearningBase/Project.toml @@ -1,7 +1,7 @@ name = "ReinforcementLearningBase" uuid = "e575027e-6cd6-5018-9292-cdc6200d2b44" authors = ["Johanni Brea ", "Jun Tian "] -version = "0.12.2" +version = "0.12.3" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" diff --git a/src/ReinforcementLearningCore/Project.toml b/src/ReinforcementLearningCore/Project.toml index 04a3b01ee..6f6987a59 100644 --- a/src/ReinforcementLearningCore/Project.toml +++ b/src/ReinforcementLearningCore/Project.toml @@ -1,6 +1,6 @@ name = "ReinforcementLearningCore" uuid = "de1b191a-4ae0-4afa-a27b-92d07f46b2d6" -version = "0.14.0" +version = "0.15.0" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" diff --git a/src/ReinforcementLearningEnvironments/Project.toml b/src/ReinforcementLearningEnvironments/Project.toml index 3a3618a06..ad0c6135b 100644 --- a/src/ReinforcementLearningEnvironments/Project.toml +++ b/src/ReinforcementLearningEnvironments/Project.toml @@ -1,6 +1,6 @@ name = "ReinforcementLearningEnvironments" uuid = "25e41dd2-4622-11e9-1641-f1adca772921" -version = "0.8.8" +version = "0.8.9" [deps] CommonRLInterface = "d842c3ba-07a1-494f-bbec-f5741b0a3e98" From f5d0a1e1dd7c96654f819a774fe0ab400bb47450 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 10:54:53 +0100 Subject: [PATCH 02/13] use ReinforcementLearning meta-package in rlfarm --- src/ReinforcementLearningFarm/Project.toml | 6 ++---- .../src/ReinforcementLearningFarm.jl | 3 +-- .../src/algorithms/explorers/epsilon_speedy_explorer.jl | 5 ++--- .../src/hooks/total_reward_per_last_n_episodes.jl | 3 +-- src/ReinforcementLearningFarm/test/runtests.jl | 4 +--- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/ReinforcementLearningFarm/Project.toml b/src/ReinforcementLearningFarm/Project.toml index 646d0a879..5809f9aff 100644 --- a/src/ReinforcementLearningFarm/Project.toml +++ b/src/ReinforcementLearningFarm/Project.toml @@ -16,9 +16,7 @@ ReinforcementLearningCore = "de1b191a-4ae0-4afa-a27b-92d07f46b2d6" FillArrays = "1" CircularArrayBuffers = "0.1.12" Distributions = "0.25" -ReinforcementLearningBase = "0.12" -ReinforcementLearningCore = "0.14" -ReinforcementLearningEnvironments = "0.8" +ReinforcementLearning = "0.11" julia = "1.9" [extras] @@ -31,4 +29,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" [targets] -test = ["CUDA", "Metal", "Preferences", "ReinforcementLearningEnvironments", "Test", "UUIDs", "cuDNN"] +test = ["CUDA", "Metal", "Preferences", "Test", "UUIDs", "cuDNN"] diff --git a/src/ReinforcementLearningFarm/src/ReinforcementLearningFarm.jl b/src/ReinforcementLearningFarm/src/ReinforcementLearningFarm.jl index a8367396e..0850f238b 100644 --- a/src/ReinforcementLearningFarm/src/ReinforcementLearningFarm.jl +++ b/src/ReinforcementLearningFarm/src/ReinforcementLearningFarm.jl @@ -1,7 +1,6 @@ module ReinforcementLearningFarm -using ReinforcementLearningBase -using ReinforcementLearningCore +using ReinforcementLearning const RLFarm = ReinforcementLearningFarm export RLFarm diff --git a/src/ReinforcementLearningFarm/src/algorithms/explorers/epsilon_speedy_explorer.jl b/src/ReinforcementLearningFarm/src/algorithms/explorers/epsilon_speedy_explorer.jl index 020c4c4c2..4b5b074c5 100644 --- a/src/ReinforcementLearningFarm/src/algorithms/explorers/epsilon_speedy_explorer.jl +++ b/src/ReinforcementLearningFarm/src/algorithms/explorers/epsilon_speedy_explorer.jl @@ -1,7 +1,6 @@ -using ReinforcementLearningCore -using ReinforcementLearningBase -import ReinforcementLearningBase: RLBase +using ReinforcementLearning +import ReinforcementLearning: RLBase using FillArrays: Trues using Random diff --git a/src/ReinforcementLearningFarm/src/hooks/total_reward_per_last_n_episodes.jl b/src/ReinforcementLearningFarm/src/hooks/total_reward_per_last_n_episodes.jl index e7261707c..816f63744 100644 --- a/src/ReinforcementLearningFarm/src/hooks/total_reward_per_last_n_episodes.jl +++ b/src/ReinforcementLearningFarm/src/hooks/total_reward_per_last_n_episodes.jl @@ -1,5 +1,4 @@ -using ReinforcementLearningCore -using ReinforcementLearningBase +using ReinforcementLearning import Base.push! import Base.getindex using CircularArrayBuffers: CircularVectorBuffer, CircularArrayBuffer diff --git a/src/ReinforcementLearningFarm/test/runtests.jl b/src/ReinforcementLearningFarm/test/runtests.jl index 246c59d33..9574a4573 100644 --- a/src/ReinforcementLearningFarm/test/runtests.jl +++ b/src/ReinforcementLearningFarm/test/runtests.jl @@ -12,9 +12,7 @@ else end using Test -using ReinforcementLearningBase -using ReinforcementLearningCore -using ReinforcementLearningEnvironments +using ReinforcementLearning using ReinforcementLearningFarm @testset "ReinforcementLearningFarm.jl" begin From 01524a96ce57895f0df17c5aa7a1160511e30b7f Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 10:59:40 +0100 Subject: [PATCH 03/13] fix dependency --- src/ReinforcementLearningFarm/Project.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ReinforcementLearningFarm/Project.toml b/src/ReinforcementLearningFarm/Project.toml index 5809f9aff..da6050713 100644 --- a/src/ReinforcementLearningFarm/Project.toml +++ b/src/ReinforcementLearningFarm/Project.toml @@ -9,8 +9,7 @@ FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -ReinforcementLearningBase = "e575027e-6cd6-5018-9292-cdc6200d2b44" -ReinforcementLearningCore = "de1b191a-4ae0-4afa-a27b-92d07f46b2d6" +ReinforcementLearning = "158674fc-8238-5cab-b5ba-03dfc80d1318" [compat] FillArrays = "1" From 572079c228df9e601bb1714b215d9dab936e1540 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 11:50:54 +0100 Subject: [PATCH 04/13] fix versions --- src/ReinforcementLearningFarm/Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ReinforcementLearningFarm/Project.toml b/src/ReinforcementLearningFarm/Project.toml index da6050713..2c20523e3 100644 --- a/src/ReinforcementLearningFarm/Project.toml +++ b/src/ReinforcementLearningFarm/Project.toml @@ -22,7 +22,6 @@ julia = "1.9" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" Metal = "dde4c033-4e86-420c-a63e-0dd931031962" Preferences = "21216c6a-2e73-6563-6e65-726566657250" -ReinforcementLearningEnvironments = "25e41dd2-4622-11e9-1641-f1adca772921" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" From 6d6d2c16b6819c76c2ab6933a054f9a96ca72165 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 11:54:16 +0100 Subject: [PATCH 05/13] fix test --- src/ReinforcementLearningCore/test/core/hooks.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ReinforcementLearningCore/test/core/hooks.jl b/src/ReinforcementLearningCore/test/core/hooks.jl index 1abba8206..13bc64765 100644 --- a/src/ReinforcementLearningCore/test/core/hooks.jl +++ b/src/ReinforcementLearningCore/test/core/hooks.jl @@ -43,7 +43,6 @@ end end @testset "ComposedHook + AbstractHook" begin - struct MockHook <: AbstractHook end @test ComposedHook(MockHook()) + MockHook() == ComposedHook(MockHook(), MockHook()) end From c03c69c8b597a5cdbe5ec21e998db20464646b1b Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 12:50:54 +0100 Subject: [PATCH 06/13] Update ReinforcementLearningCore version to 0.15 --- src/ReinforcementLearningEnvironments/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReinforcementLearningEnvironments/Project.toml b/src/ReinforcementLearningEnvironments/Project.toml index ad0c6135b..fbc7884f0 100644 --- a/src/ReinforcementLearningEnvironments/Project.toml +++ b/src/ReinforcementLearningEnvironments/Project.toml @@ -23,7 +23,7 @@ IntervalSets = "0.7" MacroTools = "0.5" OpenSpiel = "0.2.1" ReinforcementLearningBase = "0.12" -ReinforcementLearningCore = "0.14" +ReinforcementLearningCore = "0.15" Requires = "1.0" StatsBase = "0.32, 0.33, 0.34" julia = "1.6" From 75f85feac25650b00eec57f8460705b23b626627 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 16:52:53 +0100 Subject: [PATCH 07/13] fix ci --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dcb7870a..6b65fa559 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,6 +95,7 @@ jobs: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningCore") Pkg.develop(path="src/ReinforcementLearningEnvironments") + Pkg.develop(path=".") # ReinforcementLearning meta-package Pkg.develop(path="src/ReinforcementLearningFarm") Pkg.test("ReinforcementLearningCore", coverage=true)' - uses: julia-actions/julia-processcoverage@v1 @@ -141,6 +142,7 @@ jobs: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path=".") # ReinforcementLearning meta-package Pkg.develop(path="src/ReinforcementLearningFarm") Pkg.test("ReinforcementLearningFarm", coverage=true)' - uses: julia-actions/julia-processcoverage@v1 From d82084eabd0278c8a1c6a6233b2b018084fc07b3 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:15:06 +0100 Subject: [PATCH 08/13] Update pipeline.yml --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 0a9c3e707..3bcf36df7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -17,6 +17,7 @@ steps: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path=".") Pkg.develop(path="src/ReinforcementLearningFarm") println("+++ :julia: Running tests") From ee51e6837054ee1526426bf5710daffab0dc73d1 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:20:31 +0100 Subject: [PATCH 09/13] Update pipeline.yml --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3bcf36df7..ca42976ed 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -46,6 +46,7 @@ steps: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path=".") Pkg.develop(path="src/ReinforcementLearningFarm") println("+++ :julia: Running tests") From 03025c5b09d0dcee08c57f19c2490cd4a7d9a4c8 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:25:00 +0100 Subject: [PATCH 10/13] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b65fa559..657f7208a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,8 +140,8 @@ jobs: julia --color=yes -e ' using Pkg; Pkg.develop(path="src/ReinforcementLearningBase") - Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path=".") # ReinforcementLearning meta-package Pkg.develop(path="src/ReinforcementLearningFarm") Pkg.test("ReinforcementLearningFarm", coverage=true)' From e2a04e447b00092081094ec20250ca00ad99a625 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:28:29 +0100 Subject: [PATCH 11/13] Update pipeline.yml --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ca42976ed..3842de3ca 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -15,8 +15,8 @@ steps: println("--- :julia: Instantiating project") using Pkg Pkg.develop(path="src/ReinforcementLearningBase") - Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path=".") Pkg.develop(path="src/ReinforcementLearningFarm") @@ -44,8 +44,8 @@ steps: println("--- :julia: Instantiating project") using Pkg Pkg.develop(path="src/ReinforcementLearningBase") - Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path="src/ReinforcementLearningCore") + Pkg.develop(path="src/ReinforcementLearningEnvironments") Pkg.develop(path=".") Pkg.develop(path="src/ReinforcementLearningFarm") From cdac9cfb82d049c3cf9eb30c0bad66a0f629dc02 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 17:36:43 +0100 Subject: [PATCH 12/13] fix install --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3842de3ca..a28ab8dab 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -17,7 +17,7 @@ steps: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningCore") Pkg.develop(path="src/ReinforcementLearningEnvironments") - Pkg.develop(path=".") + Pkg.develop(path=".") # ReinforcementLearning meta-package Pkg.develop(path="src/ReinforcementLearningFarm") println("+++ :julia: Running tests") @@ -46,7 +46,7 @@ steps: Pkg.develop(path="src/ReinforcementLearningBase") Pkg.develop(path="src/ReinforcementLearningCore") Pkg.develop(path="src/ReinforcementLearningEnvironments") - Pkg.develop(path=".") + Pkg.develop(path=".") # ReinforcementLearning meta-package Pkg.develop(path="src/ReinforcementLearningFarm") println("+++ :julia: Running tests") From cb652dee9be89c2a2baf6a75843a79b9037e7538 Mon Sep 17 00:00:00 2001 From: Jeremiah Lewis <--get> Date: Fri, 22 Mar 2024 17:44:14 +0100 Subject: [PATCH 13/13] try dropping test --- .buildkite/pipeline.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a28ab8dab..31b96cc8f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -6,8 +6,6 @@ steps: plugins: - JuliaCI/julia#v1: version: "1" - - JuliaCI/julia-test#v1: - run_tests: false command: | julia -e ' using Pkg @@ -35,8 +33,6 @@ steps: - JuliaCI/julia-coverage#v1: dirs: - src/ReinforcementLearningFarm/src - - JuliaCI/julia-test#v1: - run_tests: false command: | julia -e ' using Pkg