Merge pull request #442 from malmaud/active_project

Start Python task in current project environment.
malmaud · Sep 24, 2018 · 5d207b8 · 5d207b8
2 parents 0c931a7 + 056250d
commit 5d207b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/TensorFlow.jl b/src/TensorFlow.jl
@@ -142,7 +142,9 @@ end
 function load_python_process(;force_reload=false)
     if myid() == 1
         (pyproc[] > 0 && !force_reload) && return pyproc[] # Python process already loaded
-        addprocs(1)
+        withenv("JULIA_PROJECT"=>Base.active_project()) do
+            addprocs(1)
+        end
         pyproc[] = nprocs()
         py_file = joinpath(dirname(@__FILE__), "py.jl")
         Base.eval(Main, quote

diff --git a/src/core.jl b/src/core.jl
@@ -1819,7 +1819,8 @@ function get_tensor_shape(tensor::AbstractTensor)
 end
 
 function get_shape(tensor::AbstractTensor)
-    if ismissing(get_tensor_num_dims(tensor))
+    # TODO understand/fix why gradient tensors have 'nothing' for their graph
+    if get_graph(tensor) === nothing || ismissing(get_tensor_num_dims(tensor))
         return TensorShape([], true)
     else
         return TensorShape(get_tensor_shape(tensor), false)