Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to use BenchmarkTools v0.0.7 #28

Merged
merged 2 commits into from
Feb 7, 2017
Merged

update to use BenchmarkTools v0.0.7 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66e6108
update to use BenchmarkTools v0.0.7
jrevels Feb 4, 2017
346f3d4
Nanosoldier does not need to be tested on nightly or on macos
jrevels Feb 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
language: julia
os:
- linux
- osx
julia:
- release
- nightly
notifications:
email: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess the nightly cron job will cover this? Or does the Nanosoldier.jl code only run on the coordinator node with a fixed release Julia?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or does the Nanosoldier.jl code only run on the coordinator node with a fixed release Julia?

This. I'm never going to be running the server on a non-release version of Julia (right now it's the latest v0.5 release).

script:
Expand Down
2 changes: 1 addition & 1 deletion REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
julia 0.4
BenchmarkTools 0.0.5 0.0.6-
BenchmarkTools 0.0.7
GitHub
JSON
JLD
Expand Down
6 changes: 3 additions & 3 deletions src/jobs/BenchmarkJob.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function retrieve_daily_data!(results, key, cfg, date)
primary_index = findfirst(fname -> endswith(fname, "_primary.jld"), datafiles)
if primary_index > 0
primary_file = datafiles[primary_index]
results[key] = JLD.load(joinpath(datapath, primary_file), "results")
results[key] = BenchmarkTools.load(joinpath(datapath, primary_file), "results")
found_previous_date = true
end
catch err
Expand Down Expand Up @@ -335,7 +335,7 @@ function execute_benchmarks!(job::BenchmarkJob, whichbuild::Symbol)
results = run(benchmarks; verbose = true)

println("SAVING RESULT...")
JLD.save(\"$(benchresults)\", "results", results)
BenchmarkTools.save(\"$(benchresults)\", "results", results)

println("DONE!")

Expand Down Expand Up @@ -364,7 +364,7 @@ function execute_benchmarks!(job::BenchmarkJob, whichbuild::Symbol)
run(`sudo cset set -d /user/child`)
run(`sudo cset shield --reset`)

results = JLD.load(benchresults, "results")
results = BenchmarkTools.load(benchresults, "results")

# Get the verbose output of versioninfo for the build, throwing away
# environment information that is useless/potentially risky to expose.
Expand Down