Merge pull request #225 from ReactiveBayes/dev-julia-cache-ci

Use julia cache in CI
ReactiveBayes · Feb 5, 2024 · 86847c8 · 86847c8
2 parents 816acb1 + 37748e5
commit 86847c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -21,16 +21,15 @@ jobs:
     name: Julia Formatter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1         
-        with:
-          version: '1.10'
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/cache@v1         
       - run: make lint
   paper:
     name: Paper Preview
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: openjournals/openjournals-draft-action@master
         with:
           journal: joss
@@ -60,9 +59,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
-        with:
-          version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
@@ -84,10 +80,9 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1.10'
+      - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
       - uses: actions/cache@v3
         id: examples
@@ -109,15 +104,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1.10'
       - uses: actions/cache@v3
         id: examples
         with:
           path: |
             docs/src/examples
             docs/src/assets/examples
           key: ${{ github.sha }}
+      - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
       - run: make docs
         env:

diff --git a/src/constraints/form/form_point_mass.jl b/src/constraints/form/form_point_mass.jl
@@ -1,8 +1,9 @@
 
 import ReactiveMP: is_point_mass_form_constraint, default_form_check_strategy, default_prod_constraint, make_form_constraint, constrain_form
 import DomainSets: Domain, infimum, supremum
+import Optim
 
-using BayesBase, Distributions, ExponentialFamily, Optim
+using BayesBase, Distributions, ExponentialFamily
 
 """
     PointMassFormConstraint
@@ -91,9 +92,9 @@ function default_point_mass_form_constraint_optimizer(::Type{Univariate}, ::Type
     lower, upper = call_boundaries(constraint, distribution)
 
     result = if isinf(lower) && isinf(upper)
-        optimize(target, call_starting_point(constraint, distribution), LBFGS())
+        Optim.optimize(target, call_starting_point(constraint, distribution), Optim.LBFGS())
     else
-        optimize(target, [lower], [upper], call_starting_point(constraint, distribution), Fminbox(GradientDescent()))
+        Optim.optimize(target, [lower], [upper], call_starting_point(constraint, distribution), Optim.Fminbox(Optim.GradientDescent()))
     end
 
     if Optim.converged(result)