Skip to content

Commit

Permalink
Merge pull request #142 from Marco-Congedo/dev
Browse files Browse the repository at this point in the history
dev v0.5.0 (updating to Julia v0.7.2)
  • Loading branch information
Marco-Congedo authored May 13, 2022
2 parents 750794d + 3779204 commit efbae8c
Show file tree
Hide file tree
Showing 25 changed files with 388 additions and 225 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: CompatHelper

on:
schedule:
- cron: '00 00 * * *'

jobs:
CompatHelper:
runs-on: ubuntu-latest
steps:
- uses: julia-actions/setup-julia@latest
with:
version: 1.3
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
9 changes: 6 additions & 3 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
name: TagBot
on:
issue_comment: # THIS BIT IS NEW
issue_comment:
types:
- created
workflow_dispatch:
inputs:
lookback:
default: 3
permissions:
contents: write
jobs:
TagBot:
# THIS 'if' LINE IS NEW
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
# NOTHING BELOW HAS CHANGED
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MIT License
Copyright (c) 2019, Marco Congedo, CNRS, Grenobe, France:
Copyright (c) 2019-2022, Marco Congedo, CNRS, Grenobe, France:
https://sites.google.com/site/marcocongedo/home

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
23 changes: 23 additions & 0 deletions Manifest - Back up.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This file is machine-generated - editing it directly is not advised

[[Libdl]]
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[[LinearAlgebra]]
deps = ["Libdl"]
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[[Random]]
deps = ["Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[SparseArrays]]
deps = ["LinearAlgebra", "Random"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[[Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
37 changes: 29 additions & 8 deletions Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,44 @@
# This file is machine-generated - editing it directly is not advised

[[Libdl]]
julia_version = "1.7.2"
manifest_format = "2.0"

[[deps.Artifacts]]
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

[[deps.CompilerSupportLibraries_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"

[[deps.Libdl]]
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[[LinearAlgebra]]
deps = ["Libdl"]
[[deps.LinearAlgebra]]
deps = ["Libdl", "libblastrampoline_jll"]
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[[Random]]
deps = ["Serialization"]
[[deps.OpenBLAS_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"

[[deps.Random]]
deps = ["SHA", "Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[Serialization]]
[[deps.SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[SparseArrays]]
[[deps.SparseArrays]]
deps = ["LinearAlgebra", "Random"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[[Statistics]]
[[deps.Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[[deps.libblastrampoline_jll]]
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PosDefManifold"
uuid = "f45a3650-5c51-11e9-1e9a-133aa5e309cf"
authors = ["Marco Congedo <[email protected]>"]
version = "0.4.9"
version = "0.5.0"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand Down
8 changes: 4 additions & 4 deletions build/riemannianGeometry.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ function geometricMean(𝐏::ℍVector;
maxiter, iter, conv, oldconv = 500, 1, 0., maxpos
&& k>=thr*4 && thr > 1 ? threaded=true : threaded=false
isempty(w) ? v=[] : v = _getWeights(w, ✓w, k)
init == nothing ? M = mean(logEuclidean, 𝐏; w=v, ✓w=false, ⏩=⏩) : M = (init)
init === nothing ? M = mean(logEuclidean, 𝐏; w=v, ✓w=false, ⏩=⏩) : M = (init)
tol==0 ? tolerance = eps(real(type))*1e2 : tolerance = tol
💡 = similar(M, type)
if threaded 𝐐 = similar(𝐏) end
Expand Down Expand Up @@ -1564,7 +1564,7 @@ function logdet0Mean(𝐏::Union{ℍVector, 𝔻Vector};
maxiter, iter, conv, oldconv, l = 500, 1, 0., maxpos, k/2
&& k>=thr*4 && thr > 1 ? threaded=true : threaded=false
isempty(w) ? v=[] : v = _getWeights(w, ✓w, k)
init == nothing ? M = mean(logEuclidean, 𝐏; w=v, ✓w=false, ⏩=⏩) : M = 𝕋(init)
init === nothing ? M = mean(logEuclidean, 𝐏; w=v, ✓w=false, ⏩=⏩) : M = 𝕋(init)
tol==0 ? tolerance = eps(real(type))*1e2 : tolerance = tol
💡 = similar(M, type)
if threaded 𝐐 = similar(𝐏) end
Expand Down Expand Up @@ -1701,7 +1701,7 @@ function wasMean(𝐏::ℍVector;
maxiter, iter, conv, oldconv = 500, 1, 0., maxpos
&& k>=thr*4 && thr > 1 ? threaded=true : threaded=false
isempty(w) ? v=[] : v = _getWeights(w, ✓w, k)
init == nothing ? M = generalizedMean(𝐏, 0.5; w=v, ✓w=false, ⏩=⏩) : M = (init)
init === nothing ? M = generalizedMean(𝐏, 0.5; w=v, ✓w=false, ⏩=⏩) : M = (init)
tol==0 ? tolerance = eps(real(type))*1e2 : tolerance = tol
💡 = similar(M, type)
if threaded 𝐐 = similar(𝐏) end
Expand Down Expand Up @@ -1876,7 +1876,7 @@ function powerMean(𝐏::ℍVector, p::Real;
sqrtn, maxiter, iter, conv, oldconv, r = n, 500, 1, 0., maxpos, -0.375/absp
&& k>=thr*4 && thr > 1 ? threaded=true : threaded=false
isempty(w) ? v=[] : v = _getWeights(w, ✓w, k)
init == nothing ? M = generalizedMean(𝐏, p; w=v, ✓w=false, ⏩=⏩) : M = (init)
init === nothing ? M = generalizedMean(𝐏, p; w=v, ✓w=false, ⏩=⏩) : M = (init)
p<0 ? X=(M^(0.5)) : X=(M^(-0.5))
💡, H, 𝒫 = similar(X, type), similar(X, type), similar(𝐏)
p<0 ? 𝒫=[inv(P) for P in 𝐏] : 𝒫=𝐏
Expand Down
15 changes: 7 additions & 8 deletions docs/build/MainModule/index.html

Large diffs are not rendered by default.

85 changes: 75 additions & 10 deletions docs/build/assets/documenter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions docs/build/assets/search.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/build/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/build/introToRiemannianGeometry/index.html

Large diffs are not rendered by default.

Loading

0 comments on commit efbae8c

Please sign in to comment.