Merge pull request #40 from TuringLang/compat-v1.2

Compat with Julia v1.2.x/v1.3.x

Author: yebai

.travis.yml

@@ -8,6 +8,7 @@ julia:
 # - 0.7
 - 1.0
 - 1.1
+- 1.2
 - nightly
 
 matrix:

Project.toml

@@ -3,7 +3,7 @@ uuid = "6f1fad26-d15e-5dc8-ae53-837a1d7b8c9f"
 license = "MIT"
 desc = "C shim for task copying in Turing"
 repo = "https://github.com/TuringLang/Libtask.jl.git"
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"

appveyor.yml

@@ -2,6 +2,7 @@ environment:
   matrix:
   - julia_version: 1.0
   - julia_version: 1.1
+  - julia_version: 1.2
   - julia_version: nightly
 
 platform:

deps/build.jl

@@ -7,6 +7,33 @@ function find_prev_tag(tag)
     return get(tags, idx - 1, "NO-PREV-TAG")
 end
 
+# modify build-tmp.jl to only check correct version libs
+function install_products_filter(build_file)
+    prod_filter = raw"""products = filter(products) do prod
+    endswith(prod.libnames[1], "$(VERSION.major)_$(VERSION.minor)")
+end
+"""
+    lines = open(build_file) do io
+        read(io, String) |> x -> split(x, "\n")
+    end
+    prod_in, prod_out, filter_written = false, false, false
+    open(build_file, "w") do io
+        for line in lines
+            if occursin("products = [", line)
+                prod_in = true
+            end
+            if prod_in && line == "]"
+                prod_out = true
+            end
+            write(io, line * "\n")
+            if prod_out && !filter_written
+                write(io, prod_filter * "\n")
+                filter_written = true
+            end
+        end
+    end
+end
+
 function include_build_script(version_str, try_prev=false)
     build_script_url = "https://github.com/TuringLang/Libtask.jl/releases/download/v$(version_str)/build_LibtaskDylib.v$(version_str).jl"
     build_script = joinpath(@__DIR__, "tmp-build.jl")
@@ -15,6 +42,7 @@ function include_build_script(version_str, try_prev=false)
         version_str = find_prev_tag("v$version_str") |> strip |> (x) -> lstrip(x, ['v'])
         return include_build_script(version_str, false)
     end
+    install_products_filter(build_script)
     include(build_script)
 end
 

deps/build_dylib.sh

@@ -5,18 +5,31 @@ cd $WORKSPACE/srcdir
 
 RELEASES=(
     arm-linux-gnueabihf@v1_0@https://julialang-s3.julialang.org/bin/linux/armv7l/1.0/julia-1.0.0-linux-armv7l.tar.gz
+    arm-linux-gnueabihf@v1_3@https://julialang-s3.julialang.org/bin/linux/armv7l/1.3/julia-1.3.0-alpha-linux-armv7l.tar.gz
     aarch64-linux-gnu@v1_0@https://julialang-s3.julialang.org/bin/linux/aarch64/1.0/julia-1.0.4-linux-aarch64.tar.gz
     aarch64-linux-gnu@v1_1@https://julialang-s3.julialang.org/bin/linux/aarch64/1.1/julia-1.1.1-linux-aarch64.tar.gz
+    aarch64-linux-gnu@v1_2@https://julialang-s3.julialang.org/bin/linux/aarch64/1.2/julia-1.2.0-rc2-linux-aarch64.tar.gz
+    aarch64-linux-gnu@v1_3@https://julialang-s3.julialang.org/bin/linux/aarch64/1.3/julia-1.3.0-alpha-linux-aarch64.tar.gz
     i686-linux-gnu@v1_0@https://julialang-s3.julialang.org/bin/linux/x86/1.0/julia-1.0.0-linux-i686.tar.gz
     i686-linux-gnu@v1_1@https://julialang-s3.julialang.org/bin/linux/x86/1.1/julia-1.1.0-linux-i686.tar.gz
+    i686-linux-gnu@v1_2@https://julialang-s3.julialang.org/bin/linux/x86/1.2/julia-1.2.0-rc2-linux-i686.tar.gz
+    i686-linux-gnu@v1_3@https://julialang-s3.julialang.org/bin/linux/x86/1.3/julia-1.3.0-alpha-linux-i686.tar.gz
     x86_64-linux-gnu@v1_0@https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0.0-linux-x86_64.tar.gz
     x86_64-linux-gnu@v1_1@https://julialang-s3.julialang.org/bin/linux/x64/1.1/julia-1.1.0-linux-x86_64.tar.gz
-    x86_64-w64-mingw32@v1_0@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.0.0-win64.tar.gz
-    x86_64-w64-mingw32@v1_1@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.1.0-win64.tar.gz
-    i686-w64-mingw32@v1_0@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.0.0-win32.tar.gz
-    i686-w64-mingw32@v1_1@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.1.0-win32.tar.gz
-    x86_64-apple-darwin14@v1_0@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.0.0-mac64.tar.gz
-    x86_64-apple-darwin14@v1_1@http://mlg.eng.cam.ac.uk/hong/julia/julia-1.1.0-mac64.tar.gz
+    x86_64-linux-gnu@v1_2@https://julialang-s3.julialang.org/bin/linux/x64/1.2/julia-1.2.0-rc2-linux-x86_64.tar.gz
+    x86_64-linux-gnu@v1_3@https://julialang-s3.julialang.org/bin/linux/x64/1.3/julia-1.3.0-alpha-linux-x86_64.tar.gz
+    x86_64-w64-mingw32@v1_0@http://cxan.kdr2.com/julia/releases/julia-1.0.0-win64.tar.gz
+    x86_64-w64-mingw32@v1_1@http://cxan.kdr2.com/julia/releases/julia-1.1.0-win64.tar.gz
+    x86_64-w64-mingw32@v1_2@http://cxan.kdr2.com/julia/releases/julia-1.2.0-rc2-win64.tar.gz
+    x86_64-w64-mingw32@v1_3@http://cxan.kdr2.com/julia/releases/julia-1.3.0-alpha-win64.tar.gz
+    i686-w64-mingw32@v1_0@http://cxan.kdr2.com/julia/releases/julia-1.0.0-win32.tar.gz
+    i686-w64-mingw32@v1_1@http://cxan.kdr2.com/julia/releases/julia-1.1.0-win32.tar.gz
+    i686-w64-mingw32@v1_2@http://cxan.kdr2.com/julia/releases/julia-1.2.0-rc2-win32.tar.gz
+    i686-w64-mingw32@v1_3@http://cxan.kdr2.com/julia/releases/julia-1.3.0-alpha-win32.tar.gz
+    x86_64-apple-darwin14@v1_0@http://cxan.kdr2.com/julia/releases/julia-1.0.0-mac64.tar.gz
+    x86_64-apple-darwin14@v1_1@http://cxan.kdr2.com/julia/releases/julia-1.1.0-mac64.tar.gz
+    x86_64-apple-darwin14@v1_2@http://cxan.kdr2.com/julia/releases/julia-1.2.0-rc2-mac64.tar.gz
+    x86_64-apple-darwin14@v1_3@http://cxan.kdr2.com/julia/releases/julia-1.3.0-alpha-mac64.tar.gz
 )
 
 for RELEASE in ${RELEASES[@]}; do

