Skip to content

[pycaffe,build] include Python first in caffe tool #2876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shelhamer merged 2 commits into from
Aug 6, 2015
Merged

[pycaffe,build] include Python first in caffe tool #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d958b5a
[pycaffe,build] include Python first in caffe tool
shelhamer Aug 6, 2015
1934fee
[pytest] open exception file with mode for python3
shelhamer Aug 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/caffe/test/test_python_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def python_net_file():


def exception_net_file():
with tempfile.NamedTemporaryFile(delete=False) as f:
with tempfile.NamedTemporaryFile(mode='w+', delete=False) as f:
f.write("""name: 'pythonnet' force_backward: true
input: 'data' input_shape { dim: 10 dim: 9 dim: 8 }
layer { type: 'Python' name: 'layer' bottom: 'data' top: 'top'
Expand Down
10 changes: 5 additions & 5 deletions tools/caffe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#ifdef WITH_PYTHON_LAYER
#include "boost/python.hpp"
namespace bp = boost::python;
#endif

#include <glog/logging.h>

#include <cstring>
Expand All @@ -8,11 +13,6 @@
#include "boost/algorithm/string.hpp"
#include "caffe/caffe.hpp"

#ifdef WITH_PYTHON_LAYER
#include "boost/python.hpp"
namespace bp = boost::python;
#endif

using caffe::Blob;
using caffe::Caffe;
using caffe::Net;
Expand Down