Skip to content
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

Jump to bottom

Fix CI travis #127

Merged
merged 26 commits into from
Aug 10, 2019
Merged

Fix CI travis #127

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2cbf5a8
Adding prototype to send error codes through the bindings.
Aug 5, 2019
c51bb35
Adding header
Aug 5, 2019
3142d80
Draft: Add exception handling
Aug 5, 2019
c15636c
Draft: Add exception handling
Aug 5, 2019
20f4306
Reviewed by Luis
lsybarguen Aug 5, 2019
1526cb2
Merge branch 'feature/errorHandling' of https://github.com/shapelets/…
lsybarguen Aug 5, 2019
847ce2c
Adding prototype to send error codes through the bindings. JNI version.
Aug 5, 2019
d040a52
Merge remote-tracking branch 'origin/feature/errorHandling' into feat…
Aug 5, 2019
4305c24
Reformatting code and fixing includes
Aug 6, 2019
23929c2
Applying format
Aug 6, 2019
67e6871
Adding try-catch blocks to all JNI functions, First Part
Aug 6, 2019
e23ebd0
Adding try-catch blocks to all JNI functions, Second Part
Aug 7, 2019
924dc4a
All functions working on C-Binding
Aug 7, 2019
ea0814b
Fix appveyor build
Aug 8, 2019
fd9b3e1
Fixing cmake
Aug 8, 2019
3e48e6d
Fix Appveyor
Aug 8, 2019
44ceac0
Fix Appveyor CI
Aug 8, 2019
5c456fa
Doing a final review
Aug 9, 2019
039c74f
Fixing c-binding header files
Aug 9, 2019
4b1ffe1
Fixing header file
Aug 9, 2019
3f00277
Merge branch 'master' into feature/errorHandling
avilchess Aug 10, 2019
4d6e53e
Fixing export PATH in travis 2
Aug 10, 2019
77bccdd
Adding std:: to memcopy function call
Aug 10, 2019
f74e0d2
Merge branch 'master' of https://github.com/shapelets/khiva into feat…
Aug 10, 2019
593d5a7
Fixing error in c-binding for travis CI
Aug 10, 2019
ef78114
Merge branch 'master' of https://github.com/shapelets/khiva into feat…
Aug 10, 2019
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
4 changes: 2 additions & 2 deletions bindings/c/src/array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <khiva/array.h>
#include <khiva_c/array.h>
#include <khiva_c/util.h>

#include <cstring>
#include <thread>

void create_array(void *data, unsigned *ndims, long long *dims, khiva_array *result, int *type, int *error_code,
Expand Down Expand Up @@ -63,7 +63,7 @@ void get_dims(khiva_array *array, long long *dimens, int *error_code, char *erro
try {
af::array var = af::array(*array);
af::dim4 d = khiva::array::getDims(var);
memcpy(dimens, d.dims, sizeof(d.dims));
std::memcpy(dimens, d.dims, sizeof(d.dims));
af_retain_array(array, var.get());
*error_code = 0;
} catch (const std::exception &e) {
Expand Down