Skip to content

Commit 99a841b

Browse files
Merge pull request #573 from insertinterestingnamehere/numba_fix
Numba fix
2 parents b43ea28 + 7389b40 commit 99a841b

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ build_script:
2626
- ps: if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER) { conda install anaconda-client }
2727
- conda build conda.recipe --channel dynd/channel/dev
2828
- conda install numpy libdynd --channel dynd/channel/dev
29+
- conda install numba
2930
- ps: conda install (conda build --output conda.recipe)
3031
- cd ..
3132
- python -c "import dynd; import sys; dynd.test(verbosity=2, exit=True)"

dynd/include/kernels/apply_jit_kernel.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ namespace nd {
9090
if (obj == NULL) {
9191

9292
obj = (*jit)(func, nsrc, src_tp);
93-
if (obj == NULL) {
94-
PyErr_Print();
93+
if (PyErr_Occurred()) {
9594
throw std::runtime_error("An exception was raised in Python");
9695
}
9796

dynd/nd/functional.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ cdef public object _jit(object func, intptr_t nsrc, const _type *src_tp):
7878
# The following generates the wrapper function using LLVM IR
7979
fndesc = compile_res.fndesc
8080
target_context = compile_res.target_context
81-
library = target_context.jit_codegen().create_library(name = 'library')
81+
library = target_context.codegen().create_library(name = 'library')
8282

8383
ir_module = library.create_ir_module(name = 'module')
8484
# memcpy = ir_module.declare_intrinsic('llvm.memcpy',

0 commit comments

Comments
 (0)