From 641972f93df23420985761b2f9439e948faafbb1 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Thu, 16 Mar 2017 21:18:22 -0400 Subject: [PATCH 1/3] Revert "bump version requirements for Calculus, DiffBase, and NaNMath to include v0.6 fixes (#184)" This reverts commit 62ad04b6cc2f36f744942d5061c64fc3f9582da1. If higher minimum versions are only needed for 0.6, they should be loosened here Upper bound this branch so it is not installable on 0.6. --- REQUIRE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/REQUIRE b/REQUIRE index ec3f5ea3..beb65764 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,5 +1,5 @@ -julia 0.4 -DiffBase 0.0.3 +julia 0.4 0.6 +DiffBase 0.0.1 Compat 0.8.6 -Calculus 0.2.0 -NaNMath 0.2.2 +Calculus 0.1.15 +NaNMath 0.2.1 From 5e9cecc0f9239ae023538bd13a4a09f9407a824c Mon Sep 17 00:00:00 2001 From: Jarrett Revels Date: Thu, 16 Mar 2017 17:17:50 -0400 Subject: [PATCH 2/3] fix seed-reset order for no-op cases where input === the output (#204) (cherry picked from commit 6c61b61de2b25ab8b8469b7ddb0b410898590323) --- src/gradient.jl | 8 ++++---- src/jacobian.jl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gradient.jl b/src/gradient.jl index e0960bf7..fd0f9e29 100644 --- a/src/gradient.jl +++ b/src/gradient.jl @@ -94,17 +94,17 @@ function chunk_mode_gradient_expr(out_definition::Expr) # do first chunk manually to calculate output type seed!(xdual, x, 1, seeds) ydual = f(xdual) - seed!(xdual, x, 1) $(out_definition) extract_gradient_chunk!(out, ydual, 1, N) + seed!(xdual, x, 1) # do middle chunks for c in middlechunks i = ((c - 1) * N + 1) seed!(xdual, x, i, seeds) ydual = f(xdual) - seed!(xdual, x, i) extract_gradient_chunk!(out, ydual, i, N) + seed!(xdual, x, i) end # do final chunk @@ -156,9 +156,9 @@ if IS_MULTITHREADED_JULIA # do first chunk manually to calculate output type seed!(current_xdual, x, 1, current_seeds) current_ydual = f(current_xdual) - seed!(current_xdual, x, 1) $(out_definition) extract_gradient_chunk!(out, current_ydual, 1, N) + seed!(current_xdual, x, 1) # do middle chunks Base.Threads.@threads for c in middlechunks @@ -169,8 +169,8 @@ if IS_MULTITHREADED_JULIA local chunk_index = ((c - 1) * N + 1) seed!(chunk_xdual, x, chunk_index, chunk_seeds) local chunk_dual = f(chunk_xdual) - seed!(chunk_xdual, x, chunk_index) extract_gradient_chunk!(out, chunk_dual, chunk_index, N) + seed!(chunk_xdual, x, chunk_index) end # do final chunk diff --git a/src/jacobian.jl b/src/jacobian.jl index 65bd3e3d..83103045 100644 --- a/src/jacobian.jl +++ b/src/jacobian.jl @@ -125,18 +125,18 @@ function jacobian_chunk_mode_expr(work_array_definition::Expr, compute_ydual::Ex # do first chunk manually to calculate output type seed!(xdual, x, 1, seeds) $(compute_ydual) - seed!(xdual, x, 1) $(out_definition) out_reshaped = reshape_jacobian(out, ydual, xdual) extract_jacobian_chunk!(out_reshaped, ydual, 1, N) + seed!(xdual, x, 1) # do middle chunks for c in middlechunks i = ((c - 1) * N + 1) seed!(xdual, x, i, seeds) $(compute_ydual) - seed!(xdual, x, i) extract_jacobian_chunk!(out_reshaped, ydual, i, N) + seed!(xdual, x, i) end # do final chunk From 4705b3314b473e79ddf7c89f7e9c9adf99d9979e Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Fri, 17 Mar 2017 19:52:39 -0700 Subject: [PATCH 3/3] don't test this branch on nightly --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 91e2c719..4d5101e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: julia julia: - 0.4 - 0.5 - - nightly notifications: email: false sudo: false