[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
taichi-dev · Jan 2, 2023 · 76136a1 · 76136a1
1 parent 4990f5e
commit 76136a1
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 112 deletions.
diff --git a/misc/baselines/bandwidth.cu b/misc/baselines/bandwidth.cu
@@ -54,8 +54,8 @@ __global__ void fd(float *a, float *b, int *c, int n) {
   // i = (i * 1e-10f);
   // i = i * i * i * i * i % m;
   // b_s[i % m] = 1;
-  //#define C(x) i += (i >> x);
-  //#define C(x) i += (i >> x);
+  // #define C(x) i += (i >> x);
+  // #define C(x) i += (i >> x);
   //  for (int t = 0; t < 240; t++)
   //    C(30);
   i += int(sin(i * 1e-20f));

diff --git a/taichi/analysis/gen_offline_cache_key.cpp b/taichi/analysis/gen_offline_cache_key.cpp
@@ -621,9 +621,7 @@ class ASTSerializer : public IRVisitor, public ExpressionVisitor {
   }
 
 #define DEFINE_EMIT_ENUM(EnumType) \
-  void emit(EnumType type) {       \
-    emit_pod(type);                \
-  }
+  void emit(EnumType type) { emit_pod(type); }
 
   DEFINE_EMIT_ENUM(ExprOpCode);
   DEFINE_EMIT_ENUM(StmtOpCode);

diff --git a/taichi/common/interface.h b/taichi/common/interface.h
@@ -325,12 +325,8 @@ class InterfaceHolder {
     }                                                                \
   } ImplementationInjector_##base_class_name##class_name##instance;
 
-#define TI_NAME(alias)                            \
-  virtual std::string get_name() const override { \
-    return get_name_static();                     \
-  }                                               \
-  static std::string get_name_static() {          \
-    return alias;                                 \
-  }
+#define TI_NAME(alias)                                                        \
+  virtual std::string get_name() const override { return get_name_static(); } \
+  static std::string get_name_static() { return alias; }
 
 }  // namespace taichi
diff --git a/taichi/common/json.cpp b/taichi/common/json.cpp
@@ -29,7 +29,7 @@
 // JSON serialization/deserialization.
 // @PENGUINLIONG
 #include <sstream>
-//#include "gft/log.hpp"
+// #include "gft/log.hpp"
 #include "taichi/common/json.h"
 
 namespace liong {

diff --git a/taichi/ir/expression.h b/taichi/ir/expression.h
@@ -163,9 +163,7 @@ class ExpressionVisitor {
   bool invoke_default_visitor_{false};
 };
 
-#define TI_DEFINE_ACCEPT_FOR_EXPRESSION              \
-  void accept(ExpressionVisitor *visitor) override { \
-    visitor->visit(this);                            \
-  }
+#define TI_DEFINE_ACCEPT_FOR_EXPRESSION \
+  void accept(ExpressionVisitor *visitor) override { visitor->visit(this); }
 
 }  // namespace taichi::lang
diff --git a/taichi/ir/expression_ops.h b/taichi/ir/expression_ops.h
@@ -12,25 +12,19 @@
   Expr expr_##opname(const Expr &expr) {                             \
     return Expr::make<UnaryOpExpression>(UnaryOpType::opname, expr); \
   }                                                                  \
-  Expr operator op(const Expr &expr) {                               \
-    return expr_##opname(expr);                                      \
-  }
+  Expr operator op(const Expr &expr) { return expr_##opname(expr); }
 
 #define DEFINE_EXPRESSION_FUNC_UNARY(opname)                         \
   Expr opname(const Expr &expr) {                                    \
     return Expr::make<UnaryOpExpression>(UnaryOpType::opname, expr); \
   }                                                                  \
-  Expr expr_##opname(const Expr &expr) {                             \
-    return opname(expr);                                             \
-  }
+  Expr expr_##opname(const Expr &expr) { return opname(expr); }
 
 #define DEFINE_EXPRESSION_OP_BINARY(op, opname)                            \
   Expr operator op(const Expr &lhs, const Expr &rhs) {                     \
     return Expr::make<BinaryOpExpression>(BinaryOpType::opname, lhs, rhs); \
   }                                                                        \