deps/build_tarballs.jl

@@ -40,6 +40,8 @@ platforms = [
 products(prefix) = [
     LibraryProduct(prefix, "libtask_v1_0", :libtask_v1_0)
     LibraryProduct(prefix, "libtask_v1_1", :libtask_v1_1)
+    LibraryProduct(prefix, "libtask_v1_2", :libtask_v1_2)
+    LibraryProduct(prefix, "libtask_v1_3", :libtask_v1_3)
 ]
 
 # Dependencies that must be installed before this package can be built
@@ -48,4 +50,5 @@ dependencies = [
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
+# build_file = "products/build_$(name).v$(version_str).jl"
 build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)

deps/task.c

@@ -46,6 +46,10 @@ jl_task_t *jl_clone_task(jl_task_t *t)
 #if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 1
     newt->copy_stack = t->copy_stack;
     memcpy((void*)newt->ctx.uc_mcontext, (void*)t->ctx.uc_mcontext, sizeof(jl_jmp_buf));
+#if JULIA_VERSION_MINOR >= 2
+    newt->queue = t->queue;
+    newt->sticky = t->sticky;
+#endif
 #else
     newt->parent = ptls->current_task;
     newt->current_module = t->current_module;

src/taskcopy.jl

@@ -1,9 +1,13 @@
 # Utility function for self-copying mechanism
 
-@static if VERSION >= v"1.1.0"
-  const libtask = libtask_v1_1
-else
-  const libtask = libtask_v1_0
+@static if VERSION < v"1.0.9999" # (-, v1.1)
+    const libtask = libtask_v1_0
+elseif VERSION < v"1.1.9999" # [v1.1, v1.2)
+    const libtask = libtask_v1_1
+elseif VERSION < v"1.2.9999" # [v1.2, v1.3)
+    const libtask = libtask_v1_2
+else # [v1.3, +)
+  const libtask = libtask_v1_3
 end
 
 n_copies() = n_copies(current_task())
@@ -124,9 +128,14 @@ produce(v) = begin
     if !(t.state in [:runnable, :queued])
         throw(AssertionError("producer.consumer.state in [:runnable, :queued]"))
     end
-    if t.state == :queued yield() end
+    @static if VERSION < v"1.1.9999"
+        if t.state == :queued yield() end
+    else
+        if t.queue != nothing yield() end
+    end
     if empty
-        Base.schedule_and_wait(t, v)
+        schedule(t, v)
+        wait()
         ct = current_task() # When a task is copied, ct should be updated to new task ID.
         while true
             # wait until there are more consumers