Merge pull request apache#53 from BigEpsilon/patch-4

Fix compilation errors for julia 0.4.2
iblislin · Dec 12, 2015 · 32c8954 · 32c8954
2 parents 9286bcc + 8e879d7
commit 32c8954
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/io.jl b/src/io.jl
@@ -435,7 +435,7 @@ immutable ArrayDataBatch <: AbstractDataBatch
   idx :: UnitRange{Int}
 end
 function Base.next(provider :: ArrayDataProvider, state :: ArrayDataProviderState)
-  idx = state.curr_idx:min(state.curr_idx+provider.batch_size-1, provider.sample_count)
+  idx = state.curr_idx:Base.min(state.curr_idx+provider.batch_size-1, provider.sample_count)
   return (ArrayDataBatch(idx), ArrayDataProviderState(idx.stop+1))
 end
 

diff --git a/src/model.jl b/src/model.jl
@@ -43,7 +43,7 @@ function _split_inputs(batch_size :: Int, n_split :: Int)
   @assert(batch_size >= n_split)
   per_split = floor(Int, batch_size / n_split)
   counts    = Base.zeros(Int, n_split)+per_split
-  extra     = batch_size - sum(counts)
+  extra     = batch_size - Base.sum(counts)
   counts[1:extra] += 1
 
   cum = [0, cumsum(counts)...]