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 46c9bf3be2..fb93fd6b5b 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -5,21 +5,25 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         path:
-          - check: "src"
-            exclude: '\.proto$'
-          - check: "include"
-          - check: "nmt"
-          - check: "python"
-          - check: "scripts"
+          - check: "lib/compiler"
+          - check: "lib/ffi"
+          - check: "lib/kernels"
+          - check: "lib/op-attrs"
+          - check: "lib/pcg"
+          - check: "lib/runtime"
+          - check: "lib/substitutions"
+          - check: "lib/utils"
           - check: "tests"
           - check: "examples"
+          - check: "bindings"
     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-3
         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<CAPABILITIES...>> {
   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