Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.learn.activation
Commits
7fe52b16
Commit
7fe52b16
authored
Dec 03, 2015
by
Manuel Günther
Browse files
Corrected error cases in module creation
parent
623b83b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
bob/learn/activation/main.cpp
View file @
7fe52b16
...
...
@@ -59,31 +59,33 @@ static PyObject* create_module (void) {
return
0
;
# if PY_VERSION_HEX >= 0x03000000
PyObject
*
m
=
PyModule_Create
(
&
module_definition
);
PyObject
*
module
=
PyModule_Create
(
&
module_definition
);
auto
module_
=
make_xsafe
(
module
);
const
char
*
ret
=
"O"
;
# else
PyObject
*
m
=
Py_InitModule3
(
BOB_EXT_MODULE_NAME
,
module_methods
,
module_docstr
);
PyObject
*
module
=
Py_InitModule3
(
BOB_EXT_MODULE_NAME
,
module_methods
,
module_docstr
);
const
char
*
ret
=
"N"
;
# endif
if
(
!
m
)
return
0
;
auto
m_
=
make_safe
(
m
);
if
(
!
module
)
return
0
;
/* register the types to python */
Py_INCREF
(
&
PyBobLearnActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"Activation"
,
(
PyObject
*
)
&
PyBobLearnActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"Activation"
,
(
PyObject
*
)
&
PyBobLearnActivation_Type
)
<
0
)
return
0
;
Py_INCREF
(
&
PyBobLearnIdentityActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"Identity"
,
(
PyObject
*
)
&
PyBobLearnIdentityActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"Identity"
,
(
PyObject
*
)
&
PyBobLearnIdentityActivation_Type
)
<
0
)
return
0
;
Py_INCREF
(
&
PyBobLearnLinearActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"Linear"
,
(
PyObject
*
)
&
PyBobLearnLinearActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"Linear"
,
(
PyObject
*
)
&
PyBobLearnLinearActivation_Type
)
<
0
)
return
0
;
Py_INCREF
(
&
PyBobLearnLogisticActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"Logistic"
,
(
PyObject
*
)
&
PyBobLearnLogisticActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"Logistic"
,
(
PyObject
*
)
&
PyBobLearnLogisticActivation_Type
)
<
0
)
return
0
;
Py_INCREF
(
&
PyBobLearnHyperbolicTangentActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"HyperbolicTangent"
,
(
PyObject
*
)
&
PyBobLearnHyperbolicTangentActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"HyperbolicTangent"
,
(
PyObject
*
)
&
PyBobLearnHyperbolicTangentActivation_Type
)
<
0
)
return
0
;
Py_INCREF
(
&
PyBobLearnMultipliedHyperbolicTangentActivation_Type
);
if
(
PyModule_AddObject
(
m
,
"MultipliedHyperbolicTangent"
,
(
PyObject
*
)
&
PyBobLearnMultipliedHyperbolicTangentActivation_Type
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"MultipliedHyperbolicTangent"
,
(
PyObject
*
)
&
PyBobLearnMultipliedHyperbolicTangentActivation_Type
)
<
0
)
return
0
;
static
void
*
PyBobLearnActivation_API
[
PyBobLearnActivation_API_pointers
];
...
...
@@ -148,14 +150,14 @@ static PyObject* create_module (void) {
#endif
if
(
c_api_object
)
PyModule_AddObject
(
m
,
"_C_API"
,
c_api_object
);
if
(
c_api_object
)
PyModule_AddObject
(
m
odule
,
"_C_API"
,
c_api_object
);
/* imports dependencies */
if
(
import_bob_blitz
()
<
0
)
return
0
;
if
(
import_bob_core_logging
()
<
0
)
return
0
;
if
(
import_bob_io_base
()
<
0
)
return
0
;
return
Py_BuildValue
(
"O"
,
m
);
return
Py_BuildValue
(
ret
,
module
);
}
PyMODINIT_FUNC
BOB_EXT_ENTRY_NAME
(
void
)
{
...
...
bob/learn/activation/version.cpp
View file @
7fe52b16
...
...
@@ -56,22 +56,24 @@ static PyModuleDef module_definition = {
static
PyObject
*
create_module
(
void
)
{
# if PY_VERSION_HEX >= 0x03000000
PyObject
*
m
=
PyModule_Create
(
&
module_definition
);
PyObject
*
module
=
PyModule_Create
(
&
module_definition
);
auto
module_
=
make_xsafe
(
module
);
const
char
*
ret
=
"O"
;
# else
PyObject
*
m
=
Py_InitModule3
(
BOB_EXT_MODULE_NAME
,
module_methods
,
module_docstr
);
PyObject
*
module
=
Py_InitModule3
(
BOB_EXT_MODULE_NAME
,
module_methods
,
module_docstr
);
const
char
*
ret
=
"N"
;
# endif
if
(
!
m
)
return
0
;
auto
m_
=
make_safe
(
m
);
///< protects against early returns
if
(
!
module
)
return
0
;
/* register version numbers and constants */
if
(
PyModule_AddIntConstant
(
m
,
"api"
,
BOB_LEARN_ACTIVATION_API_VERSION
)
<
0
)
return
0
;
if
(
PyModule_AddStringConstant
(
m
,
"module"
,
BOB_EXT_MODULE_VERSION
)
<
0
)
return
0
;
if
(
PyModule_AddIntConstant
(
m
odule
,
"api"
,
BOB_LEARN_ACTIVATION_API_VERSION
)
<
0
)
return
0
;
if
(
PyModule_AddStringConstant
(
m
odule
,
"module"
,
BOB_EXT_MODULE_VERSION
)
<
0
)
return
0
;
PyObject
*
externals
=
build_version_dictionary
();
if
(
!
externals
)
return
0
;
if
(
PyModule_AddObject
(
m
,
"externals"
,
externals
)
<
0
)
return
0
;
if
(
PyModule_AddObject
(
m
odule
,
"externals"
,
externals
)
<
0
)
return
0
;
return
Py_BuildValue
(
"O"
,
m
);
return
Py_BuildValue
(
ret
,
module
);
}
PyMODINIT_FUNC
BOB_EXT_ENTRY_NAME
(
void
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment