From 2447af09532ede503bc5c54df05a1c43fd47ee72 Mon Sep 17 00:00:00 2001 From: raver119 Date: Sat, 3 Aug 2019 13:27:34 +0300 Subject: [PATCH] exclude two methods for JNI Signed-off-by: raver119 --- libnd4j/blas/NDArray.h | 2 +- libnd4j/blas/cpu/NDArray.cpp | 2 +- libnd4j/blas/cuda/NDArray.cu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnd4j/blas/NDArray.h b/libnd4j/blas/NDArray.h index 2549c5517..ed1962279 100644 --- a/libnd4j/blas/NDArray.h +++ b/libnd4j/blas/NDArray.h @@ -261,7 +261,7 @@ namespace nd4j { void syncToDevice() const; void syncShape() const; -#ifndef __JAVACPP_HACK__ && !defined(_JNI_IMPLEMENTATION_) +#if !defined(__JAVACPP_HACK__) && !defined(_JNI_IMPLEMENTATION_) /** * This method can be used on architectures that use special buffers * @param writeList diff --git a/libnd4j/blas/cpu/NDArray.cpp b/libnd4j/blas/cpu/NDArray.cpp index 2bd2cbd5d..1607c93aa 100644 --- a/libnd4j/blas/cpu/NDArray.cpp +++ b/libnd4j/blas/cpu/NDArray.cpp @@ -182,7 +182,7 @@ void NDArray::synchronize(const char* msg) const { // no-op } -#ifndef __JAVACPP_HACK__ && !defined(_JNI_IMPLEMENTATION_) +#if !defined(__JAVACPP_HACK__) && !defined(_JNI_IMPLEMENTATION_) void NDArray::prepareSpecialUse(const std::vector& writeList, const std::vector& readList, bool synchronizeWritables) { // no-op } diff --git a/libnd4j/blas/cuda/NDArray.cu b/libnd4j/blas/cuda/NDArray.cu index 68b235308..4760cabd8 100644 --- a/libnd4j/blas/cuda/NDArray.cu +++ b/libnd4j/blas/cuda/NDArray.cu @@ -230,7 +230,7 @@ void NDArray::synchronize(const char* msg) const { if (res != 0) throw std::runtime_error(msg + std::string(": synchronization failed !")); } -#ifndef __JAVACPP_HACK__ && !defined(_JNI_IMPLEMENTATION_) +#if !defined(__JAVACPP_HACK__) && !defined(_JNI_IMPLEMENTATION_) //////////////////////////////////////////////////////////////////////// void NDArray::prepareSpecialUse(const std::vector& writeList, const std::vector& readList, bool synchronizeWritables) {