[misc] Update pre-commit hooks (taichi-dev#4713)

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/google/yapf: v0.31.0 → v0.32.0](google/yapf@v0.31.0...v0.32.0) - https://github.com/timothycrosley/isort → https://github.com/PyCQA/isort - [github.com/pre-commit/mirrors-clang-format: v10.0.1 → v13.0.1](pre-commit/mirrors-clang-format@v10.0.1...v13.0.1) - [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](pre-commit/pre-commit-hooks@v4.0.1...v4.1.0) - [github.com/PyCQA/pylint: v2.13.1 → v2.13.4](pylint-dev/pylint@v2.13.1...v2.13.4) * Add style config for yapf 0.32 * Change the commit message to follow taichi's rule Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Frost Ming <[email protected]> Co-authored-by: Ailing <[email protected]>
k-ye · May 5, 2022 · 1ea8518 · 1ea8518
1 parent 4191859
commit 1ea8518
Show file tree

Hide file tree

Showing 26 changed files with 62 additions and 60 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,32 +1,34 @@
 ci:
   autoupdate_schedule: quarterly
+  autoupdate_commit_msg: '[misc] Update pre-commit hooks'
 
 exclude: ^((tests/python/test_exception|.*/examples/.*)\.py$|external/)
 repos:
   - repo: https://github.com/google/yapf
-    rev: v0.31.0
+    rev: v0.32.0
     hooks:
       - id: yapf
         additional_dependencies: [toml]
 
-  - repo: https://github.com/timothycrosley/isort
+  - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v10.0.1
+    rev: v13.0.1
     hooks:
       - id: clang-format
+        exclude: .*\.json$
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
 
   - repo: https://github.com/PyCQA/pylint
-    rev: v2.13.1
+    rev: v2.13.4
     hooks:
       - id: pylint
         args: ['-rn', '-sn']

diff --git a/pyproject.toml b/pyproject.toml
@@ -12,3 +12,4 @@ filterwarnings = [
 
 [tool.yapf]
 based_on_style = "pep8"
+blank_line_before_nested_class_or_def = false
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -4,7 +4,7 @@ coverage
 Pillow
 pybind11
 GitPython
-yapf==0.31.0
+yapf
 distro
 sourceinspect
 isort

diff --git a/taichi/backends/cc/cc_utils.h b/taichi/backends/cc/cc_utils.h
@@ -73,7 +73,7 @@ inline std::string unary_op_type_symbol(UnaryOpType op) {
 }
 
 template <typename... Args>
-inline int execute(std::string fmt, Args &&... args) {
+inline int execute(std::string fmt, Args &&...args) {
   auto cmd = fmt::format(fmt, std::forward<Args>(args)...);
   TI_TRACE("Executing command: {}", cmd);
   int ret = std::system(cmd.c_str());

diff --git a/taichi/backends/cc/codegen_cc.cpp b/taichi/backends/cc/codegen_cc.cpp
@@ -305,7 +305,7 @@ class CCTransformer : public IRVisitor {
   static inline std::string invoke_libc(std::string name,
                                         DataType dt,
                                         std::string const &fmt,
-                                        Args &&... args) {
+                                        Args &&...args) {
     auto arguments = fmt::format(fmt, std::forward<Args>(args)...);
     return invoke_libc(name, dt, arguments);
   }
@@ -594,12 +594,12 @@ class CCTransformer : public IRVisitor {
   }
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     line_appender_.append(std::move(f), std::move(args)...);
   }
 
   template <typename... Args>
-  void emit_header(std::string f, Args &&... args) {
+  void emit_header(std::string f, Args &&...args) {
     line_appender_header_.append(std::move(f), std::move(args)...);
   }
 };  // namespace cccp

diff --git a/taichi/backends/cc/struct_cc.h b/taichi/backends/cc/struct_cc.h
@@ -24,7 +24,7 @@ class CCLayoutGen {
   void generate_types(SNode *snode);
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     line_appender_.append(std::move(f), std::move(args)...);
   }
 

diff --git a/taichi/backends/metal/codegen_metal.cpp b/taichi/backends/metal/codegen_metal.cpp
@@ -1610,7 +1610,7 @@ class KernelCodegenImpl : public IRVisitor {
   }
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     current_appender().append(std::move(f), std::forward<Args>(args)...);
   }
 

diff --git a/taichi/backends/metal/struct_metal.cpp b/taichi/backends/metal/struct_metal.cpp
@@ -345,7 +345,7 @@ class StructCompiler {
   }
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     line_appender_.append(std::move(f), std::move(args)...);
   }
 
@@ -397,7 +397,7 @@ class RuntimeModuleCompiler {
   }
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     line_appender_.append(std::move(f), std::move(args)...);
   }
 

