Merge pull request #490 from malmaud/bump_version

Bump version.

deps/build.jl

@@ -1,8 +1,8 @@
 using PyCall
 using Conda
 
-const cur_version = "1.10.0"
-const cur_py_version = "1.10.0"
+const cur_version = "1.12.0"
+const cur_py_version = "1.12.0"
 
 
 ############################

src/TensorFlow.jl

@@ -129,6 +129,12 @@ tf_versioninfo
 
 using Distributed
 
+# Load these packages here so they are available to the additional
+# process spawned in 'load_python_process. Arslan thinks that will
+# work for now.
+using MacroTools  
+using PyCall
+
 const pyproc = Ref(0)
 
 function deallocator(data, len, arg)

src/protobufs/allocation_description_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/any_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/attr_value_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/checkpointable_object_graph_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 
@@ -13,6 +12,7 @@ mutable struct CheckpointableObjectGraph_CheckpointableObject_SerializedTensor <
     name::AbstractString
     full_name::AbstractString
     checkpoint_key::AbstractString
+    optional_restore::Bool
     CheckpointableObjectGraph_CheckpointableObject_SerializedTensor(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct CheckpointableObjectGraph_CheckpointableObject_SerializedTensor
 

src/protobufs/cluster_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/config_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 
@@ -14,6 +13,7 @@ mutable struct GPUOptions_Experimental <: ProtoType
     virtual_devices::Base.Vector{GPUOptions_Experimental_VirtualDevices}
     use_unified_memory::Bool
     num_dev_to_dev_copy_streams::Int32
+    collective_ring_order::AbstractString
     GPUOptions_Experimental(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct GPUOptions_Experimental
 
@@ -83,6 +83,8 @@ end #mutable struct ThreadPoolOptionProto
 
 mutable struct RPCOptions <: ProtoType
     use_rpc_for_inprocess_master::Bool
+    compression_algorithm::AbstractString
+    compression_level::Int32
     RPCOptions(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct RPCOptions
 
@@ -95,9 +97,12 @@ end #mutable struct ConfigProto_DeviceCountEntry (mapentry)
 mutable struct ConfigProto_Experimental <: ProtoType
     collective_group_leader::AbstractString
     executor_type::AbstractString
+    recv_buf_max_chunk::Int32
+    use_numa_affinity::Bool
+    collective_deterministic_sequential_execution::Bool
     ConfigProto_Experimental(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct ConfigProto_Experimental
-const __fnum_ConfigProto_Experimental = Int[1,3]
+const __fnum_ConfigProto_Experimental = Int[1,3,4,5,6]
 meta(t::Type{ConfigProto_Experimental}) = meta(t, ProtoBuf.DEF_REQ, __fnum_ConfigProto_Experimental, ProtoBuf.DEF_VAL, true, ProtoBuf.DEF_PACK, ProtoBuf.DEF_WTYPES, ProtoBuf.DEF_ONEOFS, ProtoBuf.DEF_ONEOF_NAMES, ProtoBuf.DEF_FIELD_TYPES)
 
 mutable struct ConfigProto <: ProtoType

src/protobufs/control_flow_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/cost_graph_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/critical_section_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/debug_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/device_attributes_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/device_properties_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/eager_service_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ._ProtoBuf_Top_.tensorflow

src/protobufs/error_codes_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/function_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/google.jl

@@ -1,8 +1,6 @@
 module google
-  using Compat
   const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
   module protobuf
-    using Compat
     const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
     include("any_pb.jl")
   end

src/protobufs/graph_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/master_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ._ProtoBuf_Top_.tensorflow

src/protobufs/master_service_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ._ProtoBuf_Top_.tensorflow

src/protobufs/meta_graph_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ProtoBuf.google.protobuf

src/protobufs/named_tensor_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/node_def_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 
@@ -9,14 +8,20 @@ mutable struct NodeDef_AttrEntry <: ProtoType
     NodeDef_AttrEntry(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct NodeDef_AttrEntry (mapentry)
 
+mutable struct NodeDef_ExperimentalDebugInfo <: ProtoType
+    original_node_names::Base.Vector{AbstractString}
+    NodeDef_ExperimentalDebugInfo(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
+end #mutable struct NodeDef_ExperimentalDebugInfo
+
 mutable struct NodeDef <: ProtoType
     name::AbstractString
     op::AbstractString
     input::Base.Vector{AbstractString}
     device::AbstractString
     attr::Base.Dict{AbstractString,AttrValue} # map entry
+    experimental_debug_info::NodeDef_ExperimentalDebugInfo
     NodeDef(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct NodeDef
 
-export NodeDef_AttrEntry, NodeDef
+export NodeDef_AttrEntry, NodeDef_ExperimentalDebugInfo, NodeDef
 # mapentries: "NodeDef_AttrEntry" => ("AbstractString", "AttrValue")

src/protobufs/op_def_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/queue_runner_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ._ProtoBuf_Top_.tensorflow

src/protobufs/replay_log_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/resource_handle_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/rewriter_config_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 
@@ -73,13 +72,15 @@ mutable struct RewriterConfig <: ProtoType
     min_graph_nodes::Int32
     memory_optimization::Int32
     memory_optimizer_target_node_name_scope::AbstractString
+    meta_optimizer_timeout_ms::Int64
     auto_parallel::AutoParallelOptions
+    fail_on_optimizer_errors::Bool
     scoped_allocator_opts::ScopedAllocatorOptions
     optimizers::Base.Vector{AbstractString}
     custom_optimizers::Base.Vector{RewriterConfig_CustomGraphOptimizer}
     RewriterConfig(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct RewriterConfig
-const __fnum_RewriterConfig = Int[1,3,13,14,7,8,9,10,11,2,15,18,19,12,17,4,6,5,16,100,200]
+const __fnum_RewriterConfig = Int[1,3,13,14,7,8,9,10,11,2,15,18,19,12,17,4,6,20,5,21,16,100,200]
 meta(t::Type{RewriterConfig}) = meta(t, ProtoBuf.DEF_REQ, __fnum_RewriterConfig, ProtoBuf.DEF_VAL, true, ProtoBuf.DEF_PACK, ProtoBuf.DEF_WTYPES, ProtoBuf.DEF_ONEOFS, ProtoBuf.DEF_ONEOF_NAMES, ProtoBuf.DEF_FIELD_TYPES)
 
 export AutoParallelOptions, ScopedAllocatorOptions, RewriterConfig_Toggle, RewriterConfig_NumIterationsType, RewriterConfig_MemOptType, RewriterConfig_CustomGraphOptimizer_ParameterMapEntry, RewriterConfig_CustomGraphOptimizer, RewriterConfig

src/protobufs/saved_model_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/saver_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/step_stats_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensor_bundle_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensor_description_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensor_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensor_shape_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensor_slice_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/tensorflow.jl

@@ -1,5 +1,4 @@
 module tensorflow
-  using Compat
   const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
   include("checkpointable_object_graph_pb.jl")
   include("cluster_pb.jl")
@@ -27,7 +26,6 @@ module tensorflow
   include("tensorflow_server_pb.jl")
   include("named_tensor_pb.jl")
   module error
-    using Compat
     const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
     include("error_codes_pb.jl")
   end
@@ -42,12 +40,10 @@ module tensorflow
   include("transport_options_pb.jl")
   include("worker_pb.jl")
   module eager
-    using Compat
     const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
     include("eager_service_pb.jl")
   end
   module grpc
-    using Compat
     const _ProtoBuf_Top_ = @static isdefined(parentmodule(@__MODULE__), :_ProtoBuf_Top_) ? (parentmodule(@__MODULE__))._ProtoBuf_Top_ : parentmodule(@__MODULE__)
     include("master_service_pb.jl")
     include("worker_service_pb.jl")

src/protobufs/tensorflow_server_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/transport_options_pb.jl

@@ -1,10 +1,9 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 
 mutable struct RecvBufRespExtra <: ProtoType
-    tensor_content::Array{UInt8,1}
+    tensor_content::Base.Vector{Array{UInt8,1}}
     RecvBufRespExtra(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct RecvBufRespExtra
 

src/protobufs/types_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/versions_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 

src/protobufs/worker_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ProtoBuf.google.protobuf
@@ -244,6 +243,7 @@ meta(t::Type{CompleteInstanceRequest}) = meta(t, ProtoBuf.DEF_REQ, ProtoBuf.DEF_
 mutable struct CompleteInstanceResponse <: ProtoType
     instance_key::Int32
     source_rank::Int32
+    communicator_key::Array{UInt8,1}
     CompleteInstanceResponse(; kwargs...) = (o=new(); fillunset(o); isempty(kwargs) || ProtoBuf._protobuild(o, kwargs); o)
 end #mutable struct CompleteInstanceResponse
 

src/protobufs/worker_service_pb.jl

@@ -1,5 +1,4 @@
 # syntax: proto3
-using Compat
 using ProtoBuf
 import ProtoBuf.meta
 import ._ProtoBuf_Top_.tensorflow