-  Expr expr_##opname(const Expr &lhs, const Expr &rhs) {                   \
-    return lhs op rhs;                                                     \
-  }
+  Expr expr_##opname(const Expr &lhs, const Expr &rhs) { return lhs op rhs; }
 
 #define DEFINE_EXPRESSION_FUNC_BINARY(opname)                              \
   Expr opname(const Expr &lhs, const Expr &rhs) {                          \

diff --git a/taichi/ir/ir.cpp b/taichi/ir/ir.cpp
@@ -62,10 +62,8 @@ class StatementTypeNameVisitor : public IRVisitor {
   StatementTypeNameVisitor() {
   }
 
-#define PER_STATEMENT(x)         \
-  void visit(x *stmt) override { \
-    type_name = #x;              \
-  }
+#define PER_STATEMENT(x) \
+  void visit(x *stmt) override { type_name = #x; }
 #include "taichi/inc/statements.inc.h"
 
 #undef PER_STATEMENT

diff --git a/taichi/ir/ir.h b/taichi/ir/ir.h
@@ -272,10 +272,8 @@ class IRNode {
   std::unique_ptr<IRNode> clone();
 };
 
-#define TI_DEFINE_ACCEPT                     \
-  void accept(IRVisitor *visitor) override { \
-    visitor->visit(this);                    \
-  }
+#define TI_DEFINE_ACCEPT \
+  void accept(IRVisitor *visitor) override { visitor->visit(this); }
 
 #define TI_DEFINE_CLONE                                             \
   std::unique_ptr<Stmt> clone() const override {                    \

diff --git a/taichi/math/sifakis_svd.h b/taichi/math/sifakis_svd.h
@@ -13,30 +13,30 @@ branching and elementary floating point operations
 A. McAdams, A. Selle, R. Tamstorf, J. Teran and E. Sifakis
 */
 
-//#####################################################################
-// Copyright (c) 2010-2011, Eftychios Sifakis.
+// #####################################################################
+//  Copyright (c) 2010-2011, Eftychios Sifakis.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//   * Redistributions of source code must retain the above copyright notice,
-//   this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or
-//     other materials provided with the distribution.
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are met:
+//    * Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or
+//      other materials provided with the distribution.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//#####################################################################
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//  POSSIBILITY OF SUCH DAMAGE.
+// #####################################################################
 
 TI_FORCE_INLINE float rsqrt(const float f) {
   return 1.0f / std::sqrt(f);

diff --git a/taichi/program/field_info.h b/taichi/program/field_info.h
@@ -4,14 +4,10 @@
 #include "taichi/rhi/device.h"
 #include "taichi/program/program.h"
 
-#define DEFINE_PROPERTY(Type, name)       \
-  Type name;                              \
-  void set_##name(const Type &new_name) { \
-    name = new_name;                      \
-  }                                       \
-  Type get_##name() {                     \
-    return name;                          \
-  }
+#define DEFINE_PROPERTY(Type, name)                          \
+  Type name;                                                 \
+  void set_##name(const Type &new_name) { name = new_name; } \
+  Type get_##name() { return name; }
 
 namespace taichi {
 

diff --git a/taichi/rhi/device.h b/taichi/rhi/device.h
@@ -29,9 +29,7 @@ constexpr size_t kBufferSizeEntireSize = size_t(-1);
   inline name operator&(name a, name b) {      \
     return static_cast<name>(int(a) & int(b)); \
   }                                            \
-  inline bool operator&&(name a, name b) {     \
-    return (int(a) & int(b)) != 0;             \
-  }
+  inline bool operator&&(name a, name b) { return (int(a) & int(b)) != 0; }
 
 enum class BlendOp : uint32_t { add, subtract, reverse_subtract, min, max };
 

diff --git a/taichi/rhi/dx/dx_device.h b/taichi/rhi/dx/dx_device.h
@@ -15,7 +15,7 @@ constexpr bool kD3d11DebugEnabled = false;
 // force software rendering.
 constexpr bool kD3d11ForceRef = false;
 // Enable to spawn a debug window and swapchain
-//#define TAICHI_DX11_DEBUG_WINDOW
+// #define TAICHI_DX11_DEBUG_WINDOW
 
 void check_dx_error(HRESULT hr, const char *msg);
 

diff --git a/taichi/runtime/llvm/runtime_module/atomic.h b/taichi/runtime/llvm/runtime_module/atomic.h
@@ -36,20 +36,14 @@ DEFINE_ATOMIC_OP_INTRINSIC(xor, i64)
 DEFINE_ATOMIC_OP_INTRINSIC(xor, u32)
 DEFINE_ATOMIC_OP_INTRINSIC(xor, u64)
 
-#define DEFINE_ADD(T)   \
-  T add_##T(T a, T b) { \
-    return a + b;       \
-  }
+#define DEFINE_ADD(T) \
+  T add_##T(T a, T b) { return a + b; }
 
-#define DEFINE_MIN(T)     \
-  T min_##T(T a, T b) {   \
-    return b > a ? a : b; \
-  }
+#define DEFINE_MIN(T) \
+  T min_##T(T a, T b) { return b > a ? a : b; }
 
-#define DEFINE_MAX(T)     \
-  T max_##T(T a, T b) {   \
-    return b < a ? a : b; \
-  }
+#define DEFINE_MAX(T) \
+  T max_##T(T a, T b) { return b < a ? a : b; }
 
 #define DEFINE_ATOMIC_OP_COMP_EXCH(OP, T)                                     \
   T atomic_##OP##_##T(volatile T *dest, T inc) {                              \

diff --git a/taichi/runtime/llvm/runtime_module/runtime.cpp b/taichi/runtime/llvm/runtime_module/runtime.cpp
@@ -55,16 +55,10 @@ __asm__(".symver expf,expf@GLIBC_2.2.5");
 #endif
 
 // For accessing struct fields
-#define STRUCT_FIELD(S, F)                              \
-  extern "C" decltype(S::F) S##_get_##F(S *s) {         \
-    return s->F;                                        \
-  }                                                     \
-  extern "C" decltype(S::F) *S##_get_ptr_##F(S *s) {    \
-    return &(s->F);                                     \
-  }                                                     \
-  extern "C" void S##_set_##F(S *s, decltype(S::F) f) { \
-    s->F = f;                                           \
-  }
+#define STRUCT_FIELD(S, F)                                             \
+  extern "C" decltype(S::F) S##_get_##F(S *s) { return s->F; }         \
+  extern "C" decltype(S::F) *S##_get_ptr_##F(S *s) { return &(s->F); } \
+  extern "C" void S##_set_##F(S *s, decltype(S::F) f) { s->F = f; }
 
 #define STRUCT_FIELD_ARRAY(S, F)                                             \
   extern "C" std::remove_all_extents_t<decltype(S::F)> S##_get_##F(S *s,     \
