Skip to content

Commit

Permalink
fix links, remove unecessary comments
Browse files Browse the repository at this point in the history
  • Loading branch information
RAYNAUD Paul (raynaudp) authored and paraynaud committed Jul 20, 2022
1 parent 2ff4008 commit 6d0594a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 30 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ jobs:
- name: Installing non-registered dependencies
run: |
using Pkg
pkg1 = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/PartiallySeparableNLPModels.jl.git")
pkg2 = PackageSpec(url = "https://github.com/paraynaud/PartiallySeparableSolvers.jl.git")
pkg_list = [pkg1, pkg2]
pkg = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl.git")
pkg_list = [pkg]
Pkg.add(pkg_list)
shell: julia --project=docs --color=yes {0}
- name: Install dependencies
Expand All @@ -29,7 +28,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
run: julia --project=docs --color=yes docs/make.jl


# using DocumenterTools
# DocumenterTools.genkeys(user="paraynaud", repo="PartiallySeparableSolvers.jl")
7 changes: 0 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ jobs:
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- name: Installing non-registered dependencies
run: |
using Pkg
pkg = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/PartiallySeparableNLPModels.jl.git")
pkg_list = [pkg]
Pkg.add(pkg_list)
shell: julia --project="@." --color=yes {0}
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
Expand Down
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/paraynaud/PartiallySeparableSolvers.jl/releases/latest",
"identifier": "https://github.com/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl/releases/latest",
"relation": "isSupplementTo"
}
]
Expand Down
2 changes: 1 addition & 1 deletion CITATION.bib
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ @Misc{raynaud2022
author = {P. Raynaud },
title = {{PartiallySeparableSolvers.jl}:},
month = {Month},
howpublished = {\url{https://github.com/paraynaud/PartiallySeparableSolvers.jl}},
howpublished = {\url{https://github.com/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl}},
year = {2022},
DOI = {}
}
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
| [![docs-stable][docs-stable-img]][docs-stable-url] [![docs-dev][docs-dev-img]][docs-dev-url] | [![build-gh][build-gh-img]][build-gh-url] [![build-cirrus][build-cirrus-img]][build-cirrus-url] | [![codecov][codecov-img]][codecov-url] | [![doi][doi-img]][doi-url] |

[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
[docs-stable-url]: https://paraynaud.github.io/PartiallySeparableSolvers.jl/stable
[docs-stable-url]: https://JuliaSmoothOptimizers.github.io/PartiallySeparableSolvers.jl/stable
[docs-dev-img]: https://img.shields.io/badge/docs-dev-purple.svg
[docs-dev-url]: https://paraynaud.github.io/PartiallySeparableSolvers.jl/dev
[build-gh-img]: https://github.com/paraynaud/PartiallySeparableSolvers.jl/workflows/CI/badge.svg?branch=master
[build-gh-url]: https://github.com/paraynaud/PartiallySeparableSolvers.jl/actions
[build-cirrus-img]: https://img.shields.io/cirrus/github/paraynaud/PartiallySeparableSolvers.jl?logo=Cirrus%20CI
[build-cirrus-url]: https://cirrus-ci.com/github/paraynaud/PartiallySeparableSolvers.jl
[codecov-img]: https://codecov.io/gh/paraynaud/PartiallySeparableSolvers.jl/branch/master/graph/badge.svg
[codecov-url]: https://app.codecov.io/gh/paraynaud/PartiallySeparableSolvers.jl
[docs-dev-url]: https://JuliaSmoothOptimizers.github.io/PartiallySeparableSolvers.jl/dev
[build-gh-img]: https://github.com/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl/workflows/CI/badge.svg?branch=master
[build-gh-url]: https://github.com/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl/actions
[build-cirrus-img]: https://img.shields.io/cirrus/github/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl?logo=Cirrus%20CI
[build-cirrus-url]: https://cirrus-ci.com/github/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl
[codecov-img]: https://codecov.io/gh/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl/branch/master/graph/badge.svg
[codecov-url]: https://app.codecov.io/gh/JuliaSmoothOptimizers/PartiallySeparableSolvers.jl
[doi-img]: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.822073-blue.svg
[doi-url]: https://doi.org/10.5281/zenodo.822073

Expand All @@ -31,7 +31,7 @@ pkg> test PartiallySeparableSolvers
```

## How to use
See the [tutorial](https://paraynaud.github.io/PartiallySeparableSolvers.jl/dev/tutorial/).
See the [tutorial](https://JuliaSmoothOptimizers.github.io/PartiallySeparableSolvers.jl/dev/tutorial/).

## Dependencies
The module uses [PartiallySeparableNLPModels.jl](https://github.com/JuliaSmoothOptimizers/PartiallySeparableNLPModels.jl) to detect the partially-separable structure and the structure required for partitioned quasi-Newton approximations.
5 changes: 0 additions & 5 deletions src/tr_cg_part_data.jl
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ function partitionedTrunk(
while absolute(n, gₖ, ϵ) &&
relative(n, gₖ, ϵ, ∇fNorm2) &&
_max_iter(iter, max_iter) & _max_time(start_time) # stop condition
# verbose && (@printf "%3d %5.1f %6.1e %7.1e %6.1e \t " iter (time() - start_time) fₖ norm(gₖ, 2) Δ)

iter += 1
cg_res = Krylov.cg(B, -gₖ, atol = T(atol), rtol = cgtol, radius = T(Δ), itmax = max(2 * n, 50))
Expand Down Expand Up @@ -140,16 +139,12 @@ function partitionedTrunk(

if !absolute(n, g, ϵ) || !relative(n, g, ϵ, ∇f₀Norm2)
status = :first_order
# println("stationnary point ✅")
elseif !_max_iter(iter, max_iter)
status = :max_eval
# println("Max eval ❌")
elseif !_max_time(start_time)
status = :max_time
# println("Max time ❌")
else
status = :unknown
# println("Unknown ❌")
end

nlp.counters.neval_obj = cpt.neval_obj
Expand Down

0 comments on commit 6d0594a

Please sign in to comment.