Skip to content

Commit

Permalink
[revert] recover "[refactor] restructure configuration files (hpcaite…
Browse files Browse the repository at this point in the history
…ch#2977)" (hpcaitech#3022)

This reverts commit 35c8f4c.
  • Loading branch information
FrankLeeeee authored Mar 7, 2023
1 parent e86d9bb commit 2e427dd
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BasedOnStyle: Google
5 changes: 5 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[settings]
line_length = 120
multi_line_output=3
include_trailing_comma = true
ignore_comments = true
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ repos:
hooks:
- id: yapf
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
rev: v13.0.1
hooks:
- id: clang-format
name: clang formatter
args: [--style, "{BasedOnStyle: Google}"]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
Expand Down
5 changes: 5 additions & 0 deletions .style.yapf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[style]
based_on_style = google
spaces_before_comment = 4
split_before_logical_operator = true
column_limit = 120
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md → CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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.
19 changes: 0 additions & 19 deletions pyproject.toml

This file was deleted.

6 changes: 6 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[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

0 comments on commit 2e427dd

Please sign in to comment.