Merge pull request #31 from johnfgibson/compat-0.6-1.0

add @compat calls for 0.6/0.7/1.0 compatibility

Author: johnfgibson

bin/table.jl

@@ -3,7 +3,9 @@
 # This script generates the table published at https://julialang.org/benchmarks/
 # (file _includes/benchmarks.html in the JuliaLang/julialang.github.com repository)
 
-using Statistics
+using Compat
+import Compat.Statistics
+import Compat.Printf
 
 const benchmark_order = [
     "iteration_pi_sum",
@@ -53,10 +55,10 @@ function lang_by(lang::String)
     # C is placed at the start of the list
     lang == "c" ? -Inf :
     # Julia is sorted immediately after C
-    lang == "julia" ? -realmax() :
+    @compat lang == "julia" ? -floatmax() :
     # The rest of the languages are sorted by the geometric mean of their benchmark values
     # See https://en.wikipedia.org/wiki/Geometric_mean#Relationship_with_logarithms for details
-    exp(mean(log.(collect(values(benchmarks[lang])))))
+    @compat exp(Statistics.mean(log.(collect(values(benchmarks[lang])))))
 end
 
 const language_order = sort!(collect(keys(benchmarks)), by=lang_by)
@@ -94,15 +96,13 @@ print("""
     <tbody>
 """)
 
-using Printf
-
 for benchmark in benchmark_order
     println("        <tr><th>$benchmark</th>")
     c_time = benchmarks["c"][benchmark]
     for lang in language_order
         rel_time = "n/a"
         if haskey(benchmarks[lang], benchmark)
-            rel_time = @sprintf "%.2f" benchmarks[lang][benchmark]/c_time
+            @compat rel_time = Printf.@sprintf "%.2f" benchmarks[lang][benchmark]/c_time
         end
         println("            <td class=\"data\">$rel_time</td>")
     end

bin/versions.sh

@@ -13,7 +13,7 @@ echo -n java,
 java -version 2>&1 |grep "version" | cut -f3 -d " " | cut -c 2-9
 
 echo -n "javascript,V8 "
-nodejs -e "console.log(process.versions.v8)"
+node8 -e "console.log(process.versions.v8)"
 
 echo -n "julia,"
 $JULIAHOME/usr/bin/julia -v | cut -f3 -d" "
@@ -29,7 +29,7 @@ echo -n "matlab,R"
 matlab -nodisplay -nojvm -nosplash -r "version -release, quit" | tail -n3 | head -n1 | cut -f5 -d" " | sed "s/'//g"
 
 echo -n "octave,"
-octave -v | grep version | cut -f4 -d" "
+octave-cli -v | grep version | cut -f4 -d" "
 
 echo -n "python,"
 python3 -V 2>&1 | cut -f2 -d" "

perf.jl

@@ -1,16 +1,20 @@
 # This file was formerly a part of Julia. License is MIT: https://julialang.org/license
 
-using LinearAlgebra
-using Test
-using Printf
+using Compat
+
+import Compat.LinearAlgebra
+import Compat.Test
+import Compat.Printf
+import Compat.Statistics
+import Compat.Sys
 
 include("./perfutil.jl")
 
 ## recursive fib ##
 
 fib(n) = n < 2 ? n : fib(n-1) + fib(n-2)
 
-@test fib(20) == 6765
+@compat Test.@test fib(20) == 6765
 @timeit fib(20) "recursion_fibonacci" "Recursive fibonacci"
 
 ## parse integer ##
@@ -19,8 +23,13 @@ function parseintperf(t)
     local n, m
     for i=1:t
         n = rand(UInt32)
-        s = string(n, base = 16)
-        m = UInt32(parse(Int64,s, base = 16))
+        @static if VERSION >= v"0.7.0-DEV.4446"
+            s = string(n, base = 16)
+            m = UInt32(parse(Int64, s, base = 16))
+        else
+            s = hex(n)
+            m = UInt32(parse(Int64, s, 16))
+        end
         @assert m == n
     end
     return n
@@ -30,12 +39,12 @@ end
 
 ## array constructors ##
 
-@test all(fill(1.,200,200) .== 1)
+@compat Test.@test all(fill(1.,200,200) .== 1)
 
 ## matmul and transpose ##
 
 A = fill(1.,200,200)
-@test all(A*A' .== 200)
+@compat Test.@test all(A*A' .== 200)
 # @timeit A*A' "AtA" "description"
 
 ## mandelbrot set: complex arithmetic and comprehensions ##
@@ -57,7 +66,7 @@ function mandel(z)
 end
 
 mandelperf() = [ mandel(complex(r,i)) for i=-1.:.1:1., r=-2.0:.1:0.5 ]
-@test sum(mandelperf()) == 14791
+@compat Test.@test sum(mandelperf()) == 14791
 @timeit mandelperf() "userfunc_mandelbrot" "Calculation of mandelbrot set"
 
 ## numeric vector sort ##
@@ -81,7 +90,7 @@ function qsort!(a,lo,hi)
 end
 
 sortperf(n) = qsort!(rand(n), 1, n)
-@test issorted(sortperf(5000))
+@compat Test.@test issorted(sortperf(5000))
 @timeit sortperf(5000) "recursion_quicksort" "Sorting of random numbers using quicksort"
 
 ## slow pi series ##
@@ -97,7 +106,7 @@ function pisum()
     sum
 end
 
-@test abs(pisum()-1.644834071848065) < 1e-12
+@compat Test.@test abs(pisum()-1.644834071848065) < 1e-12
 @timeit pisum() "iteration_pi_sum" "Summation of a power series"
 
 ## slow pi series, vectorized ##
@@ -127,14 +136,19 @@ function randmatstat(t)
         d = randn(n,n)
         P = [a b c d]
         Q = [a b; c d]
-        v[i] = tr((P'*P)^4)
-        w[i] = tr((Q'*Q)^4)
+        @static if VERSION >= v"0.7.0" 
+            v[i] = LinearAlgebra.tr((P'*P)^4)
+            w[i] = LinearAlgebra.tr((Q'*Q)^4)
+        else
+            v[i] = trace((P'*P)^4)
+            w[i] = trace((Q'*Q)^4)
+        end
     end
-    return (std(v)/mean(v), std(w)/mean(w))
+    @compat return (Statistics.std(v)/Statistics.mean(v), Statistics.std(w)/Statistics.mean(w))
 end
 
 (s1, s2) = randmatstat(1000)
-@test 0.5 < s1 < 1.0 && 0.5 < s2 < 1.0
+@compat Test.@test 0.5 < s1 < 1.0 && 0.5 < s2 < 1.0
 @timeit randmatstat(1000) "matrix_statistics" "Statistics on a random matrix"
 
 ## largish random number gen & matmul ##
@@ -143,11 +157,11 @@ end
 
 ## printfd ##
 
-if Sys.isunix()
+@compat if Sys.isunix()
     function printfd(n)
         open("/dev/null", "w") do io
             for i = 1:n
-                @printf(io, "%d %d\n", i, i + 1)
+                @compat Printf.@printf(io, "%d %d\n", i, i + 1)
             end
         end
     end

perfutil.jl

@@ -1,6 +1,10 @@
 # This file was formerly a part of Julia. License is MIT: https://julialang.org/license
 
-using Printf, Random, Statistics
+using Compat
+import Compat.Printf
+import Compat.Random
+import Compat.Statistics
+import Compat.Sys
 
 const mintrials = 5
 const mintime = 2000.0
@@ -34,15 +38,15 @@ function submit_to_codespeed(vals,name,desc,unit,test_group,lessisbetter=true)
 
     csdata["benchmark"] = name
     csdata["description"] = desc
-    csdata["result_value"] = mean(vals)
-    csdata["std_dev"] = std(vals)
+    @compat csdata["result_value"] = Statistics.mean(vals)
+    @compat csdata["std_dev"] = Statistics.std(vals)
     csdata["min"] = minimum(vals)
     csdata["max"] = maximum(vals)
     csdata["units"] = unit
     csdata["units_title"] = test_group
     csdata["lessisbetter"] = lessisbetter
 
-    println( "$name: $(mean(vals))" )
+    @compat println( "$name: $(Statistics.mean(vals))" )
     ret = post( "http://$codespeed_host/result/add/json/", Dict("json" => json([csdata])) )
     println( json([csdata]) )
     if ret.http_code != 200 && ret.http_code != 202
@@ -63,7 +67,7 @@ macro output_timings(t,name,desc,group)
         if codespeed
             submit_to_codespeed( $t, $name, $desc, "seconds", test_group )
         elseif print_output
-            @printf "julia,%s,%f,%f,%f,%f\n" $name minimum($t) maximum($t) mean($t) std($t)
+            @compat Printf.@printf "julia,%s,%f,%f,%f,%f\n" $name minimum($t) maximum($t) Statistics.mean($t) Statistics.std($t)
         end
         GC.gc()
     end
@@ -106,17 +110,23 @@ end
 
 function maxrss(name)
     # FIXME: call uv_getrusage instead here
-    @static if Sys.islinux()
+    @compat @static if (Sys.islinux())
         rus = Vector{Int64}(uninitialized, div(144,8))
         fill!(rus, 0x0)
         res = ccall(:getrusage, Int32, (Int32, Ptr{Cvoid}), 0, rus)
         if res == 0
             mx = rus[5]/1024
-            @printf "julia,%s.mem,%f,%f,%f,%f\n" name mx mx mx 0
+            @compat Printf.@printf "julia,%s.mem,%f,%f,%f,%f\n" name mx mx mx 0
         end
     end
 end
 
 
 # seed rng for more consistent timings
-srand(1776)
+if VERSION >= v"0.7.0"
+    Random.seed!(1776)
+else
+    srand(1776)
+end
+
+#@compat Random.seed!(1776)