From b4067b56044e648b3dd6a7c73280dcf13917091a Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Fri, 28 Jul 2023 12:01:34 -0600 Subject: [PATCH 1/9] Update clang format checking --- .github/workflows/clang-format-check.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 46c9bf3be2..7bdba8fe35 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -10,11 +10,16 @@ jobs: - check: "src" exclude: '\.proto$' - check: "include" - - check: "nmt" + - check: "lib" - check: "python" - check: "scripts" - check: "tests" - check: "examples" + - check: "bindings" + - check: "config" + - check: "deps" + - check: "packaging" + - check: "substitutions" steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C/C++/Protobuf programs. From 944558712da7ac478430a16e3b44583d8e2dd639 Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Fri, 28 Jul 2023 12:10:10 -0600 Subject: [PATCH 2/9] Separate out the checking of each subdirectory in lib --- .github/workflows/clang-format-check.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 7bdba8fe35..07ad30299b 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -10,7 +10,16 @@ jobs: - check: "src" exclude: '\.proto$' - check: "include" - - check: "lib" + - check: "lib/compiler" + - check: "lib/ffi" + - check: "lib/fmt" + - check: "lib/kernels" + - check: "lib/op-attrs" + - check: "lib/pcg" + - check: "lib/runtime" + - check: "lib/substitutions" + - check: "lib/triton" + - check: "lib/utils" - check: "python" - check: "scripts" - check: "tests" From 48f1af7e1e08e1c9ce51edaf88274f0e8b588175 Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Fri, 28 Jul 2023 12:14:55 -0600 Subject: [PATCH 3/9] Remove old directories from format check --- .github/workflows/clang-format-check.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 07ad30299b..5a8ce8e1ba 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -7,9 +7,6 @@ jobs: strategy: matrix: path: - - check: "src" - exclude: '\.proto$' - - check: "include" - check: "lib/compiler" - check: "lib/ffi" - check: "lib/fmt" From bbe5c848100471bf5308683521c552388091e5ec Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Fri, 28 Jul 2023 12:22:00 -0600 Subject: [PATCH 4/9] Break up lib/runtime even further in format checking for parallelism --- .github/workflows/clang-format-check.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 5a8ce8e1ba..a4c055911f 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -13,7 +13,10 @@ jobs: - check: "lib/kernels" - check: "lib/op-attrs" - check: "lib/pcg" - - check: "lib/runtime" + - check: "lib/runtime/ffi" + - check: "lib/runtime/include" + - check: "lib/runtime/src" + - check: "lib/runtime/test" - check: "lib/substitutions" - check: "lib/triton" - check: "lib/utils" From 880accad85788c1ea12f8977f6c5f8501d34303e Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Fri, 28 Jul 2023 12:26:35 -0600 Subject: [PATCH 5/9] Disable fail-fast so that format reporting is thorough --- .github/workflows/clang-format-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index a4c055911f..8689f88b7b 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -5,6 +5,7 @@ jobs: name: Formatting Check runs-on: ubuntu-latest strategy: + fail-fast: false matrix: path: - check: "lib/compiler" From 8f00ac4bd05bb0da2120b2bc0e41e1854e4ac63a Mon Sep 17 00:00:00 2001 From: Andres Quan Date: Sun, 30 Jul 2023 22:43:19 -0600 Subject: [PATCH 6/9] Remove unnecessary format checks. --- .github/workflows/clang-format-check.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 8689f88b7b..ec0586f9da 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -10,26 +10,15 @@ jobs: path: - check: "lib/compiler" - check: "lib/ffi" - - check: "lib/fmt" - check: "lib/kernels" - check: "lib/op-attrs" - check: "lib/pcg" - - check: "lib/runtime/ffi" - - check: "lib/runtime/include" - - check: "lib/runtime/src" - - check: "lib/runtime/test" + - check: "lib/runtime" - check: "lib/substitutions" - - check: "lib/triton" - check: "lib/utils" - - check: "python" - - check: "scripts" - check: "tests" - check: "examples" - check: "bindings" - - check: "config" - - check: "deps" - - check: "packaging" - - check: "substitutions" steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C/C++/Protobuf programs. From b55ad05190146a515e7fbdeef21fb6e205fff35b Mon Sep 17 00:00:00 2001 From: Colin Unger Date: Tue, 8 Aug 2023 00:45:07 -0700 Subject: [PATCH 7/9] Move over to use clang-format-16 and correct config file --- .clang-tidy-15 | 3 --- .github/workflows/clang-format-check.yml | 4 ++-- lib/utils/include/utils/test_types.h | 8 +++----- scripts/format.sh | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 .clang-tidy-15 diff --git a/.clang-tidy-15 b/.clang-tidy-15 deleted file mode 100644 index 94d339b680..0000000000 --- a/.clang-tidy-15 +++ /dev/null @@ -1,3 +0,0 @@ -Checks: 'bugprone-*,-clang-diagnostic-*,modernize-*,-modernize-use-trailing-return-type' -WarningsAsErrors: true -AnalyzeTemporaryDtors: false diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index ec0586f9da..e49881c039 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -22,8 +22,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.8.0 + uses: lockshaw/clang-format-action@v4.11.0-flexflow with: - clang-format-version: "15" + clang-format-version: "16" check-path: ${{ matrix.path['check'] }} exclude-regex: ${{ matrix.path['exclude'] }} diff --git a/lib/utils/include/utils/test_types.h b/lib/utils/include/utils/test_types.h index 4fafb4a8fb..514d030b6f 100644 --- a/lib/utils/include/utils/test_types.h +++ b/lib/utils/include/utils/test_types.h @@ -82,11 +82,9 @@ namespace std { template < ::FlexFlow::test_types:: capability... CAPABILITIES> //, typename = typename - //std::enable_if<::FlexFlow::test_types::has_capability<::FlexFlow::test_types::HASHABLE>::value, - //bool>::type> - struct hash< - ::FlexFlow::test_types::test_type_t< - CAPABILITIES...>> { + // std::enable_if<::FlexFlow::test_types::has_capability<::FlexFlow::test_types::HASHABLE>::value, + // bool>::type> +struct hash<::FlexFlow::test_types::test_type_t> { typename std::enable_if< ::FlexFlow::test_types::has_capability<::FlexFlow::test_types::HASHABLE, CAPABILITIES...>::value, diff --git a/scripts/format.sh b/scripts/format.sh index 4daa3789b4..9610dc2d26 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -71,7 +71,7 @@ fi CLANG_FORMAT_CONFIG="$GIT_ROOT/.clang-format-for-format-sh" mapfile -t FILES < <(git ls-files ':!:triton/**' '*.h' '*.cc' '*.cpp' '*.cu' '*.c') if [[ -f $CLANG_FORMAT_CONFIG ]]; then - "$CLANG_FORMAT_PATH" -style=file:"$CLANG_FORMAT_CONFIG" -i "${FILES[@]}" + "$CLANG_FORMAT_PATH" --style=file:"$CLANG_FORMAT_CONFIG" -i "${FILES[@]}" else echo "error" fi From af94a176a0d8b4c67b0dd1c32bcf2ee0c2f49ff3 Mon Sep 17 00:00:00 2001 From: Colin Unger Date: Tue, 8 Aug 2023 03:55:00 -0700 Subject: [PATCH 8/9] Update clang-format-check version --- .github/workflows/clang-format-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index e49881c039..95ea407bea 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C/C++/Protobuf programs. - uses: lockshaw/clang-format-action@v4.11.0-flexflow + uses: lockshaw/clang-format-action@v4.11.0-flexflow-2 with: clang-format-version: "16" check-path: ${{ matrix.path['check'] }} From 8f08aedd9c0fbfca0547bda4c7b16f9b900354a0 Mon Sep 17 00:00:00 2001 From: Colin Unger Date: Tue, 8 Aug 2023 04:00:49 -0700 Subject: [PATCH 9/9] Update to v3 --- .github/workflows/clang-format-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 95ea407bea..fb93fd6b5b 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C/C++/Protobuf programs. - uses: lockshaw/clang-format-action@v4.11.0-flexflow-2 + uses: lockshaw/clang-format-action@v4.11.0-flexflow-3 with: clang-format-version: "16" check-path: ${{ matrix.path['check'] }}