Skip to content

Fix errors with GCC 6.1.1 and Python 3.5 #173

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

Closed
a2wagner wants to merge 1 commit into from
Closed

Fix errors with GCC 6.1.1 and Python 3.5 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix errors with GCC 6.1.1 and Python 3.5 
ROOT won't compile because of changes in the Python API together with
GCC 6.1 release. The code changes fixes the issues on my machine running
Arch Linux (except for an error in Python 3.5 numpy/__multiarray_api.h)
  • Loading branch information
@a2wagner
a2wagner committed May 20, 2016
commit e42e2bd30ed875a89c1910c524df08e66572c306
5 changes: 5 additions & 0 deletions tmva/pymva/src/MethodPyAdaBoost.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>

#if PY_VERSION_HEX >= 0x03000000
#define PyString_FromString PyBytes_FromString
#define PyString_AsString PyBytes_AsString
#endif

#include "TMath.h"
#include "Riostream.h"
#include "TMatrix.h"
Expand Down
5 changes: 5 additions & 0 deletions tmva/pymva/src/MethodPyGTB.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>

#if PY_VERSION_HEX >= 0x03000000
#define PyString_FromString PyBytes_FromString
#define PyString_AsString PyBytes_AsString
#endif

#include "TMath.h"
#include "Riostream.h"
#include "TMatrix.h"
Expand Down
5 changes: 5 additions & 0 deletions tmva/pymva/src/MethodPyRandomForest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>

#if PY_VERSION_HEX >= 0x03000000
#define PyString_FromString PyBytes_FromString
#define PyString_AsString PyBytes_AsString
#endif

#include "TMath.h"
#include "Riostream.h"
#include "TMatrix.h"
Expand Down
12 changes: 12 additions & 0 deletions tmva/pymva/src/PyMethodBase.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>

#if PY_VERSION_HEX >= 0x03000000
#define PyString_FromString PyBytes_FromString
#endif


using namespace TMVA;

Expand Down Expand Up @@ -133,7 +137,15 @@ void PyMethodBase::PyFinalize()
}
void PyMethodBase::PySetProgramName(TString name)
{
#if PY_VERSION_HEX >= 0x03000000
const char* char_name = const_cast<char *>(name.Data());
const size_t size = strlen(char_name)+1;
wchar_t wchar_name[size];
mbstowcs(wchar_name, char_name, size);
Py_SetProgramName(wchar_name);
#else
Py_SetProgramName(const_cast<char *>(name.Data()));
#endif
}
//_______________________________________________________________________
TString PyMethodBase::Py_GetProgramName()
Expand Down