Merge pull request #33 from JuliaTrustworthyAI/mljflux-compat

compat
JuliaTrustworthyAI · Oct 22, 2024 · dd9e034 · dd9e034
2 parents 8cc46c8 + 1e2807e
commit dd9e034
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 129 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,6 +19,7 @@ jobs:
       matrix:
         version:
           - '1.10'
+          - '1'
         os:
           - ubuntu-latest
         arch:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 *Note*: We try to adhere to these practices as of version [v0.1.4].
 
+## Version [0.1.8] - 2024-10-22
+
+### Changed
+
+- Bumped compat for `MLJFlux`.
+- Bumped Julia compat to 1.11.
+
 ## Version [0.1.7] - 2024-09-09
 
 ### Changed

diff --git a/Project.toml b/Project.toml
@@ -30,17 +30,17 @@ ComputationalResources = "0.3"
 Distributions = "0.25"
 EnergySamplers = "1.0.0"
 Flux = "0.13, 0.14"
-MLJFlux = "0.2, 0.3, 0.4, 0.5"
+MLJFlux = "0.2, 0.3, 0.4, 0.5, 0.6"
 MLJModelInterface = "1.8"
 MLUtils = "0.4"
 Optimisers = "0.3"
 ProgressMeter = "1.7"
-Random = "1.10"
+Random = "1"
 Reexport = "1.2.2"
 StatsBase = "0.33, 0.34"
-Tables = "1.10"
+Tables = "1"
 TaijaBase = "1.1.0"
-Test = "1.10"
+Test = "1"
 Zygote = "0.6"
 julia = "1.10"
 

diff --git a/src/JointEnergyModels.jl b/src/JointEnergyModels.jl
@@ -7,10 +7,6 @@ using TaijaBase
 using Reexport
 @reexport import EnergySamplers: ConditionalSampler, UnconditionalSampler, JointSampler
 
-include("utils.jl")
-export _energy
-
-
 include("model.jl")
 export JointEnergyModel
 export class_loss, gen_loss, loss

diff --git a/src/utils.jl b/src/utils.jl
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ jobs: @@
           matrix:
             version:
               - '1.10'
+              - '1'
             os:
               - ubuntu-latest
             arch:
@@ Expand Down @@