@@ -163,13 +157,9 @@ std::size_t taichi_strlen(const char *str) {
   return len;
 }
 
-#define DEFINE_UNARY_REAL_FUNC(F) \
-  f32 F##_f32(f32 x) {            \
-    return std::F(x);             \
-  }                               \
-  f64 F##_f64(f64 x) {            \
-    return std::F(x);             \
-  }
+#define DEFINE_UNARY_REAL_FUNC(F)          \
+  f32 F##_f32(f32 x) { return std::F(x); } \
+  f64 F##_f64(f64 x) { return std::F(x); }
 
 DEFINE_UNARY_REAL_FUNC(exp)
 DEFINE_UNARY_REAL_FUNC(log)

diff --git a/taichi/ui/utils/utils.h b/taichi/ui/utils/utils.h
@@ -206,14 +206,10 @@ inline int next_power_of_2(int n) {
   return 1 << count;
 }
 
-#define DEFINE_PROPERTY(Type, name)       \
-  Type name;                              \
-  void set_##name(const Type &new_name) { \
-    name = new_name;                      \
-  }                                       \
-  Type get_##name() {                     \
-    return name;                          \
-  }
+#define DEFINE_PROPERTY(Type, name)                          \
+  Type name;                                                 \
+  void set_##name(const Type &new_name) { name = new_name; } \
+  Type get_##name() { return name; }
 
 inline std::vector<char> read_file(const std::string &filename) {
   std::ifstream file(filename, std::ios::ate | std::ios::binary);

diff --git a/taichi/util/bit.h b/taichi/util/bit.h
@@ -78,13 +78,9 @@ constexpr int bit_length() {
   return std::is_same<T, bool>() ? 1 : sizeof(T) * 8;
 }
 
-#define TI_BIT_FIELD(T, name, start)                    \
-  T get_##name() const {                                \
-    return (T)Base::get<start, bit::bit_length<T>()>(); \
-  }                                                     \
-  void set_##name(const T &val) {                       \
-    Base::set<start, bit::bit_length<T>()>(val);        \
-  }
+#define TI_BIT_FIELD(T, name, start)                                           \
+  T get_##name() const { return (T)Base::get<start, bit::bit_length<T>()>(); } \
+  void set_##name(const T &val) { Base::set<start, bit::bit_length<T>()>(val); }
 
 template <typename T, int N>
 TI_FORCE_INLINE constexpr T product(const std::array<T, N> arr) {