diff --git a/taichi/backends/opengl/codegen_opengl.cpp b/taichi/backends/opengl/codegen_opengl.cpp
@@ -122,7 +122,7 @@ class KernelGen : public IRVisitor {
   std::unordered_set<std::string> loaded_args_;
 
   template <typename... Args>
-  void emit(std::string f, Args &&... args) {
+  void emit(std::string f, Args &&...args) {
     line_appender_.append(std::move(f), std::move(args)...);
   }
 

diff --git a/taichi/codegen/spirv/spirv_ir_builder.h b/taichi/codegen/spirv/spirv_ir_builder.h
@@ -17,7 +17,7 @@ namespace spirv {
 template <bool stop, std::size_t I, typename F>
 struct for_each_dispatcher {
   template <typename T, typename... Args>
-  static void run(const F &f, T &&value, Args &&... args) {  // NOLINT(*)
+  static void run(const F &f, T &&value, Args &&...args) {  // NOLINT(*)
     f(I, std::forward<T>(value));
     for_each_dispatcher<sizeof...(Args) == 0, (I + 1), F>::run(
         f, std::forward<Args>(args)...);
@@ -31,7 +31,7 @@ struct for_each_dispatcher<true, I, F> {
 };
 
 template <typename F, typename... Args>
-inline void for_each(const F &f, Args &&... args) {  // NOLINT(*)
+inline void for_each(const F &f, Args &&...args) {  // NOLINT(*)
   for_each_dispatcher<sizeof...(Args) == 0, 0, F>::run(
       f, std::forward<Args>(args)...);
 }
@@ -165,7 +165,7 @@ class InstrBuilder {
   }
 
   template <typename... Args>
-  InstrBuilder &add_seq(Args &&... args) {
+  InstrBuilder &add_seq(Args &&...args) {
     AddSeqHelper helper;
     helper.builder = this;
     for_each(helper, std::forward<Args>(args)...);
@@ -207,29 +207,29 @@ class IRBuilder {
   }
 
   template <typename... Args>
-  void debug(spv::Op op, Args &&... args) {
+  void debug(spv::Op op, Args &&...args) {
     ib_.begin(op).add_seq(std::forward<Args>(args)...).commit(&debug_);
   }
 
   template <typename... Args>
-  void execution_mode(Value func, Args &&... args) {
+  void execution_mode(Value func, Args &&...args) {
     ib_.begin(spv::OpExecutionMode)
         .add_seq(func, std::forward<Args>(args)...)
         .commit(&exec_mode_);
   }
 
   template <typename... Args>
-  void decorate(spv::Op op, Args &&... args) {
+  void decorate(spv::Op op, Args &&...args) {
     ib_.begin(op).add_seq(std::forward<Args>(args)...).commit(&decorate_);
   }
 
   template <typename... Args>
-  void declare_global(spv::Op op, Args &&... args) {
+  void declare_global(spv::Op op, Args &&...args) {
     ib_.begin(op).add_seq(std::forward<Args>(args)...).commit(&global_);
   }
 
   template <typename... Args>
-  Instr make_inst(spv::Op op, Args &&... args) {
+  Instr make_inst(spv::Op op, Args &&...args) {
     return ib_.begin(op)
         .add_seq(std::forward<Args>(args)...)
         .commit(&function_);
@@ -267,7 +267,7 @@ class IRBuilder {
 
   // Make a new SSA value
   template <typename... Args>
-  Value make_value(spv::Op op, const SType &out_type, Args &&... args) {
+  Value make_value(spv::Op op, const SType &out_type, Args &&...args) {
     Value val = new_value(out_type, ValueKind::kNormal);
     make_inst(op, out_type, val, std::forward<Args>(args)...);
     if (out_type.flag == TypeKind::kPtr) {
@@ -422,7 +422,7 @@ class IRBuilder {
 
   // Create a GLSL450 call
   template <typename... Args>
-  Value call_glsl450(const SType &ret_type, uint32_t inst_id, Args &&... args) {
+  Value call_glsl450(const SType &ret_type, uint32_t inst_id, Args &&...args) {
     Value val = new_value(ret_type, ValueKind::kNormal);
     ib_.begin(spv::OpExtInst)
         .add_seq(ret_type, val, ext_glsl450_, inst_id)

diff --git a/taichi/common/serialization.h b/taichi/common/serialization.h
@@ -112,7 +112,7 @@ typename std::enable_if<!std::is_same<SER, TextSerializer>::value, void>::type
 serialize_kv_impl(SER &ser,
                   const std::array<std::string_view, N> &keys,
                   T &&head,
-                  Args &&... rest) {
+                  Args &&...rest) {
   constexpr auto i = (N - 1 - sizeof...(Args));
   std::string key{keys[i]};
   ser(key.c_str(), head);
@@ -126,7 +126,7 @@ typename std::enable_if<std::is_same<SER, TextSerializer>::value, void>::type
 serialize_kv_impl(SER &ser,
                   const std::array<std::string_view, N> &keys,
                   T &&head,
-                  Args &&... rest) {
+                  Args &&...rest) {
   constexpr auto i = (N - 1 - sizeof...(Args));
   std::string key{keys[i]};
   ser(key.c_str(), head, true);

diff --git a/taichi/ir/control_flow_graph.h b/taichi/ir/control_flow_graph.h
@@ -99,7 +99,7 @@ class ControlFlowGraph {
   int final_node{0};
 
   template <typename... Args>
-  CFGNode *push_back(Args &&... args) {
+  CFGNode *push_back(Args &&...args) {
     nodes.emplace_back(std::make_unique<CFGNode>(std::forward<Args>(args)...));
     return nodes.back().get();
   }

diff --git a/taichi/ir/expr.h b/taichi/ir/expr.h
@@ -86,7 +86,7 @@ class Expr {
   Expr operator!();
 
   template <typename T, typename... Args>
-  static Expr make(Args &&... args) {
+  static Expr make(Args &&...args) {
     return Expr(std::make_shared<T>(std::forward<Args>(args)...));
   }
 

diff --git a/taichi/ir/expression.h b/taichi/ir/expression.h
@@ -26,7 +26,7 @@ class Expression {
     }
 
     template <typename T, typename... Args>
-    T *push_back(Args &&... args) {
+    T *push_back(Args &&...args) {
       return stmts.push_back<T>(std::forward<Args>(args)...);
     }
 

diff --git a/taichi/ir/expression_printer.h b/taichi/ir/expression_printer.h
@@ -226,7 +226,7 @@ class ExpressionHumanFriendlyPrinter : public ExpressionPrinter {
 
  protected:
   template <typename... Args>
-  void emit(Args &&... args) {
+  void emit(Args &&...args) {
     (this->get_ostream() << ... << std::forward<Args>(args));
   }
 

diff --git a/taichi/ir/ir.h b/taichi/ir/ir.h
@@ -130,7 +130,7 @@ class VecStatement {
   Stmt *push_back(pStmt &&stmt);
 
   template <typename T, typename... Args>
-  T *push_back(Args &&... args) {
+  T *push_back(Args &&...args) {
     auto up = std::make_unique<T>(std::forward<Args>(args)...);
     auto ptr = up.get();
     stmts.push_back(std::move(up));
@@ -458,7 +458,7 @@ class StmtFieldManager {
   void operator()(const char *key, T &&value);
 
   template <typename T, typename... Args>
-  void operator()(const char *key_, T &&t, Args &&... rest) {
+  void operator()(const char *key_, T &&t, Args &&...rest) {
     std::string key(key_);
     size_t pos = key.find(',');
     std::string first_name = key.substr(0, pos);
@@ -572,12 +572,12 @@ class Stmt : public IRNode {
   }
 
   template <typename T, typename... Args>
-  static std::unique_ptr<T> make_typed(Args &&... args) {
+  static std::unique_ptr<T> make_typed(Args &&...args) {
     return std::make_unique<T>(std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
-  static pStmt make(Args &&... args) {
+  static pStmt make(Args &&...args) {
     return make_typed<T>(std::forward<Args>(args)...);
   }
 
@@ -653,7 +653,7 @@ class Block : public IRNode {
   }
 
   template <typename T, typename... Args>
-  Stmt *push_back(Args &&... args) {
+  Stmt *push_back(Args &&...args) {
     auto stmt = std::make_unique<T>(std::forward<Args>(args)...);
     stmt->parent = this;
     statements.emplace_back(std::move(stmt));

diff --git a/taichi/ir/ir_builder.h b/taichi/ir/ir_builder.h
@@ -213,7 +213,7 @@ class IRBuilder {
 
   // Print values and strings. Arguments can be Stmt* or std::string.
   template <typename... Args>
-  PrintStmt *create_print(Args &&... args) {
+  PrintStmt *create_print(Args &&...args) {
     return insert(Stmt::make_typed<PrintStmt>(std::forward<Args>(args)...));
   }
 

diff --git a/taichi/ir/statements.h b/taichi/ir/statements.h
@@ -690,13 +690,13 @@ class PrintStmt : public Stmt {
   }
 
   template <typename... Args>
-  PrintStmt(Stmt *t, Args &&... args)
+  PrintStmt(Stmt *t, Args &&...args)
       : contents(make_entries(t, std::forward<Args>(args)...)) {
     TI_STMT_REG_FIELDS;
   }
 
   template <typename... Args>
-  PrintStmt(const std::string &str, Args &&... args)
+  PrintStmt(const std::string &str, Args &&...args)
       : contents(make_entries(str, std::forward<Args>(args)...)) {
     TI_STMT_REG_FIELDS;
   }
@@ -711,13 +711,13 @@ class PrintStmt : public Stmt {
   template <typename T, typename... Args>
   static void make_entries_helper(std::vector<PrintStmt::EntryType> &entries,
                                   T &&t,
-                                  Args &&... values) {
+                                  Args &&...values) {
     entries.push_back(EntryType{t});
     make_entries_helper(entries, std::forward<Args>(values)...);
   }
 
   template <typename... Args>
-  static std::vector<EntryType> make_entries(Args &&... values) {
+  static std::vector<EntryType> make_entries(Args &&...values) {
     std::vector<EntryType> ret;
     make_entries_helper(ret, std::forward<Args>(values)...);
     return ret;

diff --git a/taichi/jit/jit_module.h b/taichi/jit/jit_module.h
@@ -38,7 +38,7 @@ class JITModule {
   }
 
   template <typename... Args, typename T>
-  static std::vector<void *> get_arg_pointers(T &t, Args &... args) {
+  static std::vector<void *> get_arg_pointers(T &t, Args &...args) {
     auto ret = get_arg_pointers(args...);
     ret.insert(ret.begin(), &t);
     return ret;

diff --git a/taichi/llvm/llvm_codegen_utils.h b/taichi/llvm/llvm_codegen_utils.h
@@ -113,15 +113,15 @@ class LLVMModuleBuilder {
   template <typename... Args>
   llvm::Value *call(llvm::IRBuilder<> *builder,
                     const std::string &func_name,
-                    Args &&... args) {
+                    Args &&...args) {
     auto func = get_runtime_function(func_name);
     auto arglist = std::vector<llvm::Value *>({args...});
     check_func_call_signature(func, arglist);
     return builder->CreateCall(func, arglist);
   }
 
   template <typename... Args>
-  llvm::Value *call(const std::string &func_name, Args &&... args) {
+  llvm::Value *call(const std::string &func_name, Args &&...args) {
     return call(this->builder.get(), func_name, std::forward<Args>(args)...);
   }
 
@@ -183,7 +183,7 @@ class RuntimeObject {
   }
 
   template <typename... Args>
-  llvm::Value *call(const std::string &func_name, Args &&... args) {
+  llvm::Value *call(const std::string &func_name, Args &&...args) {
     auto func = get_func(func_name);
     auto arglist = std::vector<llvm::Value *>({ptr, args...});
     check_func_call_signature(func, arglist);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ filterwarnings = [

		[tool.yapf]
		based_on_style = "pep8"
		blank_line_before_nested_class_or_def = false