Skip to content

Commit

Permalink
🤖 Change master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
abelsiqueira committed Jul 9, 2021
1 parent 6ef1572 commit 4c510c5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Documentation
on:
push:
branches:
- master
- main
tags: '*'
pull_request:
types: [opened, synchronize, reopened]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: format-pr
on:
push:
branches:
- master
- main

jobs:
build:
Expand All @@ -29,4 +29,4 @@ jobs:
- name: Check outputs
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ pipeline {
dir(WORKSPACE + "/$repo") {
sh '''
git clean -fd
git checkout master
git pull origin master
git checkout main
git pull origin main
git fetch origin
git branch -D $BRANCH_NAME || true
git checkout -b $BRANCH_NAME origin/$BRANCH_NAME
Expand Down Expand Up @@ -108,7 +108,7 @@ pipeline {
sh '''
git clean -fd
git reset --hard
git checkout master
git checkout main
git branch -D $BRANCH_NAME || true
'''
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# AMD

[![CI](https://github.com/JuliaSmoothOptimizers/AMD.jl/workflows/CI/badge.svg?branch=master)](https://github.com/JuliaSmoothOptimizers/AMD.jl/actions)
[![CI](https://github.com/JuliaSmoothOptimizers/AMD.jl/workflows/CI/badge.svg?branch=main)](https://github.com/JuliaSmoothOptimizers/AMD.jl/actions)
[![Build Status](https://api.cirrus-ci.com/github/JuliaSmoothOptimizers/AMD.jl.svg)](https://cirrus-ci.com/github/JuliaSmoothOptimizers/AMD.jl)
[![codecov.io](https://codecov.io/github/JuliaSmoothOptimizers/AMD.jl/coverage.svg?branch=master)](https://codecov.io/github/JuliaSmoothOptimizers/AMD.jl?branch=master)
[![codecov.io](https://codecov.io/github/JuliaSmoothOptimizers/AMD.jl/coverage.svg?branch=main)](https://codecov.io/github/JuliaSmoothOptimizers/AMD.jl?branch=main)

Given a square sparse matrix, compute an approximate minimum degree ordering.
This package is an interface to the AMD library (Amestoy, Davis and Duff) and COLAMD library (Liromore, Davis, Gilberg an Ng).
Expand Down
20 changes: 10 additions & 10 deletions benchmark/run_benchmarks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ using SolverBenchmark

# NB: benchmarkpkg will run benchmarks/benchmarks.jl by default
commit = benchmarkpkg("AMD") # current state of repository
master = benchmarkpkg("AMD", "master")
judgement = judge(commit, master)
main = benchmarkpkg("AMD", "main")
judgement = judge(commit, main)

commit_stats = bmark_results_to_dataframes(commit)
master_stats = bmark_results_to_dataframes(master)
main_stats = bmark_results_to_dataframes(main)
judgement_stats = judgement_results_to_dataframes(judgement)

export_markdown("judgement_$(bmarkname).md", judgement)
export_markdown("master.md", master)
export_markdown("main.md", main)
export_markdown("$(bmarkname).md", commit)

function profile_solvers_from_pkgbmark(stats::Dict{Symbol, DataFrame})
Expand All @@ -47,28 +47,28 @@ files_dict = Dict{String, Any}()
file_num = 1
for k keys(judgement_stats)
global file_num
k_stats = Dict{Symbol, DataFrame}(:commit => commit_stats[k], :master => master_stats[k])
save_stats(k_stats, "AMD_$(bmarkname)_vs_master_$(k).jld2", force = true)
k_stats = Dict{Symbol, DataFrame}(:commit => commit_stats[k], :main => main_stats[k])
save_stats(k_stats, "AMD_$(bmarkname)_vs_main_$(k).jld2", force = true)

k_profile = profile_solvers_from_pkgbmark(k_stats)
savefig("profiles_commit_vs_master_$(k).svg")
savefig("profiles_commit_vs_main_$(k).svg")
# read contents of svg file to add to gist
k_svgfile = open("profiles_commit_vs_master_$(k).svg", "r") do fd
k_svgfile = open("profiles_commit_vs_main_$(k).svg", "r") do fd
readlines(fd)
end
# file_num makes sure svg files appear before md files (added below)
files_dict["$(file_num)_$(k).svg"] = Dict{String, Any}("content" => join(k_svgfile))
file_num += 1
end

for mdfile [:judgement, :master, :commit]
for mdfile [:judgement, :main, :commit]
global file_num
files_dict["$(file_num)_$(mdfile).md"] =
Dict{String, Any}("content" => "$(sprint(export_markdown, eval(mdfile)))")
file_num += 1
end

jldopen("AMD_$(bmarkname)_vs_master_judgement.jld2", "w") do file
jldopen("AMD_$(bmarkname)_vs_main_judgement.jld2", "w") do file
file["jstats"] = judgement_stats
end

Expand Down

0 comments on commit 4c510c5

Please sign in to comment.