"examples/git@developer.sourcefind.cn:OpenDAS/colossalai.git" did not exist on "36c4bb2893e73022b1060bd6ad5c0685869e5465"
Unverified Commit 2e427ddf authored by Frank Lee's avatar Frank Lee Committed by GitHub
Browse files

[revert] recover "[refactor] restructure configuration files (#2977)" (#3022)

This reverts commit 35c8f4ce.
parent e86d9bb2
BasedOnStyle: Google
[settings]
line_length = 120
multi_line_output=3
include_trailing_comma = true
ignore_comments = true
...@@ -11,14 +11,13 @@ repos: ...@@ -11,14 +11,13 @@ repos:
hooks: hooks:
- id: yapf - id: yapf
name: yapf formatter name: yapf formatter
args: ['--style=pyproject.toml', '--parallel', '--in-place'] args: ['--style=.style.yapf', '--parallel', '--in-place']
- repo: https://github.com/pre-commit/mirrors-clang-format - repo: https://github.com/pre-commit/mirrors-clang-format
rev: v13.0.1 rev: v13.0.1
hooks: hooks:
- id: clang-format - id: clang-format
name: clang formatter name: clang formatter
args: [--style, "{BasedOnStyle: Google}"]
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0 rev: v4.3.0
......
[style]
based_on_style = google
spaces_before_comment = 4
split_before_logical_operator = true
column_limit = 120
...@@ -138,4 +138,4 @@ You can now create a pull request on the GitHub webpage of your repository. The ...@@ -138,4 +138,4 @@ You can now create a pull request on the GitHub webpage of your repository. The
Do write clearly the description of your pull request and [link the pull request to your target issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue). This will automatically close the issue when the pull request is approved. Do write clearly the description of your pull request and [link the pull request to your target issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue). This will automatically close the issue when the pull request is approved.
In case of code conflict, you should rebase your branch and resolve the conflicts manually. In case of code conflict, you should rebase your branch and resolve the conflicts manually.
\ No newline at end of file
[tool.isort]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
ignore_comments = true
[tool.yapf]
based_on_style = "google"
spaces_before_comment = 4
split_before_logical_operator = true
column_limit = 120
[tool.pytest.ini_options]
markers = [
"cpu: tests which can run on CPU",
"gpu: tests which requires a single GPU",
"dist: tests which are run in a multi-GPU or multi-machine environment",
"experiment: tests for experimental features",
]
[pytest]
markers =
cpu: tests which can run on CPU
gpu: tests which requires a single GPU
dist: tests which are run in a multi-GPU or multi-machine environment
experiment: tests for experimental features
\ No newline at end of file
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