apply clang format -i (#30180)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/30180
Just applying `clang-format -i` to not mix it with other changes
Test Plan: Imported from OSS
Differential Revision: D18627473
Pulled By: IvanKobzarev
fbshipit-source-id: ed341e356fea31b8515de29d5ea2ede07e8b66a2
diff --git a/android/pytorch_android/src/main/cpp/pytorch_jni_common.cpp b/android/pytorch_android/src/main/cpp/pytorch_jni_common.cpp
index 71ff180..7a239a7 100644
--- a/android/pytorch_android/src/main/cpp/pytorch_jni_common.cpp
+++ b/android/pytorch_android/src/main/cpp/pytorch_jni_common.cpp
@@ -44,7 +44,7 @@
constexpr static auto kJavaDescriptor = "Ljava/util/HashMap;";
using Super =
- facebook::jni::JavaClass<JHashMap<K, V>, facebook::jni::JMap<K, V>>;
+ facebook::jni::JavaClass<JHashMap<K, V>, facebook::jni::JMap<K, V>>;
static facebook::jni::local_ref<JHashMap<K, V>> create() {
return Super::newInstance();
@@ -122,7 +122,7 @@
}
class JTensor : public facebook::jni::JavaClass<JTensor> {
-public:
+ public:
constexpr static const char* kJavaDescriptor = "Lorg/pytorch/Tensor;";
static facebook::jni::local_ref<JTensor> newJTensor(
@@ -229,8 +229,7 @@
} else if (ivalue.isInt()) {
static auto jMethodInt =
JIValue::javaClassStatic()
- ->getStaticMethod<facebook::jni::local_ref<JIValue>(jlong)>(
- "from");
+ ->getStaticMethod<facebook::jni::local_ref<JIValue>(jlong)>("from");
return jMethodInt(JIValue::javaClassStatic(), ivalue.toInt());
} else if (ivalue.isDouble()) {
static auto jMethodDouble =
@@ -242,8 +241,8 @@
static auto jMethodString =
JIValue::javaClassStatic()
->getStaticMethod<facebook::jni::local_ref<JIValue>(
- facebook::jni::alias_ref<
- facebook::jni::JString::javaobject>)>("from");
+ facebook::jni::alias_ref<facebook::jni::JString::javaobject>)>(
+ "from");
return jMethodString(
JIValue::javaClassStatic(),
facebook::jni::make_jstring(ivalue.toStringRef()));
@@ -311,8 +310,8 @@
->getStaticMethod<facebook::jni::local_ref<JIValue>(
facebook::jni::alias_ref<facebook::jni::JArrayClass<
JTensor::javaobject>::javaobject>)>("listFrom");
- auto jArray = facebook::jni::JArrayClass<JTensor::javaobject>::newArray(
- list.size());
+ auto jArray =
+ facebook::jni::JArrayClass<JTensor::javaobject>::newArray(list.size());
auto index = 0;
for (const auto& e : list) {
(*jArray)[index++] = JTensor::newJTensorFromAtTensor(e);
@@ -325,8 +324,8 @@
->getStaticMethod<facebook::jni::local_ref<JIValue>(
facebook::jni::alias_ref<facebook::jni::JArrayClass<
JIValue::javaobject>::javaobject>)>("listFrom");
- auto jArray = facebook::jni::JArrayClass<JIValue::javaobject>::newArray(
- list.size());
+ auto jArray =
+ facebook::jni::JArrayClass<JIValue::javaobject>::newArray(list.size());
auto index = 0;
for (const auto& e : list) {
(*jArray)[index++] = JIValue::newJIValueFromAtIValue(e);
@@ -429,8 +428,9 @@
} else if (JIValue::kTypeCodeTuple == typeCode) {
static const auto jMethodGetTuple =
JIValue::javaClassStatic()
- ->getMethod<facebook::jni::JArrayClass<
- JIValue::javaobject>::javaobject()>("toTuple");
+ ->getMethod<
+ facebook::jni::JArrayClass<JIValue::javaobject>::javaobject()>(
+ "toTuple");
auto jarray = jMethodGetTuple(jivalue);
size_t n = jarray->size();
@@ -468,8 +468,7 @@
return at::IValue{std::move(list)};
} else if (JIValue::kTypeCodeDoubleList == typeCode) {
static const auto jMethodGetDoubleList =
- JIValue::javaClassStatic()->getMethod<jdoubleArray()>(
- "toDoubleList");
+ JIValue::javaClassStatic()->getMethod<jdoubleArray()>("toDoubleList");
auto jArray = jMethodGetDoubleList(jivalue);
auto jArrayPinned = jArray->pin();
size_t n = jArrayPinned.size();
@@ -482,8 +481,9 @@
} else if (JIValue::kTypeCodeTensorList == typeCode) {
static const auto jMethodGetTensorList =
JIValue::javaClassStatic()
- ->getMethod<facebook::jni::JArrayClass<
- JTensor::javaobject>::javaobject()>("toTensorList");
+ ->getMethod<
+ facebook::jni::JArrayClass<JTensor::javaobject>::javaobject()>(
+ "toTensorList");
auto jArray = jMethodGetTensorList(jivalue);
size_t n = jArray->size();
c10::List<at::Tensor> list{};
@@ -495,8 +495,9 @@
} else if (JIValue::kTypeCodeList == typeCode) {
static const auto jMethodGetList =
JIValue::javaClassStatic()
- ->getMethod<facebook::jni::JArrayClass<
- JIValue::javaobject>::javaobject()>("toList");
+ ->getMethod<
+ facebook::jni::JArrayClass<JIValue::javaobject>::javaobject()>(
+ "toList");
auto jarray = jMethodGetList(jivalue);
size_t n = jarray->size();
if (n == 0) {
@@ -519,7 +520,7 @@
static const auto jMethodGetDictStringKey =
JIValue::javaClassStatic()
->getMethod<facebook::jni::JMap<jstring, JIValue::javaobject>::
- javaobject()>("toDictStringKey");
+ javaobject()>("toDictStringKey");
auto jmap = jMethodGetDictStringKey(jivalue);
auto it = jmap->begin();
if (it == jmap->end()) {
@@ -528,7 +529,7 @@
}
auto firstEntryValue = JIValue::JIValueToAtIValue(it->second);
- c10::TypePtr typePtr = firstEntryValue.type();
+ c10::TypePtr typePtr = firstEntryValue.type();
c10::impl::GenericDict dict{c10::StringType::get(), typePtr};
dict.insert(it->first->toStdString(), firstEntryValue);
it++;
@@ -546,8 +547,8 @@
auto jmap = jMethodGetDictLongKey(jivalue);
auto it = jmap->begin();
if (it == jmap->end()) {
- return at::IValue{c10::impl::GenericDict(
- c10::IntType::get(), c10::TensorType::get())};
+ return at::IValue{
+ c10::impl::GenericDict(c10::IntType::get(), c10::TensorType::get())};
}
auto firstEntryValue = JIValue::JIValueToAtIValue(it->second);
@@ -557,7 +558,8 @@
it++;
for (; it != jmap->end(); it++) {
dict.insert(
- (int64_t)it->first->longValue(), JIValue::JIValueToAtIValue(it->second));
+ (int64_t)it->first->longValue(),
+ JIValue::JIValueToAtIValue(it->second));
}
return at::IValue{dict};
}
diff --git a/android/pytorch_android/src/main/cpp/pytorch_jni_lite.cpp b/android/pytorch_android/src/main/cpp/pytorch_jni_lite.cpp
index 7b92ef8..ad52c65 100644
--- a/android/pytorch_android/src/main/cpp/pytorch_jni_lite.cpp
+++ b/android/pytorch_android/src/main/cpp/pytorch_jni_lite.cpp
@@ -6,9 +6,9 @@
#include <fbjni/ByteBuffer.h>
#include <fbjni/fbjni.h>
-#include <torch/script.h>
-#include <torch/csrc/jit/mobile/module.h>
#include <torch/csrc/jit/mobile/import.h>
+#include <torch/csrc/jit/mobile/module.h>
+#include <torch/script.h>
#include "pytorch_jni_common.h"
@@ -17,11 +17,11 @@
namespace pytorch_jni {
class PytorchJni : public facebook::jni::HybridClass<PytorchJni> {
-private:
+ private:
friend HybridBase;
torch::jit::mobile::Module module_;
-public:
+ public:
constexpr static auto kJavaDescriptor = "Lorg/pytorch/LiteNativePeer;";
static facebook::jni::local_ref<jhybriddata> initHybrid(
@@ -41,16 +41,16 @@
static void registerNatives() {
registerHybrid({
- makeNativeMethod("initHybrid", PytorchJni::initHybrid),
- makeNativeMethod("forward", PytorchJni::forward),
- makeNativeMethod("runMethod", PytorchJni::runMethod),
+ makeNativeMethod("initHybrid", PytorchJni::initHybrid),
+ makeNativeMethod("forward", PytorchJni::forward),
+ makeNativeMethod("runMethod", PytorchJni::runMethod),
});
}
facebook::jni::local_ref<JIValue> forward(
facebook::jni::alias_ref<
facebook::jni::JArrayClass<JIValue::javaobject>::javaobject>
- jinputs) {
+ jinputs) {
std::vector<at::IValue> inputs{};
size_t n = jinputs->size();
inputs.reserve(n);
@@ -59,7 +59,6 @@
inputs.push_back(std::move(atIValue));
}
-
auto output = [&]() {
torch::autograd::AutoGradMode guard(false);
at::AutoNonVariableTypeMode non_var_type_mode(true);
@@ -72,7 +71,7 @@
facebook::jni::alias_ref<facebook::jni::JString::javaobject> jmethodName,
facebook::jni::alias_ref<
facebook::jni::JArrayClass<JIValue::javaobject>::javaobject>
- jinputs) {
+ jinputs) {
std::string methodName = jmethodName->toStdString();
std::vector<at::IValue> inputs{};
