Merge branch 'master' into gui-fix-instance-loop

gadfort · gadfort · commit e4a843de0692 · 2025-10-01T19:40:13.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/black.yaml b/.github/workflows/black.yaml
@@ -13,6 +13,6 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run black
         uses: psf/black@stable
diff --git a/.github/workflows/github-actions-are-differences-found.yml b/.github/workflows/github-actions-are-differences-found.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Check ok files
diff --git a/.github/workflows/github-actions-are-odb-files-generated.yml b/.github/workflows/github-actions-are-odb-files-generated.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'
diff --git a/.github/workflows/github-actions-clang-tidy-post.yml b/.github/workflows/github-actions-clang-tidy-post.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       # Downloads the artifact uploaded by the lint action
       - name: 'Download artifact'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           script: |
             const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
diff --git a/.github/workflows/github-actions-format-on-push.yml b/.github/workflows/github-actions-format-on-push.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Get changed files
diff --git a/.github/workflows/github-actions-lint-tcl.yml b/.github/workflows/github-actions-lint-tcl.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: 'recursive'
       - name: Install Dependencies
diff --git a/.github/workflows/github-actions-macos.yml b/.github/workflows/github-actions-macos.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           xcode-version: latest-stable
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: 'recursive'
       - name: Install dependencies
@@ -47,7 +47,7 @@ jobs:
           rm -rf "${{ github.workspace }}"
           mkdir -p "${{ github.workspace }}"
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: 'recursive'
       - name: Build OpenROAD
diff --git a/.github/workflows/github-actions-on-push.yml b/.github/workflows/github-actions-on-push.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: run security_scan_on_push
         uses: The-OpenROAD-Project/actions/security_scan_on_push@main
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -0,0 +1,2 @@
+version = "3.7.15"
+runner.dialect = scala213
diff --git a/src/ant/src/AntennaChecker.cc b/src/ant/src/AntennaChecker.cc
@@ -3,8 +3,6 @@
 
 #include "ant/AntennaChecker.hh"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
