Skip to content
Permalink
Browse files

Merge pull request #4 from szagoruyko/master

remove not needed loadcaffe hack
  • Loading branch information
mbartoli committed Mar 12, 2016
2 parents 7545cf3 + cbb7ee1 commit a4b81c1557f17384a770f05672577eec80c85be7
Showing with 2 additions and 83 deletions.
  1. +0 −81 loadcaffe_wrapper.lua
  2. +2 −2 neural_style.lua

This file was deleted.

@@ -3,7 +3,7 @@ require 'nn'
require 'image'
require 'optim'

local loadcaffe_wrap = require 'loadcaffe_wrapper'
require 'loadcaffe'

--------------------------------------------------------------------------------

@@ -48,7 +48,7 @@ local function main(params)
require 'cudnn'
end

local cnn = loadcaffe_wrap.load(params.proto_file, params.model_file, params.backend):float()
local cnn = loadcaffe.load(params.proto_file, params.model_file, params.backend):float()
if params.gpu >= 0 then
cnn:cuda()
end

0 comments on commit a4b81c1

Please sign in to comment.
You can’t perform that action at this time.