Unverified Commit 059b19ba authored by Vasilis Vryniotis's avatar Vasilis Vryniotis Committed by GitHub
Browse files

[FBcode->GH] Daily `arc lint --take GOOGLEJAVAFORMAT` (#3379)

Reviewed By: zertosh

Differential Revision: D26396892

fbshipit-source-id: be0bd7fb54cb2f7bd0e0fb5222cc25b4930679a6
parent 5acd5c9b
...@@ -20,7 +20,6 @@ import android.view.ViewStub; ...@@ -20,7 +20,6 @@ import android.view.ViewStub;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
...@@ -32,7 +31,8 @@ import androidx.camera.core.ImageProxy; ...@@ -32,7 +31,8 @@ import androidx.camera.core.ImageProxy;
import androidx.camera.core.Preview; import androidx.camera.core.Preview;
import androidx.camera.core.PreviewConfig; import androidx.camera.core.PreviewConfig;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import com.facebook.soloader.nativeloader.NativeLoader;
import com.facebook.soloader.nativeloader.SystemDelegate;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -43,14 +43,8 @@ import java.nio.FloatBuffer; ...@@ -43,14 +43,8 @@ import java.nio.FloatBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.facebook.soloader.nativeloader.NativeLoader;
import com.facebook.soloader.nativeloader.SystemDelegate;
import org.pytorch.IValue; import org.pytorch.IValue;
import org.pytorch.MemoryFormat;
import org.pytorch.Module; import org.pytorch.Module;
import org.pytorch.PyTorchAndroid;
import org.pytorch.Tensor; import org.pytorch.Tensor;
public class CameraActivity extends AppCompatActivity { public class CameraActivity extends AppCompatActivity {
...@@ -143,9 +137,9 @@ public class CameraActivity extends AppCompatActivity { ...@@ -143,9 +137,9 @@ public class CameraActivity extends AppCompatActivity {
if (requestCode == REQUEST_CODE_CAMERA_PERMISSION) { if (requestCode == REQUEST_CODE_CAMERA_PERMISSION) {
if (grantResults[0] == PackageManager.PERMISSION_DENIED) { if (grantResults[0] == PackageManager.PERMISSION_DENIED) {
Toast.makeText( Toast.makeText(
this, this,
"You can't use image classification example without granting CAMERA permission", "You can't use image classification example without granting CAMERA permission",
Toast.LENGTH_LONG) Toast.LENGTH_LONG)
.show(); .show();
finish(); finish();
} else { } else {
...@@ -217,9 +211,7 @@ public class CameraActivity extends AppCompatActivity { ...@@ -217,9 +211,7 @@ public class CameraActivity extends AppCompatActivity {
} }
protected void fillInputTensorBuffer( protected void fillInputTensorBuffer(
ImageProxy image, ImageProxy image, int rotationDegrees, FloatBuffer inputTensorBuffer) {
int rotationDegrees,
FloatBuffer inputTensorBuffer) {
if (mInputTensorBitmap == null) { if (mInputTensorBitmap == null) {
final int tensorSize = Math.min(image.getWidth(), image.getHeight()); final int tensorSize = Math.min(image.getWidth(), image.getHeight());
...@@ -305,7 +297,8 @@ public class CameraActivity extends AppCompatActivity { ...@@ -305,7 +297,8 @@ public class CameraActivity extends AppCompatActivity {
gi = gi > RGB_MAX_CHANNEL_VALUE ? RGB_MAX_CHANNEL_VALUE : (gi < 0 ? 0 : gi); gi = gi > RGB_MAX_CHANNEL_VALUE ? RGB_MAX_CHANNEL_VALUE : (gi < 0 ? 0 : gi);
bi = bi > RGB_MAX_CHANNEL_VALUE ? RGB_MAX_CHANNEL_VALUE : (bi < 0 ? 0 : bi); bi = bi > RGB_MAX_CHANNEL_VALUE ? RGB_MAX_CHANNEL_VALUE : (bi < 0 ? 0 : bi);
final int color = 0xff000000 | ((ri << 6) & 0xff0000) | ((gi >> 2) & 0xff00) | ((bi >> 10) & 0xff); final int color =
0xff000000 | ((ri << 6) & 0xff0000) | ((gi >> 2) & 0xff00) | ((bi >> 10) & 0xff);
mInputTensorBitmap.setPixel(x, y, color); mInputTensorBitmap.setPixel(x, y, color);
inputTensorBuffer.put(0 * channelSize + y * tensorSize + x, clamp0255(ri >> 10) / 255.f); inputTensorBuffer.put(0 * channelSize + y * tensorSize + x, clamp0255(ri >> 10) / 255.f);
inputTensorBuffer.put(1 * channelSize + y * tensorSize + x, clamp0255(gi >> 10) / 255.f); inputTensorBuffer.put(1 * channelSize + y * tensorSize + x, clamp0255(gi >> 10) / 255.f);
...@@ -344,7 +337,7 @@ public class CameraActivity extends AppCompatActivity { ...@@ -344,7 +337,7 @@ public class CameraActivity extends AppCompatActivity {
if (mModule == null) { if (mModule == null) {
Log.i(TAG, "Loading module from asset '" + BuildConfig.MODULE_ASSET_NAME + "'"); Log.i(TAG, "Loading module from asset '" + BuildConfig.MODULE_ASSET_NAME + "'");
mInputTensorBuffer = Tensor.allocateFloatBuffer(3 * tensorSize * tensorSize); mInputTensorBuffer = Tensor.allocateFloatBuffer(3 * tensorSize * tensorSize);
mInputTensor = Tensor.fromBlob(mInputTensorBuffer, new long[]{3, tensorSize, tensorSize}); mInputTensor = Tensor.fromBlob(mInputTensorBuffer, new long[] {3, tensorSize, tensorSize});
final String modelFileAbsoluteFilePath = final String modelFileAbsoluteFilePath =
new File(assetFilePath(this, BuildConfig.MODULE_ASSET_NAME)).getAbsolutePath(); new File(assetFilePath(this, BuildConfig.MODULE_ASSET_NAME)).getAbsolutePath();
mModule = Module.load(modelFileAbsoluteFilePath); mModule = Module.load(modelFileAbsoluteFilePath);
...@@ -358,8 +351,8 @@ public class CameraActivity extends AppCompatActivity { ...@@ -358,8 +351,8 @@ public class CameraActivity extends AppCompatActivity {
final IValue out1 = outputTuple.toTuple()[1]; final IValue out1 = outputTuple.toTuple()[1];
final Map<String, IValue> map = out1.toList()[0].toDictStringKey(); final Map<String, IValue> map = out1.toList()[0].toDictStringKey();
float[] boxesData = new float[]{}; float[] boxesData = new float[] {};
float[] scoresData = new float[]{}; float[] scoresData = new float[] {};
final List<BBox> bboxes = new ArrayList<>(); final List<BBox> bboxes = new ArrayList<>();
if (map.containsKey("boxes")) { if (map.containsKey("boxes")) {
final Tensor boxesTensor = map.get("boxes").toTensor(); final Tensor boxesTensor = map.get("boxes").toTensor();
...@@ -368,13 +361,13 @@ public class CameraActivity extends AppCompatActivity { ...@@ -368,13 +361,13 @@ public class CameraActivity extends AppCompatActivity {
scoresData = scoresTensor.getDataAsFloatArray(); scoresData = scoresTensor.getDataAsFloatArray();
final int n = scoresData.length; final int n = scoresData.length;
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
final BBox bbox = new BBox( final BBox bbox =
scoresData[i], new BBox(
boxesData[4 * i + 0], scoresData[i],
boxesData[4 * i + 1], boxesData[4 * i + 0],
boxesData[4 * i + 2], boxesData[4 * i + 1],
boxesData[4 * i + 3] boxesData[4 * i + 2],
); boxesData[4 * i + 3]);
android.util.Log.i(TAG, String.format("Forward result %d: %s", i, bbox)); android.util.Log.i(TAG, String.format("Forward result %d: %s", i, bbox));
bboxes.add(bbox); bboxes.add(bbox);
} }
...@@ -407,8 +400,7 @@ public class CameraActivity extends AppCompatActivity { ...@@ -407,8 +400,7 @@ public class CameraActivity extends AppCompatActivity {
mInputTensorBitmap, mInputTensorBitmap,
new Rect(0, 0, result.tensorSize, result.tensorSize), new Rect(0, 0, result.tensorSize, result.tensorSize),
new Rect(offsetX, offsetY, offsetX + size, offsetY + size), new Rect(offsetX, offsetY, offsetX + size, offsetY + size),
null null);
);
for (final BBox bbox : result.bboxes) { for (final BBox bbox : result.bboxes) {
if (bbox.score < BBOX_SCORE_DRAW_THRESHOLD) { if (bbox.score < BBOX_SCORE_DRAW_THRESHOLD) {
......
...@@ -12,14 +12,13 @@ import androidx.annotation.WorkerThread; ...@@ -12,14 +12,13 @@ import androidx.annotation.WorkerThread;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.facebook.soloader.nativeloader.NativeLoader; import com.facebook.soloader.nativeloader.NativeLoader;
import com.facebook.soloader.nativeloader.SystemDelegate; import com.facebook.soloader.nativeloader.SystemDelegate;
import java.nio.FloatBuffer;
import java.util.Map;
import org.pytorch.IValue; import org.pytorch.IValue;
import org.pytorch.Module; import org.pytorch.Module;
import org.pytorch.PyTorchAndroid; import org.pytorch.PyTorchAndroid;
import org.pytorch.Tensor; import org.pytorch.Tensor;
import java.nio.FloatBuffer;
import java.util.Map;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
static { static {
if (!NativeLoader.isInitialized()) { if (!NativeLoader.isInitialized()) {
...@@ -116,8 +115,10 @@ public class MainActivity extends AppCompatActivity { ...@@ -116,8 +115,10 @@ public class MainActivity extends AppCompatActivity {
final float[] scoresData = scores.getDataAsFloatArray(); final float[] scoresData = scores.getDataAsFloatArray();
final int n = scoresData.length; final int n = scoresData.length;
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
android.util.Log.i(TAG, android.util.Log.i(
String.format("Forward result %d: score %f box:(%f, %f, %f, %f)", TAG,
String.format(
"Forward result %d: score %f box:(%f, %f, %f, %f)",
scoresData[i], scoresData[i],
boxesData[4 * i + 0], boxesData[4 * i + 0],
boxesData[4 * i + 1], boxesData[4 * i + 1],
...@@ -130,7 +131,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -130,7 +131,7 @@ public class MainActivity extends AppCompatActivity {
final long moduleForwardDuration = SystemClock.elapsedRealtime() - moduleForwardStartTime; final long moduleForwardDuration = SystemClock.elapsedRealtime() - moduleForwardStartTime;
final long analysisDuration = SystemClock.elapsedRealtime() - startTime; final long analysisDuration = SystemClock.elapsedRealtime() - startTime;
return new Result(new float[]{}, moduleForwardDuration, analysisDuration); return new Result(new float[] {}, moduleForwardDuration, analysisDuration);
} }
static class Result { static class Result {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment