Skip to content

Commit

Permalink
transitioned to Julia 1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
chakravala committed Aug 11, 2018
1 parent da8f7d3 commit 2da4220
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ os:
- linux
- osx
julia:
- 0.6
- 0.7
- nightly
notifications:
Expand Down
12 changes: 12 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name = "ReduceLinAlg"
uuid = "bfcbc1eb-9170-5dc4-a833-47b2e27cecb4"

[deps]
Reduce = "93e0c654-6965-5f22-aba9-9c1ae6b3c259"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
3 changes: 1 addition & 2 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
julia 0.6
julia 0.7
Reduce
Compat
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
Expand Down
16 changes: 7 additions & 9 deletions src/ReduceLinAlg.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
__precompile__()
module ReduceLinAlg
importall Reduce
using Compat
import Compat.String
using Reduce, LinearAlgebra

# This file is part of ReduceLinAlg.jl. It is licensed under the MIT license
# Copyright (C) 2018 Michael Reed

const VectorAny = Union{Vector,RowVector}
const VectorAny = Union{Vector,Adjoint}

const lin = [
:hessian,
Expand Down Expand Up @@ -40,8 +38,8 @@ for fun in lin
@eval begin
$(Reduce.parsegen(fun,:args))
$(Reduce.unfoldgen(fun,:args))
function $fun(expr::Compat.String,s...;be=0)
convert(Compat.String, $fun(RExpr(expr),s...;be=be))
function $fun(expr::String,s...;be=0)
convert(String, $fun(RExpr(expr),s...;be=be))
end
end
end
Expand All @@ -50,15 +48,15 @@ for fun in unr
@eval begin
$(Reduce.parsegen(fun,:unary))
$(Reduce.unfoldgen(fun,:unary))
function $fun(expr::Compat.String;be=0)
convert(Compat.String, $fun(RExpr(expr);be=be))
function $fun(expr::String;be=0)
convert(String, $fun(RExpr(expr);be=be))
end
end
end

const MatExpr = Union{Array{Any,2},Array{Expr,2},Array{Symbol,2},Expr,Symbol}

band_matrix(r::Union{Vector,RowVector,Expr,Symbol},v::Integer) = band_matrix(list(r),v) |> parse
band_matrix(r::Union{Vector,Adjoint,Expr,Symbol},v::Integer) = band_matrix(list(r),v) |> parse
band_matrix(r::T,v::Integer) where T <: Tuple = band_matrix(RExpr(r),v) |> parse
block_matrix(r::Integer,c::Integer,s::VectorAny) = block_matrix(RExpr(r),RExpr(c),list(s)) |> parse
block_matrix(r::Integer,c::Integer,s::T) where T <: Tuple = block_matrix(RExpr(r),RExpr(c),RExpr(s)) |> parse
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Reduce
using ReduceLinAlg
using Base.Test
using Test

# write your own tests here
@test mat_jacobian((:x,),(:x,)) == mat_jacobian([:x],[:x])
Expand Down

0 comments on commit 2da4220

Please sign in to comment.