Moved python C++ utility headers into dlib/python and updated

#include statements to reflect this move.

--HG--
rename : tools/python/src/boost_python_utils.h => dlib/python/boost_python_utils.h
rename : tools/python/src/pyassert.h => dlib/python/pyassert.h
rename : tools/python/src/serialize_pickle.h => dlib/python/serialize_pickle.h
This commit is contained in:
Davis King 2013-09-01 13:15:04 -04:00
parent 0eb8296872
commit 6fc0d8f608
14 changed files with 25 additions and 27 deletions

12
dlib/python.h Normal file
View File

@ -0,0 +1,12 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license.
#ifndef DLIB_PYTHoN_TOP_
#define DLIB_PYTHoN_TOP_
#include "python/boost_python_utils.h"
#include "python/pyassert.h"
#include "python/serialize_pickle.h"
#endif // DLIB_PYTHoN_TOP_

View File

@ -4,6 +4,8 @@
#define DLIB_BOOST_PYTHON_UtILS_H__ #define DLIB_BOOST_PYTHON_UtILS_H__
#include <boost/python.hpp> #include <boost/python.hpp>
#include <vector>
#include <string>
inline bool hasattr( inline bool hasattr(
boost::python::object obj, boost::python::object obj,

View File

@ -1,6 +1,6 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include <sstream> #include <sstream>
#include <string> #include <string>
@ -10,8 +10,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/string.h> #include <dlib/string.h>
#include "serialize_pickle.h"
#include "pyassert.h"
using namespace std; using namespace std;
using namespace dlib; using namespace dlib;

View File

@ -1,10 +1,9 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/statistics.h> #include <dlib/statistics.h>
#include "pyassert.h"
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
using namespace dlib; using namespace dlib;

View File

@ -1,10 +1,9 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <dlib/python.h>
#include "testing_results.h" #include "testing_results.h"
#include <boost/python.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "serialize_pickle.h"
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
#include <dlib/svm.h> #include <dlib/svm.h>

View File

@ -1,13 +1,11 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include <dlib/string.h> #include <dlib/string.h>
#include "serialize_pickle.h"
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
#include "pyassert.h"
using namespace dlib; using namespace dlib;
using namespace boost::python; using namespace boost::python;

View File

@ -1,14 +1,13 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp>
#include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include <dlib/data_io.h> #include <dlib/data_io.h>
#include <dlib/sparse_vector.h> #include <dlib/sparse_vector.h>
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
#include "pyassert.h"
#include <dlib/optimization.h> #include <dlib/optimization.h>
#include "boost_python_utils.h"
using namespace dlib; using namespace dlib;
using namespace std; using namespace std;

View File

@ -1,12 +1,10 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include "serialize_pickle.h"
#include <dlib/svm_threaded.h> #include <dlib/svm_threaded.h>
#include "pyassert.h"
#include <boost/python/suite/indexing/vector_indexing_suite.hpp> #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <boost/python/args.hpp> #include <boost/python/args.hpp>

View File

@ -1,13 +1,11 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <dlib/python.h>
#include "testing_results.h" #include "testing_results.h"
#include <boost/python.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include "serialize_pickle.h"
#include <dlib/svm_threaded.h> #include <dlib/svm_threaded.h>
#include "pyassert.h"
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
using namespace dlib; using namespace dlib;

View File

@ -1,12 +1,10 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include "serialize_pickle.h"
#include <dlib/svm.h> #include <dlib/svm.h>
#include "pyassert.h"
#include <boost/python/suite/indexing/vector_indexing_suite.hpp> #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include "testing_results.h" #include "testing_results.h"
#include <boost/python/args.hpp> #include <boost/python/args.hpp>

View File

@ -1,11 +1,9 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include <boost/python/args.hpp> #include <boost/python/args.hpp>
#include "pyassert.h"
#include "boost_python_utils.h"
#include <dlib/svm.h> #include <dlib/svm.h>

View File

@ -1,10 +1,9 @@
// Copyright (C) 2013 Davis E. King (davis@dlib.net) // Copyright (C) 2013 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include <boost/python.hpp> #include <dlib/python.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dlib/matrix.h> #include <dlib/matrix.h>
#include "serialize_pickle.h"
#include <boost/python/slice.hpp> #include <boost/python/slice.hpp>