Fix

Author: kirklandsign

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/LlmModuleInstrumentationTest.kt

@@ -11,9 +11,6 @@ import android.Manifest
 import androidx.test.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.GrantPermissionRule
-import java.io.File
-import java.io.IOException
-import java.net.URISyntaxException
 import org.apache.commons.io.FileUtils
 import org.json.JSONException
 import org.json.JSONObject
@@ -24,6 +21,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.pytorch.executorch.extension.llm.LlmCallback
 import org.pytorch.executorch.extension.llm.LlmModule
+import java.io.File
+import java.io.IOException
+import java.net.URISyntaxException
 
 /** Unit tests for [org.pytorch.executorch.extension.llm.LlmModule]. */
 @RunWith(AndroidJUnit4::class)
@@ -101,7 +101,8 @@ class LlmModuleInstrumentationTest : LlmCallback {
             val promptEvalEndMs = jsonObject.getInt("prompt_eval_end_ms")
             tps = numGeneratedTokens.toFloat() / (inferenceEndMs - promptEvalEndMs) * 1000
             tokensPerSecond.add(tps)
-        } catch (_: JSONException) {}
+        } catch (_: JSONException) {
+        }
     }
 
     companion object {

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleE2ETest.kt

@@ -13,15 +13,15 @@ import android.graphics.BitmapFactory
 import androidx.test.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.GrantPermissionRule
-import java.io.File
-import java.io.IOException
-import java.net.URISyntaxException
 import org.apache.commons.io.FileUtils
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.pytorch.executorch.TensorImageUtils.bitmapToFloat32Tensor
+import java.io.File
+import java.io.IOException
+import java.net.URISyntaxException
 
 /** Unit tests for [Module]. */
 @RunWith(AndroidJUnit4::class)

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.kt

@@ -11,18 +11,18 @@ import android.Manifest
 import androidx.test.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.GrantPermissionRule
-import java.io.File
-import java.io.IOException
-import java.net.URISyntaxException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicInteger
 import org.apache.commons.io.FileUtils
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.File
+import java.io.IOException
+import java.net.URISyntaxException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
 
 /** Unit tests for [Module]. */
 @RunWith(AndroidJUnit4::class)
@@ -152,7 +152,8 @@ class ModuleInstrumentationTest {
                 val results = module.forward()
                 Assert.assertTrue(results[0].isTensor)
                 completed.incrementAndGet()
-            } catch (_: InterruptedException) {}
+            } catch (_: InterruptedException) {
+            }
         }
 
         val threads = arrayOfNulls<Thread>(numThreads)

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/TensorImageUtils.kt

@@ -16,9 +16,11 @@ import java.nio.FloatBuffer
  * [android.media.Image] source.
  */
 object TensorImageUtils {
-    @JvmField var TORCHVISION_NORM_MEAN_RGB: FloatArray = floatArrayOf(0.485f, 0.456f, 0.406f)
+    @JvmField
+    var TORCHVISION_NORM_MEAN_RGB: FloatArray = floatArrayOf(0.485f, 0.456f, 0.406f)
 
-    @JvmField var TORCHVISION_NORM_STD_RGB: FloatArray = floatArrayOf(0.229f, 0.224f, 0.225f)
+    @JvmField
+    var TORCHVISION_NORM_STD_RGB: FloatArray = floatArrayOf(0.229f, 0.224f, 0.225f)
 
     /**
      * Creates new [Tensor] from full [android.graphics.Bitmap], normalized with specified in
@@ -144,9 +146,9 @@ object TensorImageUtils {
     private fun checkRotateCWDegrees(rotateCWDegrees: Int) {
         require(
             !(rotateCWDegrees != 0 &&
-                rotateCWDegrees != 90 &&
-                rotateCWDegrees != 180 &&
-                rotateCWDegrees != 270)
+                    rotateCWDegrees != 90 &&
+                    rotateCWDegrees != 180 &&
+                    rotateCWDegrees != 270)
         ) {
             "rotateCWDegrees must be one of 0, 90, 180, 270"
         }

extension/android/jni/jni_layer.cpp

@@ -480,7 +480,6 @@ class ExecuTorchJni : public facebook::jni::HybridClass<ExecuTorchJni> {
     facebook::jni::local_ref<facebook::jni::JArrayInt> ret =
         facebook::jni::JArrayInt::newArray(num_inputs);
 
-    int i = 0;
     for (int i = 0; i < num_inputs; i++) {
       ret->pin()[i] = static_cast<uint32_t>(method_meta.input_tag(i).get());
     }
@@ -495,7 +494,6 @@ class ExecuTorchJni : public facebook::jni::HybridClass<ExecuTorchJni> {
     facebook::jni::local_ref<facebook::jni::JArrayInt> ret =
         facebook::jni::JArrayInt::newArray(num_outputs);
 
-    int i = 0;
     for (int i = 0; i < num_outputs; i++) {
       ret->pin()[i] = static_cast<uint32_t>(method_meta.output_tag(i).get());
     }