@@ -26,6 +24,7 @@
 #include "odb/dbShape.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "utl/Logger.h"
 
 namespace ant {
diff --git a/src/drt/src/distributed/RoutingCallBack.h b/src/drt/src/distributed/RoutingCallBack.h
@@ -2,8 +2,6 @@
 // Copyright (c) 2021-2025, The OpenROAD Authors
 
 #pragma once
-#include <omp.h>
-
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
@@ -26,6 +24,7 @@
 #include "dst/JobCallBack.h"
 #include "dst/JobMessage.h"
 #include "global.h"
+#include "omp.h"
 #include "pa/FlexPA.h"
 #include "triton_route/TritonRoute.h"
 #include "utl/Logger.h"
diff --git a/src/drt/src/dr/FlexDR.cpp b/src/drt/src/dr/FlexDR.cpp
@@ -4,7 +4,6 @@
 #include "dr/FlexDR.h"
 
 #include <dst/JobMessage.h>
-#include <omp.h>
 
 #include <algorithm>
 #include <atomic>
@@ -49,6 +48,7 @@
 #include "gc/FlexGC.h"
 #include "io/io.h"
 #include "odb/dbTypes.h"
+#include "omp.h"
 #include "serialization.h"
 #include "utl/Logger.h"
 #include "utl/Progress.h"
diff --git a/src/drt/src/dr/FlexDR_conn.cpp b/src/drt/src/dr/FlexDR_conn.cpp
@@ -3,8 +3,6 @@
 
 #include "dr/FlexDR_conn.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cstdlib>
 #include <iostream>
@@ -30,6 +28,7 @@
 #include "frRegionQuery.h"
 #include "io/io.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "triton_route/TritonRoute.h"
 #include "utl/exception.h"
 
diff --git a/src/drt/src/gr/FlexGR.cpp b/src/drt/src/gr/FlexGR.cpp
@@ -3,8 +3,6 @@
 
 #include "gr/FlexGR.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
@@ -29,6 +27,7 @@
 #include "frBaseTypes.h"
 #include "odb/db.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "utl/exception.h"
 
 namespace drt {
diff --git a/src/drt/src/io/GuideProcessor.cpp b/src/drt/src/io/GuideProcessor.cpp
@@ -3,8 +3,6 @@
 
 #include "io/GuideProcessor.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
@@ -28,6 +26,7 @@
 #include "frProfileTask.h"
 #include "odb/db.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "utl/Logger.h"
 #include "utl/exception.h"
 
diff --git a/src/drt/src/pa/FlexPA.cpp b/src/drt/src/pa/FlexPA.cpp
@@ -3,8 +3,6 @@
 
 #include "pa/FlexPA.h"
 
-#include <omp.h>
-
 #include <cstdint>
 #include <fstream>
 #include <memory>
@@ -29,6 +27,7 @@
 #include "gc/FlexGC.h"
 #include "global.h"
 #include "odb/db.h"
+#include "omp.h"
 #include "pa/AbstractPAGraphics.h"
 #include "serialization.h"
 #include "utl/exception.h"
diff --git a/src/drt/src/pa/FlexPA_acc_pattern.cpp b/src/drt/src/pa/FlexPA_acc_pattern.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2019-2025, The OpenROAD Authors
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
@@ -30,6 +28,7 @@
 #include "gc/FlexGC.h"
 #include "odb/dbTransform.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "pa/AbstractPAGraphics.h"
 #include "pa/FlexPA.h"
 #include "serialization.h"
diff --git a/src/drt/src/pa/FlexPA_acc_point.cpp b/src/drt/src/pa/FlexPA_acc_point.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2019-2025, The OpenROAD Authors
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cstddef>
 #include <map>
@@ -26,6 +24,7 @@
 #include "gc/FlexGC.h"
 #include "odb/dbTransform.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "pa/AbstractPAGraphics.h"
 #include "pa/FlexPA.h"
 #include "utl/Logger.h"
diff --git a/src/drt/src/pa/FlexPA_row_pattern.cpp b/src/drt/src/pa/FlexPA_row_pattern.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2019-2025, The OpenROAD Authors
 
-#include <omp.h>
-
 #include <algorithm>
 #include <iostream>
 #include <iterator>
@@ -25,6 +23,7 @@
 #include "gc/FlexGC.h"
 #include "odb/dbTransform.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "pa/FlexPA.h"
 #include "serialization.h"
 #include "utl/exception.h"
diff --git a/src/drt/src/ta/FlexTA.cpp b/src/drt/src/ta/FlexTA.cpp
@@ -3,8 +3,6 @@
 
 #include "ta/FlexTA.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <chrono>
 #include <iostream>
@@ -17,6 +15,7 @@
 #include "db/infra/frTime.h"
 #include "frProfileTask.h"
 #include "global.h"
+#include "omp.h"
 #include "ta/AbstractTAGraphics.h"
 #include "utl/Logger.h"
 #include "utl/exception.h"
diff --git a/src/gpl/src/mbff.cpp b/src/gpl/src/mbff.cpp
@@ -5,7 +5,6 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/network_simplex.h>
-#include <omp.h>
 
 #include <algorithm>
 #include <cmath>
@@ -27,6 +26,7 @@
 #include "odb/dbTransform.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "ortools/linear_solver/linear_solver.h"
 #include "ortools/sat/cp_model.h"
 #include "rsz/Resizer.hh"
diff --git a/src/gpl/src/nesterovBase.cpp b/src/gpl/src/nesterovBase.cpp
@@ -3,8 +3,6 @@
 
 #include "nesterovBase.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -24,6 +22,7 @@
 #include "fft.h"
 #include "nesterovPlace.h"
 #include "odb/db.h"
+#include "omp.h"
 #include "placerBase.h"
 #include "utl/Logger.h"
 
diff --git a/src/gpl/src/solver.cpp b/src/gpl/src/solver.cpp
@@ -3,10 +3,10 @@
 
 #include "solver.h"
 
-#include <omp.h>
-
 #include <limits>
 
+#include "omp.h"
+
 namespace gpl {
 
 ResidualError cpuSparseSolve(int maxSolverIter,
diff --git a/src/grt/src/RepairAntennas.cpp b/src/grt/src/RepairAntennas.cpp
@@ -3,8 +3,6 @@
 
 #include "RepairAntennas.h"
 
-#include <omp.h>
-
 #include <algorithm>
 #include <cmath>
 #include <iterator>
@@ -23,6 +21,7 @@
 #include "odb/dbTransform.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
+#include "omp.h"
 #include "utl/Logger.h"
 
 namespace grt {
diff --git a/src/sta b/src/sta
@@ -1 +1 @@
-Subproject commit e38b0b2d7a665f22bc98e086cdaf99e2dfb29d64
+Subproject commit 05b292c379c9f3a74d23c67adb6f937e0206b374
diff --git a/test/orfs/mock-array/BUILD b/test/orfs/mock-array/BUILD
diff --git a/test/orfs/mock-array/rules-base.json b/test/orfs/mock-array/rules-base.json
diff --git a/test/orfs/mock-array/rules-flat.json b/test/orfs/mock-array/rules-flat.json
diff --git a/test/orfs/mock-array/src/main/scala/MockArray.scala b/test/orfs/mock-array/src/main/scala/MockArray.scala

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+version = "3.7.15"`
	`2`	`+runner.dialect = scala213`