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/jni #152

Merged
merged 55 commits into from
Apr 24, 2020
Merged

Fix/jni #152

merged 55 commits into from
Apr 24, 2020

Conversation

raulbocanegra
Copy link
Contributor

Make sure you have checked all steps below.

Description

  • Here are some details about my PR, including screenshots of any UI changes:

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:

Benchmarks

  • My PR adds the following micro benchmarks OR does not need benchmarks for this extremely good reason:

Commits

  • My commits have been squashed if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

License

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.

Raúl Bocanegra and others added 30 commits February 18, 2020 12:09
Check for errors on Unix scripts
c86d6ad
Fix conan dependency on Unix
f33c019 
Lower case Cmake commands
Fix compiler version for Linux builds
61a3191
Fix CI
48e3862
Fix wget error on osx CI
fefaf2f 
Remove unused scripts
Merge remote-tracking branch 'origin/master' into v0.5.0
4020678
Add remote google-benchmark dependency to fix build
1448d93
Merge branch 'v0.5.0' of github.com:shapelets/khiva into v0.5.0
46cac76
Modify CI to build all on every PR
0d13026
Fix Appveyor build
5ab8417
remote debug appveyor
68e7518
Fix link error on Visual Studio 2015
2f4c673
Fix Visual Studio 2015 CI build
33a36dc
Remote debug vs 2015 build
49aebde
Fix VS 2015 link error
da90c73
Fix yaml
38c363e
Improve build time by donwloading only reuiqred boost packages
052b1b9
@raulbocanegra
Merge branch 'master' into v0.5.0
8179f37
Use empty body for deploy.body in Travis
bc06dc5
Use travis tag as body
fc43bfe
@raulbocanegra
Merge branch 'master' into v0.5.0
14b4e4c
Improve const correctness on Khiva C
f06e373
Implement Clang Tidy checks
ebfb5b9
Improve const correctness on Khiva
1a9d0d9
Implement Clang Tidy checks
8f4cff6 
Remove C mallocs by C++ classes
Merge remote-tracking branch 'origin/master' into v0.5.0
5bd79cc
Removed unused headers
632fe23 
Implemented pending Clang tidy suggestions
Fix paramater passing by reference instead of copy
Fix compilation on Windows
ea1d37e
Fix compilation for MSVC 2017
093d538
Release improvements
a02558c 
Implemented more Clang Tidy checks.
Improved unit tests readability.
Move local functions to anonymous namespaces.
Raúl Bocanegra and others added 21 commits April 7, 2020 03:04
Pass array objects by const ref
7544d50
Fix MSVC build
d3bd32b
Remove warnings
83eda93
Review Changes
a31307c 
Pass input parameters by value in C binding.
Fix formatting of & on C++ references
Update travis yaml
9eaf8a5
Fix version on deploy
b32c07f
@raulbocanegra
Merge branch 'master' into v0.5.0
e472e94
Fix Mac Deploy
8be8053
Force deploy on Mac for regular branches
f2b7e6d
Fix yaml for mac
02b8456
Fix Heap corruption error on Windows
81aeb03 
Use a pointer to a af:::array instead of an af_array.
Refactor all the jni bindings to use arrayfire C++ API instead of the C one.
Now we don't need to update the reference in the jni calls
Merge remote-tracking branch 'origin/master' into fix/jni
2d4da80
Refactor to use pointer to af:array instead of af_array
c136fb1 
Add jni UT project
FIx Travis CI
8bcbba9 
- Install laters version of conan
Remove unused test folder from jni bindings
fa27d70
Address review comments
e182e36
Clang Tidy fixes
c27445a
Update CI
eded894 
Use official conan package for google benchmark
Use cmake_find_package and cmake_paths conan generators isntead of cmake one.
Merge branch 'fix/jni' of github.com:shapelets/khiva into fix/jni
1767506
Use io/shapelets/khiva/KhivaException instead of java/lang/Exception
8f74a33
Merge remote-tracking branch 'origin/master' into fix/jni
8a4b976 
# Conflicts:
#	bindings/jni/include/khiva_jni/internal/utils.h
#	bindings/jni/src/features.cpp
#	bindings/jni/src/matrix.cpp
#	bindings/jni/src/normalization.cpp
#	bindings/jni/src/regularization.cpp
@raulbocanegra raulbocanegra requested review from avilchess and jrecuerda and removed request for avilchess April 23, 2020 13:42
jrecuerda
jrecuerda approved these changes Apr 24, 2020
View reviewed changes
Copy link
Contributor

@jrecuerda jrecuerda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat macro removal!

avilchess
avilchess approved these changes Apr 24, 2020
View reviewed changes
Copy link
Contributor

@avilchess avilchess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job mate!

@raulbocanegra raulbocanegra merged commit f61cc00 into master Apr 24, 2020
@raulbocanegra raulbocanegra deleted the fix/jni branch May 5, 2020 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrecuerda jrecuerda jrecuerda approved these changes

@avilchess avilchess avilchess approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@raulbocanegra @avilchess @jrecuerda