From 14248566a4fa9c4b6eedc7b183bb99c4ca929787 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 29 Jan 2014 17:47:50 +0100
Subject: [PATCH] Avoid recursive import
---
.../learn/activation/include/xbob.learn.activation/api.h | 9 ---------
xbob/learn/activation/main.cpp | 1 +
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/xbob/learn/activation/include/xbob.learn.activation/api.h b/xbob/learn/activation/include/xbob.learn.activation/api.h
index 21a1b18..3438307 100644
--- a/xbob/learn/activation/include/xbob.learn.activation/api.h
+++ b/xbob/learn/activation/include/xbob.learn.activation/api.h
@@ -234,8 +234,6 @@ typedef struct {
# if !defined(NO_IMPORT_ARRAY)
-#include <xbob.io/api.h>
-
/**
* Returns -1 on error, 0 on success. PyCapsule_Import will set an exception
* if there's an error.
@@ -290,13 +288,6 @@ typedef struct {
return -1;
}
- /* Imports the xbob.blitz C-API */
- if (import_xbob_io() < 0) {
- PyErr_Print();
- PyErr_SetString(PyExc_ImportError, "xbob.io failed to import");
- return -1;
- }
-
/* If you get to this point, all is good */
return 0;
diff --git a/xbob/learn/activation/main.cpp b/xbob/learn/activation/main.cpp
index 7dc7afb..a01fc8f 100644
--- a/xbob/learn/activation/main.cpp
+++ b/xbob/learn/activation/main.cpp
@@ -153,6 +153,7 @@ static PyObject* create_module (void) {
if (c_api_object) PyModule_AddObject(m, "_C_API", c_api_object);
/* imports xbob.io C-API + dependencies */
+ if (import_xbob_blitz() < 0) return 0;
if (import_xbob_io() < 0) return 0;
Py_INCREF(m);
--
GitLab