You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by re...@apache.org on 2019/04/05 20:12:31 UTC
[incubator-mxnet] branch numpy updated: fix jni lint (#14634)
This is an automated email from the ASF dual-hosted git repository.
reminisce pushed a commit to branch numpy
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/numpy by this push:
new 5194333 fix jni lint (#14634)
5194333 is described below
commit 5194333707c6f47d97b2a4d39a3e9f74e584a69c
Author: Yizhi Liu <li...@apache.org>
AuthorDate: Fri Apr 5 13:12:11 2019 -0700
fix jni lint (#14634)
---
.../src/main/native/org_apache_mxnet_native_c_api.cc | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/scala-package/native/src/main/native/org_apache_mxnet_native_c_api.cc b/scala-package/native/src/main/native/org_apache_mxnet_native_c_api.cc
index 678dfc1..ae01c8a 100644
--- a/scala-package/native/src/main/native/org_apache_mxnet_native_c_api.cc
+++ b/scala-package/native/src/main/native/org_apache_mxnet_native_c_api.cc
@@ -896,9 +896,9 @@ JNIEXPORT jint JNICALL Java_org_apache_mxnet_LibInfo_mxExecutorReshape
(JNIEnv * env, jobject obj,
jint partialReshaping, jint allowUpSizing, jint devType, jint devId,
jobjectArray jmapKeys, jintArray jmapDevTypes, jintArray jmapDevIds,
- jobjectArray jprovidedArgShapeNames, jintArray jprovidedArgShapeData, jintArray jprovidedArgShapeIdx,
- jobject jrefInArgs, jobject jrefArgGrads, jobject jrefAuxStates,
- jlong jsharedExec, jobject jrefOut) {
+ jobjectArray jprovidedArgShapeNames, jintArray jprovidedArgShapeData,
+ jintArray jprovidedArgShapeIdx, jobject jrefInArgs, jobject jrefArgGrads,
+ jobject jrefAuxStates, jlong jsharedExec, jobject jrefOut) {
CHECK(jmapKeys != NULL);
CHECK(jprovidedArgShapeNames != NULL);
@@ -922,7 +922,8 @@ JNIEXPORT jint JNICALL Java_org_apache_mxnet_LibInfo_mxExecutorReshape
if (numProvidedArgShapes > 0) {
providedArgShapeNames = new const char*[numProvidedArgShapes];
for (int i = 0; i < numProvidedArgShapes; ++i) {
- jstring jkey = reinterpret_cast<jstring>(env->GetObjectArrayElement(jprovidedArgShapeNames, i));
+ jstring jkey = reinterpret_cast<jstring>(
+ env->GetObjectArrayElement(jprovidedArgShapeNames, i));
providedArgShapeNames[i] = env->GetStringUTFChars(jkey, 0);
env->DeleteLocalRef(jkey);
}
@@ -1659,9 +1660,10 @@ int FillSymbolInferShape
return 0;
}
-int SymbolInferShapeHelper(JNIEnv *env, jobject obj, jlong symbolPtr, jint jnumArgs, jobjectArray jkeys,
- jintArray jargIndPtr, jintArray jargShapeData, jobject jinShapeData,
- jobject joutShapeData, jobject jauxShapeData, jobject jcomplete, bool partial) {
+int SymbolInferShapeHelper(JNIEnv *env, jobject obj, jlong symbolPtr, jint jnumArgs,
+ jobjectArray jkeys, jintArray jargIndPtr, jintArray jargShapeData,
+ jobject jinShapeData, jobject joutShapeData, jobject jauxShapeData,
+ jobject jcomplete, bool partial) {
const char **keys = NULL;
if (jkeys != NULL) {
keys = new const char *[jnumArgs];
@@ -2719,4 +2721,4 @@ JNIEXPORT jint JNICALL Java_org_apache_mxnet_LibInfo_mxSetIsNumpyCompatible
int ret = MXSetIsNumpyCompatible(isNpComp, &prev);
SetIntField(env, prevRef, prev);
return ret;
-}
\ No newline at end of file
+}